updated

src/main/resources/static/css/supplier-login/login-h5.css

@@ -280,7 +280,7 @@ html {
 
 #zeroPage {
     background: #fff;
-    margin-top: 13.6vw;
+    margin-top: 16.6vw;
 }
 
 #zeroPage .H5-banner_1 {
@@ -720,6 +720,11 @@ html {
     color: #666666;
     font-size: 2.8vw;
     line-height: 5.6vw;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 13;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
 }
 
 .H5_success .van-swipe .van-swipe-item .innerSuccess .success_img {

src/main/resources/static/css/supplier-login/login.css

@@ -163,6 +163,7 @@ body{
     position: absolute;
     right: -20px;
     top: 0;
+    z-index: -1;
 }
 .slide_icon .slide_icon_item .tooltip_2{
     width: 150px;
@@ -1265,6 +1266,11 @@ body{
 #fourPage .el-carousel__item .logo_text .analysis {
     font-size: 0.8vw;
     line-height: 2vw;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 9;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
 }
 #fivePage {
     background: url(/img/supplier-login/07-caimei/bg.png) no-repeat;
@@ -1484,14 +1490,17 @@ body{
 }
 .video_list_item_content .video_title {
     width: 100%;
-    height: 40%;
+    height: 100px;
     box-sizing: border-box;
-    font-size: 14px;
-    display: flex;
-    justify-content: center;
+    font-size: 18px;
     align-items: center;
-    line-height: 22px;
-    padding: 20px
+    padding: 20px;
+    line-height: 38px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
 }
 .article_list_item_content .article_text {
     width: 100%;
@@ -1572,6 +1581,19 @@ body{
     margin-right: -20px;
     z-index: 1;
 }
+.community_content {
+    padding: 0 4%;
+    width: 100%;
+    height: 40px;
+    overflow: hidden;
+    white-space: normal;
+    font-size: 14px;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    box-sizing: border-box;
+}
 .close {
     width: 60%;
     display: flex;

src/main/resources/static/js/supplier-login/login.js

@@ -302,7 +302,7 @@ new Vue({
                 return value + '...'
             }
             return val
-        }
+        },
     },
     watch: {
         screenWidth: {
@@ -311,6 +311,7 @@ new Vue({
                     this.isPC = true
                 } else {
                     this.isPC = false
+                    this.getSupplierInfoLanding()
                     this.swiperSideWidth = val * 4 / 5
                     this.successSideWidth = val * 0.8
                     this.communitySideWidth = val * 0.416
@@ -319,13 +320,25 @@ new Vue({
         },
     },
     methods: {
+        splitContent(text) {
+            return text.replace(/<[^>]+>/g, '').replace(/[ ]|[&nbsp;]/g, '')
+        },
         getSupplierInfoLanding() {
-            SupplierApi.supplierLoading({},({data}) => {
-                this.bannerList = data.banner
-                this.successList = data.landing.filter(e => e.type == '1')
-                this.videoList = data.landing.filter(e => e.type == '2')
-                this.articelList = data.landing.filter(e => e.type == '3')
-            })
+            if(this.isPC) {
+                SupplierApi.supplierLoading({source: 1},({data}) => {
+                    this.bannerList = data.banner
+                    this.successList = data.landing.filter(e => e.type == '1')
+                    this.videoList = data.landing.filter(e => e.type == '2')
+                    this.articelList = data.landing.filter(e => e.type == '3')
+                })
+            } else {
+                SupplierApi.supplierLoading({source: 2},({data}) => {
+                    this.bannerList = data.banner
+                    this.successList = data.landing.filter(e => e.type == '1')
+                    this.videoList = data.landing.filter(e => e.type == '2')
+                    this.articelList = data.landing.filter(e => e.type == '3')
+                })
+            }
         },
         getAuthShopCount: function(shopId) {
             var _self = this;
@@ -562,5 +575,15 @@ new Vue({
         tipOnline() {
             this.isAthord = true
         },
+        bannerPClink($event) {
+            if ($event.jumpLink) {
+                window.open($event.jumpLink)
+            }
+        },
+        bannerAppLink($event) {
+            if ($event.jumpAppLink) {
+                window.open($event.jumpAppLink)
+            }
+        }
     },
 })

src/main/resources/templates/supplier_login/index.html

@@ -82,7 +82,7 @@
             <div class="slide_icon_item slide_icon_qrcode">
                 <img src="" /> 微信客服
                 <div class="tooltip tooltip_2" :style="{bottom: activeLinkId!==0 ? '50px':'0'}">
-                    <img src="/img/common/qr_code_kefu.png" alt="采美客服">
+                    <img src="/img/supplier-login/kefu_qr.jpg" alt="采美客服">
                 </div>
             </div>
             <div class="slide_icon_item goTop" @click="H5link({href: '#zeroPage', id: 0})" v-if="activeLinkId!==0"></div>
@@ -103,15 +103,15 @@
         <div id="fullpage" ref="fullPage" v-if="showContent">
             <div id="zeroPage" class="page section">
                 <el-carousel arrow="always" :interval="4000" v-if="isPC">
-                    <el-carousel-item v-for="(item, index) in bannerList" :key="index">
+                    <el-carousel-item v-for="(item, index) in bannerList" :key="index" v-if="item.pcStatus == '1'">
                         <div class="banner01">
-                            <img :src="item.headPcBanner" style="width: 100%;height: 100%;"/>
+                            <img :src="item.headPcBanner" style="width: 100%;height: 100%;" @click="bannerPClink(item)"/>
                         </div>
                     </el-carousel-item>
                 </el-carousel>
                 <van-swipe style="height: 51vw;" v-else>
-                    <van-swipe-item v-for="(item, id) in bannerList" :key="id">
-                        <img :src="item.headAppBanner" style="width: 100%;height: 100%;"/>
+                    <van-swipe-item v-for="(item, id) in bannerList" :key="id" v-if="item.appStatus == '1'">
+                        <img :src="item.headAppBanner" style="width: 100%;height: 100%;" @click="bannerAppLink(item)"/>
                     </van-swipe-item>
                 </van-swipe>
                 <div class="Title">
@@ -367,7 +367,7 @@
                         <div class="nextChange" @click="nextPageCar">
                             <</div>
                                 <el-carousel indicator-position="outside" ref="carousel" height="30vw" :interval="4000">
-                                    <el-carousel-item v-for="item in successList" :key="item.id">
+                                    <el-carousel-item v-for="item in successList" :key="item.id" v-if="item.pcStatus == '1'">
                                         <div class="four_logo_1 animate__animated">
                                             <el-image fit="cover" :src="item.headPcBanner" style="width: 100%; height: 100%;"></el-image>
                                         </div>
@@ -382,7 +382,7 @@
                     </div>
                     <div class="H5_success" v-else>
                         <van-swipe :loop="false" :width="successSideWidth">
-                            <van-swipe-item v-for="item in successList" :key="item.id">
+                            <van-swipe-item v-for="item in successList" :key="item.id" v-if="item.appStatus == '1'">
                                 <div class="innerSuccess">
                                     <div class="title">{{item.title}}</div>
                                     <div class="content" v-html="item.content"></div>
@@ -438,7 +438,7 @@
                             <div class="community_video">
                                 <div class="community_title">美业企谈</div>
                                 <div class="community_list" v-cloak v-if="isPC">
-                                    <div class="video_list_item" :style="{marginLeft: item.id!==1 ? '1%' : '0'}" v-for="item in videoList" :key="item.id" @click="playerOn(item.cmBrandFiles[0].ossUrl)">
+                                    <div class="video_list_item" :style="{marginLeft: item.id!==1 ? '1%' : '0'}" v-for="item in videoList" :key="item.id" @click="playerOn(item.cmBrandFiles[0].ossUrl)" v-if="item.pcStatus == '1'">
                                         <div class="video_list_item_content">
                                             <div class="player_bg">
                                                 <el-image style="width: 50px; height: 50px" src="/img/supplier-login/player.png" fit="contain"></el-image>
@@ -452,7 +452,7 @@
                                 </div>
                                 <div v-else class="cm_taking">
                                     <van-swipe class="my-swipe" :width="communitySideWidth" :show-indicators="false" :loop="false" indicator-color="#FF5B00">
-                                        <van-swipe-item v-for="item in videoList" :key="item.id">
+                                        <van-swipe-item v-for="item in videoList" :key="item.id" v-if="item.appStatus == '1'">
                                             <div class="video_item">
                                                 <div class="player_bg" @click="playerOn(item.cmBrandFiles[0].ossUrl)">
                                                     <el-image style="width: 6vw; height: 6vw" src="/img/supplier-login/player.png" fit="contain"></el-image>
@@ -469,28 +469,28 @@
                             <div class="community_article">
                                 <div class="community_title">干货知识</div>
                                 <div class="community_list" v-if="isPC" v-cloak>
-                                    <div class="article_list_item" :style="{marginLeft: item.id!==1 ? '1%' : '0'}" v-for="item in articelList" :key="item.id" @click="textInfo(item.id)">
+                                    <div class="article_list_item" :style="{marginLeft: item.id!==1 ? '1%' : '0'}" v-for="item in articelList" :key="item.id" @click="textInfo(item.id)" v-if="item.pcStatus == '1'">
                                         <div class="article_list_item_content">
                                             <div class="article_bg">
                                                 <el-image :src="item.headAppBanner" fit="cover" style="width: 100%; height: 100%;"></el-image>
                                             </div>
                                             <div class="article_text">
                                                 <div class="text_title">{{item.title | textSubString(12)}}</div>
-                                                <div style="padding: 0 4%;">{{item.content.match(/[\u4e00-\u9fa5]/g).join('') | textSubString(62)}}</div>
+                                                <div class="community_content" v-html="splitContent(item.content)"></div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                                 <div v-else class="cm_taking">
                                     <van-swipe class="my-swipe" :width="communitySideWidth" :loop="false" indicator-color="#FF5B00">
-                                        <van-swipe-item v-for="item in articelList" :key="item.id" @click="textInfo(item.id)">
+                                        <van-swipe-item v-for="item in articelList" :key="item.id" @click="textInfo(item.id)" v-if="item.appStatus == '1'">
                                             <div class="video_item">
                                                 <div class="video_img">
                                                     <img style="width: 100%;height: 100%;object-fit: cover" :src="item.headAppBanner" />
                                                 </div>
                                                 <div class="article_contant">
                                                     <div class="article_tit">{{item.title}}</div>
-                                                    <div class="article_text">{{ item.content.match(/[\u4e00-\u9fa5]/g).join('') }}</div>
+                                                    <div class="article_text" v-html="splitContent(item.content)"></div>
                                                 </div>
                                             </div>
                                         </van-swipe-item>
@@ -514,7 +514,7 @@
                         <div class="showIphone_time">周一至周五 9:00~1800</div>
                         <div class="showIphone_phone" @click="callPhone">153-3889-7365</div>
                     </div>
-                    <img style="width: 48vw; height: 48vw;" src="/img/common/qr_code_kefu.png" alt="采美客服" v-else/>
+                    <img style="width: 48vw; height: 48vw;" src="/img/supplier-login/kefu_qr.jpg" alt="采美客服" v-else/>
                 </van-popup>
                 <van-popup v-model="showPopup" round>
                     <div id="H5showPopup">