美博会bug修复

src/main/resources/config/dev/application-dev.yml

@@ -53,8 +53,8 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-#  spiServer: https://spi-b.caimei365.com
-  spiServer: http://192.168.2.68:8008
+  spiServer: https://spi-b.caimei365.com
+#  spiServer: http://192.168.2.68:8008
   coreServer: https://core-b.caimei365.com
 #  coreServer: http://192.168.2.68:18002
   imageDomain: https://img-b.caimei365.com

src/main/resources/static/css/activity/activityTopic.css

@@ -2,7 +2,10 @@
 .pc_view,.mobile_view{display:none}
 /*PC端样式*/
 @media screen and (min-width:768px){
-.cm-swiper-prev,.cm-swiper-next{transition: all .4s;opacity: 0;z-index:9;position:absolute;width:44px;height:68px;background:rgba(200,200,200,.5);cursor:pointer;border-radius:4px;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%)}
+.swiper-container{padding: 20px 0 !important;}
+.banner{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;overflow:hidden}
+.banner img{display: block;width: auto;height: 420px;max-width: unset;}
+.cm-swiper-prev,.cm-swiper-next{outline: none;transition: all .4s;opacity: 0;z-index:9;position:absolute;width:44px;height:68px;background:rgba(200,200,200,.5);cursor:pointer;border-radius:4px;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%)}
 .cm-swiper-prev{left:-70px}
 .cm-swiper-next{right:-70px}
 .cm-swiper-prev::after{content:"";display:block;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:14px;height:27px;background:url(/img/activity/prev-icon.png) no-repeat center;background-size:27px auto}
@@ -10,7 +13,7 @@
 .page_floor:hover .cm-swiper-prev,.page_floor:hover .cm-swiper-next{opacity: 1;}
 
 .pc_view{display:block}
