Merge remote-tracking branch 'origin/麦塔' into 麦塔

src/assets/css/cus-client/cus-client-page.scss

@@ -338,11 +338,7 @@
   .client-aboutUs-page{
 
     // banner
-    .aboutUs-banner{
-      width: 100%;
-      height: 400px;
-      background: #4d90fe;
-    }
+    .aboutUs-banner{width: 100%;height: 400px;background-image: url("~@/assets/images/client/aboutUs/" + "aboutUs-banner.png");background-position-x: center;}
 
     // 公司简介
     .company-profile-box{
@@ -438,7 +434,7 @@
   /********  describe: 新闻资讯  author: TX  date:2020-08-10  ********/
   .client-newsInfor-page{
     // banner
-    .newsInfor-banner{width: 100%;height: 400px;background: #4d90fe;}
+    .newsInfor-banner{width: 100%;height: 400px;background-image: url("~@/assets/images/client/newsInfor/" + "newsInfor-banner.png");background-position-x: center;}
 
     // tab页
     .newsInfor-tab-box{
@@ -472,7 +468,7 @@
           i[type="visits"]{background-image: url("~@/assets/images/client/newsInfor/" + "newsInfor-details-visits.svg");}
           span{@include setFontStyle(-6);display:inline-block;color: #666;margin-right: 60px;vertical-align: middle;}
         }
-        p{@include setFontStyle(-4);color: rgba(0,0,0,0.65);line-height: 24px;margin-bottom: 16px;}
+        p{height: 72px;@include setFontStyle(-4);color: rgba(0,0,0,0.65);line-height: 24px;margin-bottom: 16px;text-align: justify;@include multi-line-ellipsis(3);overflow: hidden;}
         a{@include setFontStyle(-6);color: #4A73FD;}
         a:after{content: "";width: 14px;height: 12px;display:inline-block;background-image: url("~@/assets/images/client/newsInfor/" + "newsInfor-list-icon.svg");margin-left: 8px;}
         a:hover{cursor: pointer;}

src/components/client/common/Cframe.vue

@@ -13,7 +13,7 @@
     import { mapGetters }                            from 'vuex';
     import MtaHeader                                 from '@/components/client/common/header.vue';
     import MtaFooter                                 from '@/components/client/common/footer.vue';
-    import { initThemeColor, handleLocalstorgeData } from '@/utils/theme';
+    import { handleLocalstorgeData } from '@/utils/theme';
     import * as Initialization                       from '@/utils/initializationConfig';
 
 
@@ -33,7 +33,6 @@
         },
         methods:    {},
         created() {
-            initThemeColor();
             let typeface = handleLocalstorgeData('themeFont', 'data-fontsize', '');
             handleLocalstorgeData('themeFont', 'data-fontsize', typeface);
             // 初始化 系统标签logo

src/components/client/common/header.vue

@@ -34,7 +34,6 @@
     import { setAuth, removeAuth } from '@/utils/auth';
 
     import { setUserIcon, checkUrlIsNotHttpUrl, getTrimData } from '@/utils/common';
-    import { initThemeColor }                                  from '@/utils/theme';
 
     export default {
         name:       'mtaHeader',
@@ -85,7 +84,6 @@
         }
         ,
         created() {
-            initThemeColor();
         },
     };
 </script>