Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

src/components/layout/header/mock.js

@@ -920,7 +920,7 @@ export const nav = [
                         id: uuid("gs_nav"),
                         name: "常见问题",
                         index: 5,
-                        link: "/Knowledge/xts",
+                        link: "/Business/Faq",
                         breadcrumb: [
                             { name: "技术与标准", path: "/Knowledge" },
                             { name: "技术知识", path: "/Knowledge/" },

src/router/index.js

@@ -933,12 +933,12 @@ const routes = [{
             component: () => import("@/views/Knowledge/article.vue"),
           },
           {
-            path: "/Knowledge/xts",
-            name: "xts",
+            path: "/Business/Faq",
+            name: "cjwt",
             meta: {
               name: "常见问题",
             },
-            component: () => import("@/views/Knowledge/xts.vue"),
+            component: () => import("@/views//Business/Faq.vue"),
           },
         ]
       },

src/views/Knowledge/Statuteinfo.vue

@@ -3,7 +3,7 @@
     <breadcrumb />
     <div class="row status-container" v-loading='loading'>
       <p class="title-style">{{title}}</p>
-      <div v-html="content"></div>
+      <div class="showHtml" v-html="content"></div>
     </div>
     
   </div>
@@ -95,6 +95,16 @@ export default {
      word-wrap:break-word;
      word-break:break-all;
    }
+   .showHtml{
+     line-height: 24px;
+      font-size: 14px;
+      // text-indent: 28px;
+      color: #454545;
+      /deep/p{
+        margin: 0 0 10px;
+        
+      }
+   }
  }
  
 }

src/views/News/NoticeArticle.vue

@@ -119,6 +119,14 @@ export default {
       border-bottom: 1px solid #b2b2b8;
       padding-bottom: 30px;
       margin-bottom: 25px;
+      margin-top: 20px;
+      line-height: 28px;
+      font-size: 14px;
+      text-indent: 28px;
+      color: #454545;
+      /deep/p{
+        margin: 0 0 10px
+      }
    }
  }
  

src/views/News/msg.vue

@@ -12,7 +12,7 @@
               <div class="msg-head-left">
                 <span>作者：{{ author }}</span>
                 <span>日期：{{ showtime }}</span>
-                <span>编辑：{{ editor }}</span>
+                <!-- <span>编辑：{{ editor }}</span> -->
                 <span>来源：{{ source }}</span>
               </div>
               <div class="msg-head-right">
@@ -325,15 +325,16 @@ export default {
     }
     .msg-text {
       margin-top: 20px;
-      p {
-        text-indent: 25px;
+      line-height: 28px;
       font-size: 14px;
+      text-indent: 28px;
+      color: #454545;
+      /deep/p{
+        margin: 0 0 10px
       }
-      .strong {
-        font-size: 14px;
-        font-weight: bold;
-      }
+      
     }
+    
   }
   .xglj {
     @include module-box;

src/views/News/msgVideo.vue

@@ -340,15 +340,14 @@ export default {
     }
     .msg-text {
       margin-top: 20px;
-      margin-bottom: 30px;
-      p {
-        text-indent: 25px;
+      line-height: 28px;
       font-size: 14px;
+      text-indent: 28px;
+      color: #454545;
+      /deep/p{
+        margin: 0 0 10px
       }
-      .strong {
-        font-size: 14px;
-        font-weight: bold;
-      }
+      
     }
   }
   .xglj {

src/views/Service/Partners/content.vue

@@ -79,24 +79,20 @@ export default {
     }
   }
 
+ 
   .msg-text {
       margin-top: 20px;
-
+      line-height: 28px;
+      font-size: 14px;
+      text-indent: 28px;
+      color: #454545;
+      /deep/p{
+        margin: 0 0 10px
+      }
       img {
       max-width: 95%;
     }
       
-    p {
-      text-indent: 25px;
-      font-size: 14px;
-      font-weight: 400;
-      color: #414345;
-    }
-
-    .strong {
-      font-size: 14px;
-      font-weight: bold;
-    }
     }
 }
 </style>