-.inner{width:1184px;margin:0 auto}
+.inner{width:884px;margin:0 auto}
 .cm-swiper-pagination{position:static;width:100%;text-align:center;padding:10px 0}
 .cm-swiper-pagination .cm-bullet{display:inline-block;width:14px;height:4px;cursor:pointer;opacity:0.2;margin:0 4px;background:#e15616;border-radius:2px;vertical-align:middle}
 .cm-swiper-pagination .cm-bullet.cm-bullet-active{width:28px;opacity:1}
@@ -22,7 +25,7 @@
 .page_floor .more .icon:before{background-position:-93px 7px;width:20px;height:32px;right:0;position:absolute}
 .page_floor .more:hover{color:#e15616;border-color:#e15616}
 .page_floor .more:hover .icon:before{background-position:-153px 7px}
-.page_floor_product .page_main .page_floor_item{float:left;margin-right:1.80995%;margin-bottom:1.80995%}
+.page_floor_product .page_main .page_floor_item{float:left;margin-right:1.80995%;margin-bottom:1.80995%;height: 0;padding-bottom: 13.5135135%;overflow: hidden;}
 .page_floor_product .page_main .page_floor_item.ad img{display:block;width:100%}
 .page_floor_product .page_main .page_floor_item.pro{position:relative;width:18.55203%;height:0;padding-bottom:30.31674%;background:#fff;overflow:hidden}
 .page_floor_product .page_main .page_floor_item .page_header{height: 0;padding-bottom: 100%;overflow: hidden;}
@@ -54,9 +57,9 @@
 .page_floor_product .page_grid_3 .ad:nth-of-type(1){width:100%;margin-right:0}
 .page_floor_product .page_grid_3 .ad:nth-of-type(2){width:59.27601%;height:0;padding-bottom:30.31674%;background:#fff;overflow:hidden}
 .page_floor_product .page_grid_3 [mr-normal]{margin-right:0}
-.page_floor_product .page_grid_4 .ad:nth-of-type(1){width:100%;margin-right:0}
-.page_floor_product .page_grid_4 .ad:nth-of-type(2){width:59.27601%}
-.page_floor_product .page_grid_4 .ad:nth-of-type(3){width:38.914027%;margin-right:0}
+.page_floor_product .page_grid_4 .ad:nth-of-type(1){width:100%;margin-right:0;height: 0;padding-bottom: 13.5135135%;overflow: hidden;}
+.page_floor_product .page_grid_4 .ad:nth-of-type(2){width:59.27601%;height: 0;padding-bottom: 30.316742%;overflow: hidden;}
+.page_floor_product .page_grid_4 .ad:nth-of-type(3){width:38.914027%;margin-right:0;height: 0;padding-bottom: 30.316742%;overflow: hidden;}
 .page_floor_product .page_grid_4 .pro:nth-of-type(5n){margin-right:0}
 .page_floor_product .page_grid_5 .ad:nth-of-type(1),.page_floor_product .page_grid_6 .ad:nth-of-type(1){width:100%;margin-right:0}
 .page_floor_product .page_grid_5 .pro:nth-of-type(5n),.page_floor_product .page_grid_6 .pro:nth-of-type(5n){margin-right:0}
@@ -64,7 +67,7 @@
 .page_floor_product .page_grid_8 .pro{margin-bottom:0}
 .page_floor_product .page_grid_8 .pro:nth-of-type(5n){margin-right:0}
 .page_floor_product .page_grid_9 .ad{background:#fff}
-.page_floor_product .page_grid_9 .ad:nth-of-type(1){width:100%;margin-right:0}
+.page_floor_product .page_grid_9 .ad:nth-of-type(1){width:100%;margin-right:0;height: 0;padding-bottom: 13.5135135%;overflow: hidden;}
 .page_floor_product .page_grid_9 .ad:nth-of-type(2){width:49.09502%;height:0;padding-bottom:27.14932%;overflow:hidden}
 .page_floor_product .page_grid_9 .ad:nth-of-type(3){width:49.09502%;margin-right:0;height:0;padding-bottom:27.14932%;overflow:hidden}
 .page_floor_product .page_grid_9 .pro:nth-of-type(5n){margin-right:0}
@@ -83,9 +86,14 @@
 .page_floor_product .page_grid_11 .pro:nth-of-type(5n){margin-right:0}
 .page_floor_picture .page_main .page_floor_item{overflow:hidden;float:left}
 .page_floor_picture .page_main .page_floor_item img{width:100%}
-.page_floor_picture .page_grid_1 .page_floor_item{width:18.55203%;height:0;padding-bottom:18.55203%;margin:0 1.80995% 1.80995% 0}
-.page_floor_picture .page_grid_1 .page_floor_item:nth-child(5n){margin-right:0}
-.page_floor_picture .page_grid_1 .page_floor_item:nth-child(6),.page_floor_picture .page_grid_1 .page_floor_item:nth-child(7),.page_floor_picture .page_grid_1 .page_floor_item:nth-child(8),.page_floor_picture .page_grid_1 .page_floor_item:nth-child(9),.page_floor_picture .page_grid_1 .page_floor_item:nth-child(10){margin-bottom:0}
+.page_floor_picture .page_grid_1 .page_floor_item{width:15.158371%;height:0;padding-bottom:15.158371%;margin:0 1.80995% 1.80995% 0}
+.page_floor_picture .page_grid_1 .page_floor_item:nth-child(6n){margin-right:0}
+.page_floor_picture .page_grid_1 .page_floor_item:nth-child(7),
+.page_floor_picture .page_grid_1 .page_floor_item:nth-child(8),
+.page_floor_picture .page_grid_1 .page_floor_item:nth-child(9),
+.page_floor_picture .page_grid_1 .page_floor_item:nth-child(10),
+.page_floor_picture .page_grid_1 .page_floor_item:nth-child(11),
+.page_floor_picture .page_grid_1 .page_floor_item:nth-child(12){margin-bottom:0}
 .page_floor_picture .page_grid_2 .page_floor_item{width:32.126696%;height:0;padding-bottom:22.42175%;margin:0 1.80995% 1.80995% 0}
 .page_floor_picture .page_grid_2 .page_floor_item:nth-child(3n){margin-right:0}
 .page_floor_picture .page_grid_2 .page_floor_item:nth-child(4),.page_floor_picture .page_grid_2 .page_floor_item:nth-child(5),.page_floor_picture .page_grid_2 .page_floor_item:nth-child(6){margin-bottom:0}
@@ -110,9 +118,9 @@
 .page_floor_article .page_grid_1 .page_floor_item .page_article_text{float:right;width:61.2739%;margin:3.68578% 3.68578% 0 0}
 .page_floor_article .page_grid_1 .page_floor_item .page_article_text .line{width:100%;height:1px;margin:4.44025% 0;background-color:#f0f0f0}
 .page_floor_article .page_grid_1 .page_floor_item .page_article_text .line::after{content:'';display:block;width:16px;height:2px;background-color:#e15616;-webkit-transform:translateY(-1px);-ms-transform:translateY(-1px);transform:translateY(-1px)}
-.page_floor_article .page_grid_1 .page_floor_item .page_article_text p{word-break:break-all;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:4;line-height:24px}
+.page_floor_article .page_grid_1 .page_floor_item .page_article_text p{word-break:break-all;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:3;line-height:24px}
 .page_floor_article .page_grid_2{position: relative;}
-.page_floor_article .page_grid_2 .page_floor_item{width:49.09502%;float:left;margin-right:1.778%;height:0;padding-bottom:36.316549%;background:#fff}
+.page_floor_article .page_grid_2 .page_floor_item{width:49.09502%;float:left;margin-right:1.778%;height:0;padding-bottom:38.316549%;background:#fff}
 .page_floor_article .page_grid_2 .page_floor_item:nth-child(2n){margin-right:0}
 .page_floor_article .page_grid_2 .page_floor_item .page_article_cover{width:100%;height:0;padding-bottom:51.369863%;background-color:#fff;overflow:hidden}
 .page_floor_article .page_grid_2 .page_floor_item .page_article_cover img{width:100%}
@@ -126,7 +134,7 @@
 .page_floor_article .page_grid_3 .page_floor_item .page_article_cover img{width:100%}
 .page_floor_article .page_grid_3 .page_floor_item .page_article_text{margin:0 5.98958%}
 .page_floor_article .page_grid_3 .page_floor_item .page_article_text h2{position:relative;margin-top:6.25%;margin-bottom:4.166667%}
-.page_floor_article .page_grid_3 .page_floor_item .page_article_text p{word-break:break-all;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:3;line-height:25px}
+.page_floor_article .page_grid_3 .page_floor_item .page_article_text p{word-break:break-all;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;line-height:25px}
 .page_floor_article .page_grid_4 .page_floor_item{width:32.12669%;float:left;margin:0 1.778% 1.778% 0;height:0;padding-bottom:31.455175%;background:#fff}
 .page_floor_article .page_grid_4 .page_floor_item:nth-child(3n){margin-right:0}
 .page_floor_article .page_grid_4 .page_floor_item:nth-child(4),.page_floor_article .page_grid_4 .page_floor_item:nth-child(5),.page_floor_article .page_grid_4 .page_floor_item:nth-child(6){margin-bottom:0}
@@ -134,27 +142,27 @@
 .page_floor_article .page_grid_4 .page_floor_item .page_article_cover img{width:100%}
 .page_floor_article .page_grid_4 .page_floor_item .page_article_text{margin:0 5.98958%}
 .page_floor_article .page_grid_4 .page_floor_item .page_article_text h2{position:relative;margin-top:6.25%;margin-bottom:4.166667%}
-.page_floor_article .page_grid_4 .page_floor_item .page_article_text p{word-break:break-all;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:3;line-height:25px}
+.page_floor_article .page_grid_4 .page_floor_item .page_article_text p{word-break:break-all;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;line-height:25px}
 .page_floor_article .page_floor_item{transition: all .4s;}
 .page_floor_article .page_floor_item:hover{
-transform:translateY(-5px);box-shadow: 0 8px 8px rgba(102,102,102,0.05), 0 10px 10px rgba(102,102,102,0.05), 0 12px 12px rgba(102,102,102,0.05);
+transform:translateY(-5px);box-shadow: 0 8px 8px rgba(102,102,102,0.05);
 }
 .page_floor_article .page_grid_1 .page_floor_item h2{position: relative}
-.page_floor_article .page_grid_1 .page_floor_item:hover{color: #e15616;}
-.page_floor_article .page_grid_2 .page_floor_item:hover h2:before{content: "";position: absolute;display: block;height: 18px;width:2px;background: #e15616;top: 3px;left: -21px; }
-.page_floor_article .page_grid_3 .page_floor_item:hover h2:before{content: "";position: absolute;display: block;height: 18px;width:2px;background: #e15616;top: 3px;left: -22px; }
-.page_floor_article .page_grid_4 .page_floor_item:hover h2:before{content: "";position: absolute;display: block;height: 18px;width:2px;background: #e15616;top: 3px;left: -22px; }
+.page_floor_article .page_grid_1 .page_floor_item:hover h2{color: #e15616;}
+.page_floor_article .page_grid_2 .page_floor_item:hover h2:before{content: "";position: absolute;display: block;height: 18px;width:2px;background: #e15616;top: 3px;left: -16px; }
+.page_floor_article .page_grid_3 .page_floor_item:hover h2:before{content: "";position: absolute;display: block;height: 18px;width:2px;background: #e15616;top: 3px;left: -17px; }
+.page_floor_article .page_grid_4 .page_floor_item:hover h2:before{content: "";position: absolute;display: block;height: 18px;width:2px;background: #e15616;top: 3px;left: -17px; }
 /**************************/
 .page_floor_product .page_grid_9 {height:0;padding-bottom:76.466216%;overflow: hidden;}
 .page_floor_product .page_grid_4 {height:0;padding-bottom:79.633445%;overflow: hidden;}
 .page_floor_product .page_grid_10 {height:0;padding-bottom:64.244932%;overflow: hidden;}
 .page_floor_product .page_grid_11 {height:0;padding-bottom:64.244932%;overflow: hidden;}
 .page_floor_product .page_grid_7 {height:0;padding-bottom:64.25%;overflow: hidden;}
-.page_floor_product .page_grid_3 {height:0;padding-bottom:79.6334459%;overflow: hidden;}
+.page_floor_product .page_grid_3 {height:0;padding-bottom:79.4334459%;overflow: hidden;}
 .page_floor_product .page_grid_2 {height:0;padding-bottom:64.25%;overflow: hidden;}
 .page_floor_product .page_grid_1 {height:0;padding-bottom:64.25%;overflow: hidden;}
-.page_floor_product .page_grid_5 {height:0;padding-bottom:47.5084459%;overflow: hidden;}
-.page_floor_product .page_grid_6 {height:0;padding-bottom:47.5084459%;overflow: hidden;}
+.page_floor_product .page_grid_5 {height:0;padding-bottom:47.3084459%;overflow: hidden;}
+.page_floor_product .page_grid_6 {height:0;padding-bottom:63.508446%;overflow: hidden;}
 .page_floor_product .max{height: auto !important;padding-bottom: 0;}
 .page_floor_product .pro{transition: all .4s;}
 .page_floor_product .pro:hover{transform:translateY(-5px);box-shadow: 0 8px 8px rgba(102,102,102,0.05), 0 10px 10px rgba(102,102,102,0.05), 0 12px 12px rgba(102,102,102,0.05);}
@@ -163,6 +171,7 @@ transform:translateY(-5px);box-shadow: 0 8px 8px rgba(102,102,102,0.05), 0 10px
 
 /*手机端样式*/
 @media screen and (max-width:768px){
+.banner{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;overflow:hidden}
 .mobile_view{display:block}
 .inner{width:100vw}
 .cm-swiper-pagination{position:static;width:100%;text-align:center;padding:1vw 0}
@@ -179,7 +188,8 @@ transform:translateY(-5px);box-shadow: 0 8px 8px rgba(102,102,102,0.05), 0 10px
 .page_floor_article .page_main .page_floor_item .page_article_text{padding:3vw}
 .page_floor_article .page_main .page_floor_item .page_article_text h2{font-size:4vw;font-weight:normal;margin-bottom:2vw;white-space:nowrap;-o-text-overflow:ellipsis;text-overflow:ellipsis;overflow:hidden}
 .page_floor_article .page_main .page_floor_item .page_article_text p{font-size:3vw;line-height:5vw;text-align:justify}
-.page_floor_article .page_grid_1 .page_floor_item{width: 94vw;height: 33vw;margin:0 3vw 3vw;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}
+.page_floor_article .page_grid_1 .page_floor_item{width: 94vw;height: 33vw;margin:0 3vw 3vw;}
+.page_floor_article .page_grid_1 .page_floor_item a{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}
 .page_floor_article .page_grid_1 .page_floor_item .page_article_cover{width:27vw;height:27vw;margin: 3.2vw 0 0 3.2vw;}
 .page_floor_article .page_grid_1 .page_floor_item .page_article_cover img{width:27vw;height:27vw}
 .page_floor_article .page_grid_1 .page_floor_item .page_article_text{width:57vw}

src/main/resources/static/js/activity/activityTopic.js

@@ -82,7 +82,7 @@ var activity = new Vue({
             if (isPC) {
                 switch (templateType) {
                     case '1':
-                        j = 10;
+                        j = 12;
                         break;
                     case '2':
                     case '6':
@@ -136,14 +136,23 @@ var activity = new Vue({
             }
             return result;
         },
+        //处理商品状态
+        fromatFloorProductStatus(formatData){
+            formatData.forEach(function(item){
+                item.floorImageList = item.floorImageList.filter(function(val){
+                   return val.pcStatus === '1'
+                });
+            });
+        },
         //获取页面数据
         getFloorData: function () {
             var _self = this;
             ProductApi.getActivityData(_self.params, function (res) {
                 if (res.code === 0) {
-                    console.log(res);
                     _self.floorList = res.data.floorList;
                     _self.pageInfo = res.data.page;
+                    _self.fromatFloorProductStatus(_self.floorList);
+
                     _self.floorList.forEach(function (page) {
                         if (page.floorContent) {
                             var templateType = page.floorContent.templateType;
@@ -163,7 +172,7 @@ var activity = new Vue({
                                 default:
                                     break;
                             }
-                            if(isPC){
+                            if (isPC) {
                                 if (templateType === '11' || templateType === '12' || templateType === '13' || templateType === '15' || templateType === '17' || templateType === '19') {
                                     if (page.floorImageList.length > 5) {
                                         page.isPageMore = true;
@@ -177,8 +186,8 @@ var activity = new Vue({
                                         page.isPageMore = true;
                                     }
                                 }
-                            }else{
-                                var type1  = ['11','12','14','15','16','17','18','19','20','6'];
+                            } else {
+                                var type1 = ['11', '12', '14', '15', '16', '17', '18', '19', '20', '6'];
                                 if (type1.indexOf(templateType) !== -1) {
                                     if (page.floorImageList.length > 4) {
                                         page.isPageMore = true;
@@ -191,7 +200,7 @@ var activity = new Vue({
                                     if (page.floorImageList.length > 3) {
                                         page.isPageMore = true;
                                     }
-                                }else if (templateType === '10') {
+                                } else if (templateType === '10') {
                                     if (page.floorImageList.length > 1) {
                                         page.isPageMore = true;
                                     }
@@ -199,97 +208,109 @@ var activity = new Vue({
                             }
                         }
                     });
-                    console.log(_self.floorList);
-                    _self.listLoading = false;
                     _self.swiperNanner();
+                    _self.initImage();
+                    _self.listLoading = false;
                 } else {
                     CAIMEI.Alert(res.msg, '确定');
                 }
             })
         },
-        //获取楼层信息
-        GetHomeFloorData: function () {
-            var _self = this;
-            ProductApi.GethomeData(_self.params, function (res) {
-                if (res.code === 0) {
-                    _self.hotlist = res.data.hotSearchList;
-                    _self.floorList = res.data.floorList;
-                    _self.typeSort = res.data.page.typeSort;
-                    _self.listLoading = false;
-                    _self.floorList.forEach(function (page) {
-                        if (page.floorContent) {
-                            if (isPC) {
-                                if (page.floorContent.templateType == '1' || page.floorContent.templateType == '3') {
-                                    if (page.floorImageList.length > 7) {
-                                        page.isPageMore = true;
-                                    }
-                                } else if (page.floorContent.templateType == '2' || page.floorContent.templateType == '4' || page.floorContent.templateType == '7') {
-                                    if (page.floorImageList.length > 5) {
-                                        page.isPageMore = true;
-                                    }
-                                } else if (page.floorContent.templateType == '5') {
-                                    if (page.floorImageList.length > 10) {
-                                        page.isPageMore = true;
-                                    }
-                                }
-                            } else {
-                                if (page.floorContent.templateType == '1' || page.floorContent.templateType == '3') {
-                                    if (page.floorImageList.length > 3) {
-                                        page.isPageMore = true;
-                                    }
-                                } else if (page.floorContent.templateType == '2' || page.floorContent.templateType == '4') {
-                                    if (page.floorImageList.length > 2) {
-                                        page.isPageMore = true;
-                                    }
-                                } else if (page.floorContent.templateType == '5') {
-                                    if (page.floorImageList.length > 4) {
-                                        page.isPageMore = true;
-                                    }
-                                }
-                            }
+
+        //用于创建高级轮播图的方法
+        swiperHandle1: function (elstr) {
+            var swiper = null;
+            return function (elstr) {
+                var slides = $(elstr).find('.swiper-slide').length;
+                if(slides>1){
+                    swiper = new Swiper(elstr, {
+                        loop: true,
+                        speed: 1000,
+                        autoplay: {
+                            delay: 5000,
+                            disableOnInteraction: false,
+                            waitForTransition: false,
+                        },
+                        pagination: {
+                            el: '.cm-swiper-pagination',
+                            bulletClass: 'cm-bullet',
+                            bulletActiveClass: 'cm-bullet-active',
+                            clickable: true,
                         }
                     });
-                    _self.SwiperNanner();
-                    _self.getClassify();
-                } else {
-                    CAIMEI.Alert(res.msg, '确定');
+                for (i = 0; i < swiper.pagination.bullets.length; i++) {
+                    swiper.pagination.bullets[i].onmouseover = function () {
+                        this.click();
+                    };
                 }
-            })
+                }
+            }
+        },
+        swiperHandle2: function (elstr,id) {
+            var swiper = null;
+            return function (elstr,id) {
+                var str = id.split('_');
+                var lastFix = str[str.length - 2] + '-' + str[str.length - 1];
+                var nextEl = '.cm-swiper-next-' + lastFix;
+                var preEl = '.cm-swiper-prev-' + lastFix;
+                var slides = $(elstr).find('.swiper-slide').length;
+                if (slides > 1) {
+                    new Swiper(elstr, {
+                        loop: true,
+                        navigation: {
+                            nextEl: nextEl,
+                            prevEl: preEl
+                        }
+                    });
+                }else{
+                    $(elstr).parents('.page_main').find('.cm-swiper-prev').css('display','none');
+                    $(elstr).parents('.page_main').find('.cm-swiper-next').css('display','none');
+                }
+            }
         },
         swiperNanner: function () {
-            var swiperStyle1 = ['product_list_8', 'page_floor_picture_01', 'page_floor_picture_02', 'page_floor_picture_05',  'page_floor_article_01','page_floor_article_04'];
-            var swiperStyle2 = ['page_floor_article_03','page_floor_article_02','page_floor_picture_03', 'page_floor_picture_04', 'page_floor_picture_06'];
+            var _that = this;
+            var swiperStyle1 = ['product_list_8', 'page_floor_picture_01', 'page_floor_picture_02', 'page_floor_picture_05', 'page_floor_article_01', 'page_floor_article_04'];
+            var swiperStyle2 = ['page_floor_article_03', 'page_floor_article_02', 'page_floor_picture_03', 'page_floor_picture_04', 'page_floor_picture_06'];
             setTimeout(function () {
                 // 图片懒加载
                 $("img[data-original]").lazyload();
                 //轮播图加载
                 $(".swiper-container").each(function (index, el) {
                     var elstr = '#' + el.id;
+                    //带页码
                     if (swiperStyle1.indexOf(el.id) !== -1) {
-                        new Swiper(elstr, {
-                            loop: true,
-                            pagination: {
-                                el: '.cm-swiper-pagination',
-                                bulletClass: 'cm-bullet',
-                                bulletActiveClass: 'cm-bullet-active'
-                            }
-                        });
+                        _that.swiperHandle1()(elstr)
                     }
-                     if (swiperStyle2.indexOf(el.id) !== -1) {
-                        var str = el.id.split('_');
-                        var lastFix =str[str.length-2] + '-' + str[str.length-1];
-                        var nextEl = '.cm-swiper-next-' + lastFix;
-                        var preEl = '.cm-swiper-prev-' + lastFix;
-                        new Swiper(elstr, {
-                            loop: true,
-                            navigation: {
-                            nextEl: nextEl,
-                            prevEl: preEl
-                          }
-                        });
+                    // 不带页码
+                    if (swiperStyle2.indexOf(el.id) !== -1) {
+                        _that.swiperHandle2()(elstr,el.id)
+                        // var str = el.id.split('_');
+                        // var lastFix = str[str.length - 2] + '-' + str[str.length - 1];
+                        // var nextEl = '.cm-swiper-next-' + lastFix;
+                        // var preEl = '.cm-swiper-prev-' + lastFix;
+                        // new Swiper(elstr, {
+                        //     loop: true,
+                        //     navigation: {
+                        //         nextEl: nextEl,
+                        //         prevEl: preEl
+                        //     }
+                        // });
                     }
                 });
             }, 500);
+        },
+        initImage() {
+            setTimeout(function () {
+                var ads = $('.ad,.page_floor_picture .page_floor_item');
+                ads.each(function (index, item) {
+                    var height = $(item).height();
+                    var paddingBottom = $(item).css('padding-bottom');
+                    if (height === 'undefine' || height === 0) {
+                        $(item).children().children().css('height', paddingBottom)
+                    }
+                });
+            })
         }
     },
     mounted: function () {

src/main/resources/templates/activity/activityTopic.html

@@ -20,8 +20,10 @@
     <div class="content">
         <!--活动主题图片-->
         <div class="banner" v-if="pageInfo">
-            <img :src="pageInfo.headImage" v-if="isPC">
-            <img :src="pageInfo.crmHeadImage" v-else>
+            <a :href="pageInfo.headLink !== ''?pageInfo.headLink : 'javascript:void(0)'">
+                <img :src="pageInfo.headImage" v-if="isPC">
+                <img :src="pageInfo.crmHeadImage" v-else>
+            </a>
         </div>
         <!-- 内容区域 -->
         <div class="inner">