Merge branch 'master' into debug

src/views/hzyb/activity/reportDetail.vue

@@ -365,7 +365,8 @@ const getTagColor=(str)=>{
         padding: 0;
         background-color: rgba(255, 255, 255, 0) !important;
     }
-    ul,ol {
+    :deep(li) {
+        list-style: inherit !important;
         list-style-position: inside !important;
     }
 }

src/views/hzyb/activity/reportWeekDetail.vue

@@ -365,7 +365,8 @@ onBeforeRouteUpdate(to => {
         }
     }
 
-    ul,ol {
+    :deep(li) {
+        list-style: inherit !important;
         list-style-position: inside !important;
     }
 }

src/views/hzyb/report/ChapterDetail.vue

@@ -704,7 +704,8 @@ export default {
         :deep(iframe){
             width: 100% !important;
         }
-        ul,ol {
+        :deep(li) {
+            list-style: inherit !important;
             list-style-position: inside !important;
         }
     }

src/views/hzyb/report/Detail.vue

@@ -756,7 +756,8 @@ export default {
         :deep(iframe){
             width: 100% !important;
         }
-        ul,ol {
+        :deep(li) {
+            list-style: inherit !important;
             list-style-position: inside !important;
         }
     }