Merge remote-tracking branch 'origin/developer' into developer

src/main/resources/static/css/base/base.h5.css

@@ -9,7 +9,8 @@
 .pcOnly,.jqSelect .pc,.baseHeadCenter .headCart,.baseHeadCenter .hotKey,.baseTopNav_nav{display:none!important;}
 .baseHeadTop .wrap ul>li,.baseHeadTop .header_top_left{display:none;}
 .mIcon:before{content:'';display:inline-block;font-size:0;background:url(/img/supplier-login/H5.png) no-repeat;background-size:100vw auto;}
-.H5-icon:before{content:'';display:inline-block;font-size:0;background:url(/img/supplier-login/H5.png) no-repeat;background-size:100vw auto;}
+/*.H5-icon:before{content:'';display:inline-block;font-size:0;background:url(/img/supplier-login/H5.png) no-repeat;background-size:100vw auto;}*/
+.H5-icon:before{content:'';display:inline-block;font-size:0;background:url(/img/base/H5-icon.png) no-repeat;background-size:100vw auto;}
 .icon.shop,.icon.heart{vertical-align:middle;display:inline-block;height:5.5vw;line-height:5.5vw}
 .icon.shop:before{width:7.5vw;height:6vw;background-position:-91vw -.5vw}
 .icon.heart:before{width:5.5vw;height:5.5vw;background-position:0 -17vw}
@@ -85,11 +86,11 @@
     float: left;
     margin-left: 2vw;
 }
