Merge branch 'master' of http://121.37.12.51:13000/jialong.yu/FE_IASF_client

src/pages/governance/index.vue

@@ -12,7 +12,7 @@
         <div class="texts wow fadeInDown" data-wow-delay="0.5s">
           <div class="left">
             <h2>{{ modules[1].form.title }}</h2>
-            <div class="des" v-html="modules[1].form.des"></div>
+            <div class="text" v-html="modules[1].form.des"></div>
           </div>
           <img class="bg" width="562" height="506" :src="modules[1].form.pic" alt="">
         </div>
@@ -107,13 +107,15 @@ export default {
     }
   }
   .left {
-    width: 695px;
+    width: 600px;
+    padding-right: 20px;
   }
-  .des {
+  .text {
     margin: 20px 0;
     font-size: 1.2rem;
     color: #181818;
     line-height: 31px;
+    @include mul-ellipsis(10);
   }
   .bg {
     margin: -122px 0 0 0;

src/pages/industrial/index.vue

@@ -13,7 +13,7 @@
         <div class="texts wow fadeInDown" data-wow-delay="0.5s">
           <div class="left">
             <h2>{{ modules[1].form.subTitle }}</h2>
-            <div class="des" v-html="modules[1].form.des"></div>
+            <div class="text" v-html="modules[1].form.des"></div>
           </div>
           <img class="bg" :src="modules[1].form.pic" alt="">
         </div>
@@ -123,11 +123,12 @@ export default {
     width: 500px;
     padding-right: 30px;
   }
-  .des {
+  .text {
     margin: 20px 0;
     font-size: 1.2rem;
     color: #181818;
     line-height: 31px;
+    @include mul-ellipsis(10);
   }
   .bg {
     width: 560px;