-.baseHeadCenter .search .jqSelect{width:20vw;height:9.6vw;position:relative;font-size: 0;}
+.baseHeadCenter .search .jqSelect{width:21vw;height:9.6vw;position:relative;font-size: 0;}
 .baseHeadCenter .search .jqSelect select{width:20vw;height:9.6vw;line-height:9.6vw;border:none;font-size:3.7vw;color:#4A4F58;padding:0 6vw 0 3vw}
 .baseHeadCenter .search .jqSelect:before{right:4vw;line-height:9.6vw}
 .baseHeadCenter .search .jqSelect:after{content:'';position:absolute;right:0;top:3.4vw;width:.5vw;height:2.8vw;background:#BEC2C9}
-.baseHeadCenter .search .keyword{position:absolute;right:0;top:0;border:none;outline:none;width:66.4vw;height:8.6vw;line-height:8.6vw;font-size:3.7vw;color:#4A4F58;text-indent:2.6vw}
+.baseHeadCenter .search .keyword{position:absolute;right:0;top:0;border:none;outline:none;width:64.4vw;height:8.6vw;line-height:8.6vw;font-size:3.7vw;color:#4A4F58;text-indent:2.6vw}
 .baseHeadCenter .search .searchBtn{position:absolute;right:1.2vw;top:0}
 .baseHeadCenter .search .searchBtn:before{content:'';display:block;width:9.6vw;height:9.6vw;background-position:-24vw 1.5vw}
 .baseHeadCenter.account{height:13.4vw;border-bottom:solid 1px #ebecef}

src/main/resources/static/css/base/base.pc.css

@@ -26,7 +26,7 @@ iframe{width:320px !important;height: 280px !important}
 .jqSelect ul{display:none;position:absolute;left:0;background:#FFF;box-shadow:0 3px 6px rgba(45,48,54,.2);border-radius:2px;z-index:9}
 .jqSelect ul li{box-sizing:border-box;padding:0 15px;display:inline-block;width:100%;height:38px;line-height:38px;white-space:nowrap;text-align:left;cursor:pointer}
 .jqSelect ul li:hover{background:#FEF6F3;color:#FF5B00}
-.wrap{width:1280px;margin:0 auto;}
+.wrap{width:1184px;margin:0 auto;}
 .icon:before,.baseTopNav .nav:after{content:'';display:inline-block;background:url(/img/supplier-login/PC.png) no-repeat;font-size:0;}
 .WEB-icon:before{content:'';display:inline-block;background:url(/img/base/WEB-icon.png) no-repeat;font-size:0;}
 .icon.shop,.icon.heart{vertical-align:middle;display:inline-block;height:25px;line-height:25px;}
@@ -108,13 +108,13 @@ iframe{width:320px !important;height: 280px !important}
 .baseHeadCenter,.baseTopNav{width:100%;background:#FFF}
 .baseHeadCenter .wrap{height: 100px;box-sizing: border-box;padding: 10px 0;}
 .baseHeadCenter .logo{float:left;width:228px;height:76px;margin-right:75px;}
-.baseHeadCenter .searchBox{width:668px;float:left}
+.baseHeadCenter .searchBox{width:570px;float:left}
 .baseHeadCenter .search{width:100%;height:44px;line-height:44px;border:1px solid #FFE6DC;position:relative}
 .baseHeadCenter .search:before{content:'';position:absolute;left:104px;top:16px;height:12px;border-right:2px solid #C0C6D1}
 .baseHeadCenter .search .jqSelect{width:104px;height:44px;line-height:44px;border:none}
 .baseHeadCenter .search .jqSelect:before{right:16px}
 .baseHeadCenter .search .jqSelect ul{z-index:999;}
-.baseHeadCenter .keyword{width:578px;height:44px;line-height:44px;text-indent:15px;position:absolute;right:0;top:0;border:none;outline:none}
+.baseHeadCenter .keyword{width:478px;height:44px;line-height:44px;text-indent:15px;position:absolute;right:0;top:0;border:none;outline:none}
 .baseHeadCenter .keyword:focus{outline:none;border:none}
 .baseHeadCenter .searchBtn{position:absolute;right: 0;top: 0;font-size:0;padding: 7px 12px;height: 30px;line-height: 30px;}
 .baseHeadCenter .searchBtn:before{width: 30px;height: 30px;background-position: 4px 4px;}

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

@@ -216,11 +216,13 @@ html {
         -ms-flex-direction: column;
             flex-direction: column;
     border-radius: 6px;
-    padding: 6.667vw 0;
+    padding: 5.667vw 0;
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
 }
-
+#fullpage {
+    margin-top: -6vw;
+}
 #H5showPopup {
     width: 60vw;
     height: 36vw;
@@ -269,15 +271,16 @@ html {
 }
 
 #H5dialogVisible .showIphone .showIphone_phone {
-    color: #FF5B00;
+    color: #FF5B00 !important;
     font-size: 4vw;
     font-weight: bold;
     border-bottom: 1px solid #FF5B00;
+    -webkit-text-fill-color: #FF5B00 !important;
 }
 
 #zeroPage {
     background: #fff;
-    margin-top: 13.6vw;
+    margin-top: 16.6vw;
 }
 
 #zeroPage .H5-banner_1 {
@@ -330,11 +333,11 @@ html {
 
 #zeroPage .server {
     width: 100%;
-    height: 76vw;
+    height: 82vw;
 }
 
 .server .van-swipe {
-    height: 70vw;
+    height: 77vw;
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
@@ -351,14 +354,14 @@ html {
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
-    height: 60vw;
+    height: 66vw;
 }
 
 .server .van-swipe-item {
-    width: 55vw !important;
+    width: 65vw !important;
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
-    margin-right: 2.4vw;
+    margin-right: 4.4vw;
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
@@ -391,8 +394,8 @@ html {
 }
 
 .van-swipe-item .server_img {
-    width: 21.6vw;
-    height: 20vw;
+    width: 26.6vw;
+    height: 25vw;
 }
 
 #firstPage {
@@ -542,23 +545,18 @@ html {
 
 .H5_opera .online_store {
     background: url(/img/supplier-login/H5/sotre_online.png) center no-repeat;
-    background-size: contain;
+    background-size: cover;
+    z-index: 0;
 }
 
 .H5_opera .author {
     background: url(/img/supplier-login/H5/author_online.png) center no-repeat;
-    background-size: contain;
+    background-size: cover;
+    background-position: bottom;
 }
 
-.H5_opera .opera_online,
-.H5_opera .opera_author {
-    z-index: 111;
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 26vw;
-    height: 8vw;
-    background: #FAFAFA;
+.van-popup--center.van-popup--round {
+    border-radius: 8px !important;
 }
 
 .H5_opera .opera_online {
@@ -589,7 +587,7 @@ html {
 
 .H5_contant .H5_contant_item {
     height: 44.933vw;
-    border: 1px solid #F0F0F0;
+    border: 0.2px solid #F0F0F0;
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
     background: #fff;
@@ -634,8 +632,30 @@ html {
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
+    position: relative;
+}
+.H5_contant .getMore:before {
+    position: absolute;
+    width: 1.333vw;
+    height: 1.333vw;
+    content: '';
+    transform: rotate(45deg);
+    right: 30vw;
+    top: 7vw;
+    border-bottom: 1px solid;
+    border-right: 1px solid;
+}
+.H5_contant .getMore:after {
+    position: absolute;
+    width: 1.333vw;
+    height: 1.333vw;
+    content: '';
+    transform: rotate(45deg);
+    right: 30vw;
+    top: 6vw;
+    border-bottom: 1px solid;
+    border-right: 1px solid;
 }
-
 #fourPage {
     padding: 1px 0 5.667vw 0;
 }
@@ -700,6 +720,11 @@ html {
     color: #666666;
     font-size: 2.8vw;
     line-height: 5.6vw;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 15;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
 }
 
 .H5_success .van-swipe .van-swipe-item .innerSuccess .success_img {
@@ -721,7 +746,7 @@ html {
     padding: 5.067vw 3.2vw;
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
-    background: rgba(255, 255, 255, 0.5);
+    background: rgba(255, 255, 255, 0.2);
     font-size: 3.2vw;
     line-height: 6.4vw;
     color: #fff;
@@ -924,6 +949,7 @@ html {
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
+    flex-direction: column;
     -webkit-box-pack: center;
         -ms-flex-pack: center;
             justify-content: center;
@@ -951,4 +977,19 @@ video {
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
     margin-top: 13.6vw;
-}
+}
+.videoClose {
+    width: 40px;
+    height: 40px;
+    margin-bottom: -20px;
+    margin-right: -20px;
+    z-index: 1;
+}
+.close {
+    width: 82%;
+    display: flex;
+    justify-content: flex-end;
+}
+#myVideo {
+    object-fit: cover;
+}

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;
@@ -327,10 +328,6 @@ body{
 }
 #fullpage {
     width: 100vw;
-    position: absolute;
-    left: 0;
-    top: 0;
-    height: 800vh;
     scroll-behavior: smooth;
     transition: all 0.8s ease;
 }
@@ -362,13 +359,8 @@ body{
     align-items: center;
 }
 #zeroPage .banner01 {
-    background: url("/img/supplier-login/01-banner/banner-01.png") no-repeat;
-    background-size: 100% 100%;
     width: 100%;
     height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
 }
 #zeroPage .banner01 .left {
     height: 155px;
@@ -426,6 +418,9 @@ body{
     border-radius: 50%;
     opacity: 1;
 }
+.footTop {
+    margin-top: 0 !important;
+}
 #zeroPage {
     background-color: #fff;
 }
@@ -1230,6 +1225,10 @@ body{
     color: #E2E2E2;
     cursor: pointer;
 }
+#fourPage .pageInner_contain .nextChange:hover{
+    border: 1px solid #FF5B00;
+    color: #FF5B00;
+}
 #fourPage .pageInner_contain .isActiveNext{
     border: 1px solid #FF5B00;
     color: #FF5B00;
@@ -1267,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;
@@ -1368,6 +1372,9 @@ body{
     animation: animate 1s linear infinite;
     animation-delay: calc(0.5s * var(--i))
 }
+#sixPage {
+    height: auto !important;
+}
 #sixPage .contant_init {
     display:flex;
     justify-content: center;
@@ -1376,7 +1383,6 @@ body{
 }
 #sixPage .community {
     width: 1200px;
-    height: 70vh;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -1409,15 +1415,17 @@ body{
     font-size: 1vw;
 }
 .community .community_list {
-    width: 100%;
-    display: flex;
+    width: 1200px;
+    display: grid;
     /*justify-content: space-between;*/
+    grid-template-columns: repeat(4, 1fr);
     align-items: center;
-    height: 90%;
+    overflow: hidden;
+    grid-row-gap: 10px;
 }
 .community_list .video_list_item {
-    width: 24%;
-    height: 100%;
+    width: 280px;
+    height: 260px;
     box-sizing: border-box;
     padding-top: 5px;
     display: flex;
@@ -1428,8 +1436,8 @@ body{
     cursor: pointer;
 }
 .community_list .article_list_item {
-    width: 24%;
-    height: 100%;
+    width: 280px;
+    height: 260px;
     box-sizing: border-box;
     padding-top: 5px;
     display: flex;
@@ -1482,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%;
@@ -1510,80 +1521,24 @@ body{
     border-left: 3px solid #FF5B00;
     padding: 0 4%;
 }
-.video_list_item:nth-child(1):hover {
+.video_list_item:hover {
     padding: 0 0 5px 0;
 }
-.video_list_item:nth-child(1):hover .video_list_item_content {
+.video_list_item:hover .video_list_item_content {
     box-shadow: 0px 6px 35px 0px rgba(255,157,102,0.12);
     color: #FF5B00;
 }
-.video_list_item:nth-child(1):hover .player_bg {
-    display: flex;
-}
-.video_list_item:nth-child(2):hover .player_bg {
+.video_list_item:hover .player_bg {
     display: flex;
 }
-.video_list_item:nth-child(3):hover .player_bg {
-    top: 0;
-    display: flex;
-}
-.video_list_item:nth-child(4):hover .player_bg {
-    top: 0;
-    display: flex;
-}
-.video_list_item:nth-child(2):hover {
+.article_list_item:hover {
     padding: 0 0 5px 0;
 }
-.video_list_item:nth-child(2):hover .video_list_item_content {
-    box-shadow: 0px 6px 35px 0px rgba(255,157,102,0.12);
-    color: #FF5B00 !important;
-}
-.video_list_item:nth-child(3):hover {
-    padding: 0 0 5px 0;
-}
-.video_list_item:nth-child(3):hover .video_list_item_content {
-    box-shadow: 0px 6px 20px 0px rgba(255,157,102,0.12);
-    color: #FF5B00 !important;
-}
-.video_list_item:nth-child(4):hover {
-    padding: 0 0 5px 0;
-}
-.video_list_item:nth-child(4):hover .video_list_item_content{
-    box-shadow: 0px 6px 20px 0px rgba(255,157,102,0.12);
-    color: #FF5B00;
-}
-.article_list_item:nth-child(1):hover {
-    padding: 0 0 5px 0;
-}
-.article_list_item:nth-child(1):hover .article_list_item_content {
-    box-shadow: 0px 6px 20px 0px rgba(255,157,102,0.12);
-    color: #FF5B00 !important;
-}
-.article_list_item:nth-child(2):hover .article_list_item_content {
-    box-shadow: 0px 6px 20px 0px rgba(255,157,102,0.12);
-    color: #FF5B00 !important;
-}
-.article_list_item:nth-child(3):hover .article_list_item_content {
-    box-shadow: 0px 6px 20px 0px rgba(255,157,102,0.12);
-    color: #FF5B00 !important;
-}
-.article_list_item:nth-child(4):hover .article_list_item_content {
+.article_list_item:hover .article_list_item_content {
     box-shadow: 0px 6px 20px 0px rgba(255,157,102,0.12);
     color: #FF5B00 !important;
 }
-.article_list_item:nth-child(2):hover {
-    padding: 0 0 5px 0;
-}
-.article_list_item:nth-child(3):hover {
-    padding: 0 0 5px 0;
-}
-.article_list_item:nth-child(4):hover {
-    padding: 0 0 5px 0;
-}
-.article_list_item:nth-child(1):hover .text_title,
-.article_list_item:nth-child(2):hover .text_title,
-.article_list_item:nth-child(3):hover .text_title,
-.article_list_item:nth-child(4):hover .text_title {
+.article_list_item:hover .text_title {
     color: #FF5B00 !important;
 }
 @keyframes animate {
@@ -1613,4 +1568,34 @@ body{
     z-index: 999;
     justify-content: center;
     align-items: center;
+    flex-direction: column;
+}
+#seven {
+    height: auto !important;
+}
+.videoClose {
+    width: 40px;
+    height: 40px;
+    cursor: pointer;
+    margin-bottom: -20px;
+    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;
+    justify-content: flex-end;
 }

src/main/resources/static/js/common/serviceapi/supplier.service.js

@@ -747,5 +747,14 @@ var SupplierApi = {
                 callback(res);
             });
         },
-
+        supplierLoading: function (params, callback) {//标记通知消息
+            Http.AjaxService({
+                url: '/user/landing/info',
+                type:'get',
+                data:params,
+                json:false,
+            }).then(function (res) {
+                callback(res);
+            });
+        },
 };

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

@@ -87,7 +87,7 @@ new Vue({
             contant: [{
                 id: 9,
                 title: '分销体系',
-                contant: '快速解决多方分账难题；',
+                contant: '降低管理成本，提升经营效率；',
             }, {
                 id: 10,
                 title: '会议营销',
@@ -246,7 +246,7 @@ new Vue({
         }, {
             id: 9,
             title: '分销体系',
-            contant: '快速解决多方分账难题；',
+            contant: '降低管理成本，提升经营效率；',
             url: '/img/supplier-login/H5/marketing/09.png'
         }, {
             id: 10,
@@ -274,6 +274,11 @@ new Vue({
         showIphone: false,
         showPopup: false, // 是否拨打电话
         isScroll: false, // 是否滚动
+        bannerList: [],
+        successList: [],
+        videoList: [],
+        articelList: [],
+        isAthord: false,
     },
     created() {
         this.screenWidth = document.body.clientWidth
@@ -287,6 +292,7 @@ new Vue({
         this.getPageSnap()
         this.goLinkActive()
         this.ScenarioListFilter(6)
+        this.getSupplierInfoLanding()
         this.backIntoView()
     },
     filters: {
@@ -296,7 +302,7 @@ new Vue({
                 return value + '...'
             }
             return val
-        }
+        },
     },
     watch: {
         screenWidth: {
@@ -305,7 +311,8 @@ new Vue({
                     this.isPC = true
                 } else {
                     this.isPC = false
-                    this.swiperSideWidth = val * 2 / 3
+                    this.getSupplierInfoLanding()
+                    this.swiperSideWidth = val * 4 / 5
                     this.successSideWidth = val * 0.8
                     this.communitySideWidth = val * 0.416
                 }
@@ -313,6 +320,26 @@ new Vue({
         },
     },
     methods: {
+        splitContent(text) {
+            return text.replace(/<[^>]+>/g, '').replace(/[ ]|[&nbsp;]/g, '')
+        },
+        getSupplierInfoLanding() {
+            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;
             PublicApi.getAuthShopCount({ commonId: shopId }, function(response) {
@@ -329,10 +356,13 @@ new Vue({
             });
         },
         backIntoView() {
-            if (location.search) {
-                const id = location.search
-                const to = document.getElementById(id.substring(1, id.length))
-                to.scrollIntoView()
+            if (localStorage.getItem('activeLink')) {
+                const id = localStorage.getItem('activeLink')
+                this.H5link({
+                    id: this.activeLinks.filter(e => e.href === id)[0].id,
+                    href: id
+                })
+                localStorage.removeItem('activeLink')
             }
         },
         // 底部切换
@@ -427,7 +457,7 @@ new Vue({
         // 播放器
         playerOff() {
             this.$refs.Myplayer.style.display = 'none'
-            this.$refs.cm_player.play()
+            this.$refs.cm_player.pause()
         },
         playerOn(src) {
             this.$refs.Myplayer.style.display = 'flex'
@@ -467,7 +497,7 @@ new Vue({
         textInfo(id) {
             const fullPage = this.$refs.fullPage
             fullPage.removeEventListener('mousewheel', (e) => this.scrollChange(e))
-            const textInfoForm = this.community_article_list.filter(item => item.id === id)
+            const textInfoForm = this.articelList.filter(item => item.id === id)
 
             this.textContent = textInfoForm[0]
             if (localStorage.getItem('text_info_from')) {
@@ -490,9 +520,6 @@ new Vue({
                 callback: action => {}
             });
         },
-        scrollintoview() {
-            document.getElementById('thirdPage').scrollIntoView()
-        },
         // 截取运营产品
         ScenarioListFilter(index) {
             this.filterH5ScenarioList = this.H5ScenarioList.filter(item => item.id <= index)
@@ -542,5 +569,21 @@ new Vue({
             window.location.href = 'tel:153-3889-7365';
             this.showPopup = false
         },
+        tipAuthor() {
+            this.isAthord = false
+        },
+        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/static/js/supplier-login/text_info.js

@@ -521,9 +521,8 @@ new Vue({
             this.drawer = !this.drawer
         },
         H5link($event) {
-            // window.location.href = `/supplier-login/index.html?${$event.href}`
-            // this.scrollToDom(to, window)
-            window.history.go(-1)
+            localStorage.setItem('activeLink', $event.href)
+            window.location.href = `/supplier-login/index.html`
         },
         // 滚动函数
         scrollToDom(to, container) {

src/main/resources/templates/account/login.html

@@ -62,6 +62,7 @@
                     </div>
                 </div>
                 <div class="forget">
+<!--                    <a class="btn" href="/club/register.html" rel="nofollow" onclick="_czc.push(['_trackEvent','登录页面','注册','点击','','Um_Event_Regirster'])">免费注册</a>-->
                     <a class="btn" href="/club/register.html" rel="nofollow" onclick="_czc.push(['_trackEvent','登录页面','注册','点击','','Um_Event_Regirster'])">免费注册</a>
                     <a href="/forget.html" v-if="loginTabs === 1" style="z-index: 99999">忘记密码？</a>
                 </div>

src/main/resources/templates/components/header.html

@@ -45,13 +45,13 @@
                     <div class="cShow" v-if="userIdentity == 4 || userIdentity == 2">
                         <a href="/user/dashboard.html" rel="nofollow">我的采美</a>
                         <a href="/user/setting/information.html" rel="nofollow">机构资料</a>
-                        <a @click="goMsgLinkFn('/user/message/list.html')" href="javascript:void(0);">我的消息<span>（{{noticeNum}}）</span></a>
+                        <a v-if="!isPC" @click="goMsgLinkFn('/user/message/list.html')" href="javascript:void(0);">我的消息<span>（{{noticeNum}}）</span></a>
                         <a href="javascript:void(0);" @click="userLogOut()">退出登录</a>
                     </div>
                     <div class="cShow" v-if="userIdentity == 3">
                         <a href="/supplier/dashboard.html" rel="nofollow">我的采美</a>
                         <a href="javascript:void(0);" @click="pageLinkSupplier()">店铺管理</a>
-                        <a @click="goMsgLinkFn('/supplier/message/list.html')" href="javascript:void(0);">我的消息<span>（{{noticeNum}}）</span></a>
+                        <a v-if="!isPC" @click="goMsgLinkFn('/supplier/message/list.html')" href="javascript:void(0);">我的消息<span>（{{noticeNum}}）</span></a>
                         <a href="javascript:void(0);" @click="userLogOut()">退出登录</a>
                     </div>
                 </li>
@@ -72,9 +72,9 @@
             </a>
             <div class="mf h5Only mUserCenter">
                 <template v-if="loginStatus">
-                    <a class="mUserIcon mIcon toLogin" href="/user/member.html" v-if="!isPC && userIdentity != 3" title="超级会员" rel="nofollow"></a>
+                    <a class="mUserIcon mIcon superVip" href="/user/member.html" v-if="!isPC && userIdentity != 3" title="超级会员" rel="nofollow"></a>
                     <a href="/shopping/cart.html" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" v-if="!isPC && userIdentity != 3" title="购物车" rel="nofollow"></a>
-<!--                    <a v-if="userIdentity===3" @click="goMsgLinkFn('/supplier/message/list.html')" href="javascript:void(0);" :class="loginStatus?'mNotice H5-icon':'mNotice H5-icon toLogin'" title="消息" rel="nofollow"></a>-->
+<!--                    <a v-if="userIdentity===3" style="background-position: " @click="goMsgLinkFn('/supplier/message/list.html')" href="javascript:void(0);" :class="loginStatus?'mNotice H5-icon':'mNotice H5-icon toLogin'" title="消息" rel="nofollow"></a>-->
 <!--                    <a v-else @click="goMsgLinkFn('/user/message/list.html')" href="javascript:void(0);" :class="loginStatus?'mNotice H5-icon':'mNotice H5-icon toLogin'" title="消息" rel="nofollow"></a>-->
                     <a @click="showGlobalMenu()" class="mUserIcon mIcon" href="javascript:void(0);" title="个人中心" rel="nofollow"></a>
                 </template>
@@ -85,7 +85,7 @@
                 </template>
             </div>
             <div class="searchBox" id="topSearch">
-                <div class="search auto-input" id="autoInput" :style="{float: (userIdentity !== 3 && loginStatus) ? 'none' : '', margin: (userIdentity !== 3 && loginStatus) ? '0 auto' : '' }">
+                <div class="search auto-input" :style="{float: (userIdentity !== 3 && loginStatus) ? 'none' : '', margin: (userIdentity !== 3 && loginStatus) ? '0 auto' : '', width: userIdentity == 4 || userIdentity == 2 ? '95.4vw' : '' }" id="autoInput">
                     <div class="jqSelect">
                         <div class="pc">
                             <span data-select="0">产品</span>

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

@@ -3,6 +3,7 @@
 
 <head>
     <meta charset="UTF-8" />
+    <meta name="referrer" content="never">
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=0" />
     <meta name="format-detection" content="telephone=yes" />
@@ -23,6 +24,8 @@
 </head>
 
 <body>
+<input type="hidden" th:value="${coreServer}" id="coreServer">
+<input type="hidden" th:value="${agent}" id="userAgent">
     <div id="login_content" ref="login_content">
         <div class="login_header">
             <div class="login_header_container">
@@ -58,10 +61,10 @@
                             <img src="/img/supplier-login/H5/userdefault.png" style="width: 5vw;height: 5vw" />
                         </div>
                         <div style="color: #FF5B00;font-size: 3.6vw;margin: 0 3.6vw;">菜单</div>
-                        <img src="/img/supplier-login/H5/openMenu.png" @click="openDrawn" v-if="!drawer" style="width: 3.2vw;height: 3.2vw" />
-                        <img src="/img/supplier-login/H5/close.png" v-else @click="openDrawn" style="width: 3.2vw;height: 3.2vw" />
+                        <img src="/img/supplier-login/H5/openMenu.png" @click="openDrawn" v-if="!drawer" style="width: 4.2vw;height: 4.2vw" />
+                        <img src="/img/supplier-login/H5/close.png" v-else @click="openDrawn" style="width: 4.2vw;height: 4.2vw" />
                     </div>
-                    <div class="login_regist" v-if="!isPC && !userInfo">
+                    <div class="login_regist" v-if="!userInfo">
                         <div class="login_btn"><a rel="nofollow" href="/supplier/register.html">注册</a></div>
                         <div class="login_btn" style="background: #FF5B00;"><a class="login_a" style="color:white" href="/supplierlogin.html" rel="nofollow">登录</a></div>
                     </div>
@@ -79,10 +82,10 @@
             <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'})" v-if="activeLinkId!==0"></div>
+            <div class="slide_icon_item goTop" @click="H5link({href: '#zeroPage', id: 0})" v-if="activeLinkId!==0"></div>
         </div>
         <div class="slide_icon" v-if="!isPC">
             <div class="slide_icon_item slide_icon_phone" @click="handlerDialog(true)">
@@ -100,22 +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>
+                    <el-carousel-item v-for="(item, index) in bannerList" :key="index" v-if="item.pcStatus == '1'">
                         <div class="banner01">
-                            <div class="left animate__animated" :class="activeId === 0 ? 'animate__backInLeft' : ''"></div>
-                            <div class="right animate__animated" :class="activeId === 0 ? 'animate__backInRight' : ''"></div>
+                            <img :src="item.headPcBanner" style="width: 100%;height: 100%;" @click="bannerPClink(item)"/>
                         </div>
                     </el-carousel-item>
-                    <el-carousel-item>
-                        <div class="banner02"></div>
-                    </el-carousel-item>
                 </el-carousel>
                 <van-swipe style="height: 51vw;" v-else>
-                    <van-swipe-item>
-                        <div class="H5-banner_1"></div>
-                    </van-swipe-item>
-                    <van-swipe-item>
-                        <div class="H5-banner_2"></div>
+                    <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">
@@ -302,10 +298,8 @@
                 </div>
                 <div class="operationa" v-else>
                     <div class="H5_opera">
-                        <div class="author"></div>
-                        <div class="online_store"></div>
-                        <div class="opera_online"></div>
-                        <div class="opera_author"></div>
+                        <div class="author" @click="tipAuthor" :style="{'z-index': isAthord ? '1' : '0','background-position': isAthord ? 'inherit' : 'bottom' }"></div>
+                        <div class="online_store" @click="tipOnline" :style="{'z-index': isAthord ? '0' : '1','background-position': isAthord ? 'bottom' : 'center' }"></div>
                     </div>
                 </div>
                 <div v-if="isPC" id="positionTab"></div>
@@ -370,12 +364,12 @@
                 </div>
                 <div style="display: flex;justify-content: center;align-items: center;margin-top: 10vh;" v-if="isPC">
                     <div class="pageInner_contain">
-                        <div class="nextChange" :class="isActiveNext ? 'isActiveNext' : ''" @click="nextPageCar">
+                        <div class="nextChange" @click="nextPageCar">
                             <</div>
                                 <el-carousel indicator-position="outside" ref="carousel" height="30vw" :interval="4000">
-                                    <el-carousel-item v-for="item in el_carousel_list" :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.bg" style="width: 100%; height: 100%;"></el-image>
+                                            <el-image fit="cover" :src="item.headPcBanner" style="width: 100%; height: 100%;"></el-image>
                                         </div>
                                         <div class="logo_text animate__animated">
                                             <div class="logo_title">{{item.title}}</div>
@@ -383,23 +377,16 @@
                                         </div>
                                     </el-carousel-item>
                                 </el-carousel>
-                                <div class="nextChange" :class="isActiveNext ? '' : 'isActiveNext'" @click="prePageCar">></div>
+                                <div class="nextChange"  @click="prePageCar">></div>
                         </div>
                     </div>
                     <div class="H5_success" v-else>
                         <van-swipe :loop="false" :width="successSideWidth">
-                            <van-swipe-item>
+                            <van-swipe-item v-for="item in successList" :key="item.id" v-if="item.appStatus == '1'">
                                 <div class="innerSuccess">
-                                    <div class="title">私域流量运营难</div>
-                                    <div class="content">来自西班牙的明星品牌，在进入中国市场后行了大量的运营资源投放，却依旧无法精准触达用户、回收市场数据。采美采用B2B2C私域运营模式对该品牌及竞品进行全面分析，对比两者之间的优势和劣势，为需要宣传的品牌进行关键词组布局，在采美商城优先进行品牌曝光度。并通过认证通、采美社群等工具，向B端客户推送相关活动，刺激B端客户向C端客户进一步传播品牌形象和实力，从而吸引更多的B端客户来访；采美CRM系统对来访客户做用户行为轨迹跟踪，完善用户画像，帮助品牌精准获取客户资料，筛选出优质客户。既提高该品牌的知名度，又保证了用户数据的精准度。</div>
-                                    <img class="success_img" src="/img/supplier-login/H5/success_1.jpg" />
-                                </div>
-                            </van-swipe-item>
-                            <van-swipe-item>
-                                <div class="innerSuccess" style="margin-left: 3vw;">
-                                    <div class="title">营销获客难</div>
-                                    <div class="content">连续七年专注敏感肌肤的皮肤管理品牌,在法国荣获全球护肤品创新品牌大奖，品牌实力不容小觑，但由于对B端机构宣传不足,在营销获客上十分艰难。 采美团队通过前期市场调研分析后提炼了B端关键词并进行布局，将品牌专利技术的相关内容在采美媒体矩阵同步分发，最终形成全渠道、全链路整合内容营销；将旗下产品搭配导入仪器做联合活动，双向锁定潜在客户，客户询盘量显著增长，解决了单一产品销售难的问题。</div>
-                                    <img class="success_img" src="/img/supplier-login/H5/success_2.jpg" />
+                                    <div class="title">{{item.title}}</div>
+                                    <div class="content" v-html="item.content"></div>
+                                    <img class="success_img" :src="item.headAppBanner" />
                                 </div>
                             </van-swipe-item>
                         </van-swipe>
@@ -441,7 +428,7 @@
                     </div>
                     <div v-if="isPC" id="positionTab"></div>
                 </div>
-                <div id="sixPage" class="page section" style="background: #fff">
+                <div id="sixPage" class="page section" style="background: #fff;">
                     <div class="Title" style="background: #fff">
                         <div class="text animate__animated">增长社区</div>
                         <div class="title animate__animated">数十年资深美业运营经验，教你快速成长</div>
@@ -451,13 +438,13 @@
                             <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 community_video_list" :key="item.id" @click="playerOn(item.video)">
+                                    <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>
                                             </div>
                                             <div class="video_player">
-                                                <el-image :src="item.bg" fit="contain"></el-image>
+                                                <el-image :src="item.headAppBanner" fit="contain"></el-image>
                                             </div>
                                             <div class="video_title">{{item.title | textSubString(45)}}</div>
                                         </div>
@@ -465,13 +452,13 @@
                                 </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 community_video_list" :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.video)">
+                                                <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>
                                                 </div>
                                                 <div class="video_img">
-                                                    <img style="width: 100%;height: 100%" :src="item.bg" />
+                                                    <img style="width: 100%;height: 100%" :src="item.headAppBanner" />
                                                 </div>
                                                 <div class="video_title">{{item.title | textSubString(17)}}</div>
                                             </div>
@@ -482,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 community_article_list" :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.bg" fit="cover" style="width: 100%; height: 100%;"></el-image>
+                                                <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 | textSubString(50)}}</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 community_article_list" :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.bg" />
+                                                    <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}}</div>
+                                                    <div class="article_text" v-html="splitContent(item.content)"></div>
                                                 </div>
                                             </div>
                                         </van-swipe-item>
@@ -514,36 +501,24 @@
                     </div>
                     <div v-if="isPC" id="positionTab"></div>
                 </div>
-                <div v-if="isPC" id="sevenPage" class="page" style="display: flex;
-                    flex-direction: column;
-                    align-items: end;
-                    justify-content: end;background: #fff;height: auto;">
-                    <!-- 底部区域 end -->
-                    <template th:replace="components/footer"></template>
-                    <template th:replace="components/foot-link"></template>
-                </div>
-                <div v-if="!isPC" id="sevenPage">
-                    <!-- 底部区域 end -->
-                    <template th:replace="components/footer"></template>
-                    <template th:replace="components/foot-link"></template>
-                </div>
-                <div class="cm_video_player" @click="playerOff" ref="Myplayer">
-                    <video controls ref="cm_player" width="60%">
-                <source type="video/mp4">
-                您的浏览器不支持Video标签。
-            </video>
+                <div class="cm_video_player" ref="Myplayer">
+                    <div class="close"><el-image @click="playerOff" src="https://static.caimei365.com/app/img/supplier-login/close.png" class="videoClose"></el-image></div>
+                    <video controls ref="cm_player" id="myVideo" width="60%" webkit-playsinline="true" playsinline="true">
+                        <source type="video/mp4">
+                        您的浏览器不支持Video标签。
+                    </video>
                 </div>
                 <!--  微信电话弹窗  -->
                 <van-popup id="H5dialogVisible" round v-model="H5dialogVisible">
                     <div class="showIphone" v-if="showIphone">
                         <div class="showIphone_time">周一至周五 9:00~1800</div>
-                        <div class="showIphone_phone" @click="callPhone">153-3889-7365</div>
+                        <div class="showIphone_phone" @click="confirm">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">
-                        <div>确定拨打<span style="color: #FF5B00;font-weight: bold;">153-3889-7365 </span>吗？</div>
+                        <div>确定拨打<span style="color: #FF5B00;-webkit-text-fill-color: #FF5B00 !important;font-weight: bold;">153-3889-7365 </span>吗？</div>
                         <div style="display: flex;justify-content: space-between;">
                             <el-button class="btn_popup" @click="cancel">取消</el-button>
                             <el-button class="btn_popup" type="primary" @click="confirm">确定</el-button>
@@ -551,12 +526,6 @@
                     </div>
                 </van-popup>
             </div>
-            <div class="text_info" v-else style="background: #fff;">
-                <div class="text_info_contain" v-html="textContent" v-if="textContent"></div>
-                <!-- 底部区域 end -->
-                <template th:replace="components/footer"></template>
-                <template th:replace="components/foot-link"></template>
-            </div>
             <!--  抽屉  -->
             <el-drawer :visible.sync="drawer" v-if="!isPC">
                 <div class="drawer_box" @click="H5link(item)" v-for="item in activeLinks" :key="item.id">{{item.title}}</div>
@@ -565,13 +534,16 @@
             <van-action-sheet v-model="cShow" :actions="supplierActions" @select="onSelect" v-if="userInfo.userIdentity === 3" />
             <van-action-sheet v-model="cShow" :actions="userActions" @select="onSelect" v-if="userInfo.userIdentity === 2 || userInfo.userIdentity === 4" />
         </div>
+<div>
+    <!-- 底部区域 end -->
+    <template th:replace="components/footer"></template>
+    <template th:replace="components/foot-link"></template>
+</div>
 
-
-        <!--<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>-->
         <script src="https://unpkg.com/vant@2.12/lib/vant.min.js"></script>
-        <!--<script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>-->
+        <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
         <script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
         <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-login/login.js(v=${version})}"></script>
 </body>
 
-</html>
+</html>

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

@@ -61,7 +61,7 @@
                         <img src="/img/supplier-login/H5/openMenu.png" @click="openDrawn" v-if="!drawer" style="width: 3.2vw;height: 3.2vw" />
                         <img src="/img/supplier-login/H5/close.png" v-else @click="openDrawn" style="width: 3.2vw;height: 3.2vw" />
                     </div>
-                    <div class="login_regist" v-if="!isPC && !userInfo">
+                    <div class="login_regist" v-if="!userInfo">
                         <div class="login_btn"><a rel="nofollow" href="/supplier/register.html">注册</a></div>
                         <div class="login_btn" style="background: #FF5B00;"><a class="login_a" style="color:white" href="/supplierlogin.html" rel="nofollow">登录</a></div>
                     </div>
@@ -69,7 +69,7 @@
             </div>
         </div>
         <div class="text_info" v-if="!showContent" style="background: #fff;">
-            <div class="text_info_contain" v-html="JSON.parse(localStorage.getItem('text_info_from')).text"></div>
+            <div class="text_info_contain" v-html="JSON.parse(localStorage.getItem('text_info_from')).content"></div>
             <!-- 底部区域 end -->
             <template th:replace="components/footer" v-if="isPC"></template>
             <template th:replace="components/foot-link" v-if="isPC"></template>
@@ -91,4 +91,4 @@
     <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-login/text_info.js(v=${version})}"></script>
 </body>
 
-</html>
+</html>