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

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

@@ -331,7 +331,8 @@ a{color:#333;text-decoration:none}
 .cm-btn-box .cm-toggle-btn.down::after{background-position-x:-96px}
 .cm-btn-box .cm-toggle-btn.up::after{background-position-x:-125px}
 .cm-float-container{position:fixed;z-index:999;bottom:12%;right:15px}
-.cm-float-container .cm-slide{position:relative;width:12vw;height:12vw;margin:0.8vw 0;border-radius:6px;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s;cursor:pointer}
+.cm-float-container .cm-regexp{ background: #fff; font-size: 2.4vw;line-height: 1.4;display: flex;justify-content: center;align-items: center;text-align: center;color: #666;}
+.cm-float-container .cm-regexp,.cm-float-container .cm-slide{position:relative;width:12vw;height:12vw;margin:0.8vw 0;border-radius:6px;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s;cursor:pointer}
 .cm-float-container .cm-slide .cm-toggle-btn{top:0;right:0;position:absolute;width:100%;height:100%}
 .cm-float-container .cm-slide:hover .cm-tooltop{display:block}
 .cm-float-container .cm-slide:hover .cm-toggle-btn{width:150%}
@@ -678,7 +679,9 @@ a{color:#333;text-decoration:none}
 .cm-btn-box .cm-toggle-btn:hover.down::after{background-position-x:-150px}
 .cm-btn-box .cm-toggle-btn:hover.up::after{background-position-x:-180px}
 .cm-float-container{position:fixed;z-index:999;bottom:12%;right:15px}
-.cm-float-container .cm-slide{position:relative;width:64px;height:64px;margin:6px 0;border-radius:6px;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s;cursor:pointer}
+.cm-float-container .cm-regexp{display: flex;justify-content: center;align-items: center;text-align: center; background: #fff;font-size: 14px;color: #666;line-height: 1.4}
+.cm-float-container .cm-regexp:hover{ color: #fff; background:#ff5c00 }
+.cm-float-container .cm-regexp,.cm-float-container .cm-slide{position:relative;width:64px;height:64px;margin:6px 0;border-radius:6px;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s;cursor:pointer}
 .cm-float-container .cm-slide .cm-toggle-btn{top:0;right:0;position:absolute;width:100%;height:100%}
 .cm-float-container .cm-slide:hover .cm-tooltop{display:block}
 .cm-float-container .cm-slide:hover .cm-toggle-btn{width:150%}
@@ -705,10 +708,9 @@ a{color:#333;text-decoration:none}
 .cm-entry .cm-icon-content .btn{display: block;width: 60px;height: 60px;background: #666;position: absolute;right: 40px;z-index: 999;cursor: pointer;opacity: 0;}
 .cm-entry .cm-icon-content .btn1{top: 122px;}
 .cm-entry .cm-icon-content .btn2{top: 250px;}
-.banner-container{position:relative;height:480px;background:pink;overflow:hidden}
-.banner-container .banner{position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}
-.banner-container .cm-container{height:100%}
-.banner-container img{display:block;min-width:1920px;}
+.banner-container{display: flex;justify-content: center; height:480px;background:pink;width: 100%;overflow: hidden;}
+.banner-container .banner{ height: 480px;}
+.banner-container .banner img{display: block;min-width: 1920px}
 .cm-to-top{width:64px;height:64px;position:fixed;z-index:999;bottom:5%;right:15px;border-radius:6px;text-align:center;background:#fff;cursor:pointer;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s}
 .cm-to-top .cm-icon-bar{display:block;margin:0 auto;-webkit-transition:all 0.2s;-o-transition:all 0.2s;transition:all 0.2s}
 .cm-to-top .cm-icon-bar:nth-child(1){width:28px;height:4px;background:#999999;margin-top:20px}

src/main/resources/static/css/product/detail.h5.css

@@ -7,7 +7,7 @@ li{list-style:none}
 .productBox .imageBox{width:100%;height:100vw;position:relative}
 #swiperImage .swiper-wrapper .swiper-slide{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden;text-align:center}
 #swiperImage .swiper-wrapper img{width:auto;height:100vw;display:block}
-#swiperImage .swiper-wrapper .swiper-slide .cm-product-cover-tag{position:absolute;top: 3vw;right: 3vw;width: 15.9vw;height: 5.5vw;background: url(/img/activity/cm_cover_bg_h5.png) no-repeat center;background-size: 15.9vw;text-align: center;color: #fff;line-height: 5.5vw;font-size: 2vw;}
+#swiperImage .swiper-wrapper .swiper-slide .cm-product-cover-tag{position:absolute;top: 0;right: 3vw;width: 15.9vw;height: 10.5vw;background: url(/img/activity/cm_cover_bg_h5.png) no-repeat center;background-size: 15.9vw;text-align: center;color: #fff;line-height: 5.5vw;font-size: 2vw;}
 .productBox .detailBox{box-sizing:border-box;padding:0 3.3vw;overflow:hidden;position: relative;}
 .productBox .detailBox .crumbs{height:8vw;line-height:8vw;font-size:3.1vw;overflow:hidden;color:#93979F}
 .productBox .detailBox .crumbs a{color:#93979F}

src/main/resources/static/css/product/detail.pc.css

@@ -9,7 +9,7 @@ li{list-style:none;}
 .productBox img{width:100%;height:100%;display:block}
 .productBox .bigImage{position:relative; width:452px;height:452px;background:#F3F7FE;border: 1px solid #e4e4e4;}
 .productBox .bigImage .mask{display:none;position:absolute;left:0;top:0;width:215px;height:215px;border:1px solid #aaa;background:rgba(255,208,22,.4);opacity:.5;filter:alpha(opacity:50);cursor:move}
-.productBox .bigImage .cm-product-cover-tag{position:absolute;top: 10px;right: 10px;width: 75px;height: 27px;background: url(/img/activity/cm_cover_bg_pc.png) no-repeat center;background-size: 75px;text-align: center;color: #fff;line-height: 27px;font-size: 12px;}
+.productBox .bigImage .cm-product-cover-tag{position:absolute;top: 0;right: 15px;width: 75px;height: 49px;background: url(/img/activity/cm_cover_bg_pc.png) no-repeat center;background-size: 75px;text-align: center;color: #fff;line-height: 27px;font-size: 12px;}
 .productBox .smallImage{height:79px;padding-top:14px;overflow:hidden}
 .productBox .smallImage ul{width:452px}
 .productBox .smallImage li{float:left;box-sizing:border-box;width:79px;height:79px;margin-left:14px;background:#F3F7FE;opacity:.5;-moz-transition:.5s;-webkit-transition:.5s;transition:.5s}

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

@@ -16,14 +16,10 @@
 <div id="app">
     <!-- 大图 -->
     <div class="banner-container">
-        <div class="cm-container cm-relative">
-            <div class="banner">
-                <a :href="pageInfo && pageInfo.headLink">
-                    <img :src="pageInfo && pageInfo.crmHeadImage" alt="" v-if="isMobile"/>
-                    <img :src="pageInfo && pageInfo.headImage" alt="" v-else/>
-                </a>
-            </div>
-        </div>
+        <a :href="pageInfo && pageInfo.headLink" class="banner">
+            <img :src="pageInfo && pageInfo.crmHeadImage" alt="" v-if="isMobile"/>
+            <img :src="pageInfo && pageInfo.headImage" alt="" v-else/>
+        </a>
     </div>
     <template v-for="(floorData,index) in floorList">
         <div class="cm-floor">
@@ -737,38 +733,42 @@
     </template>
     <!-- 侧边浮窗 -->
     <div class="cm-float-container" v-if="activityEntryVisiable || contactVisiable">
-        <div class="cm-slide" v-show="activityEntryVisiable">
-            <div class="cm-toggle-btn" @click="handleToggleActive(true)"></div>
-        </div>
-        <template v-if="contactVisiable">
-            <div class="cm-slide">
-                <div class="cm-toggle-btn"></div>
-                <div class="cm-tooltop">
-                    <div class="cm-tooltop-content cm-tooltop-1">
-                        <div class="cm-item">展会咨询电话：15338897365</div>
-                        <i></i>
-                        <div class="cm-item">客服咨询电话：15338851365</div>
-                    </div>
-                </div>
+        <a class="cm-regexp" href="/help/1038.html" target="_blank">优惠券<br />规则</a>
+        <div>
+            <div class="cm-slide" v-show="activityEntryVisiable">
+                <div class="cm-toggle-btn" @click="handleToggleActive(true)"></div>
             </div>
-            <div class="cm-slide">
-                <div class="cm-toggle-btn"></div>
-                <div class="cm-tooltop cm-mobile-tooltop">
-                    <div class="cm-tooltop-content cm-tooltop-2 cm-clearfix">
-                        <div class="cm-item cm-left">
-                            <img width="108" height="108"
-                                 src="https://static.caimei365.com/app/img/icon2/cm_wechat_02.png" alt=""/>
-                            <span>展会咨询微信</span>
+            <template v-if="contactVisiable">
+                <div class="cm-slide">
+                    <div class="cm-toggle-btn"></div>
+                    <div class="cm-tooltop">
+                        <div class="cm-tooltop-content cm-tooltop-1">
+                            <div class="cm-item">展会咨询电话：15338897365</div>
+                            <i></i>
+                            <div class="cm-item">客服咨询电话：15338851365</div>
                         </div>
-                        <div class="cm-left line"></div>
-                        <div class="cm-item cm-left">
-                            <img width="108" height="108" src="https://static.caimei365.com/app/img/icon2/cm_wechat_01.png" alt=""/>
-                            <span>客服咨询微信</span>
+                    </div>
+                </div>
+                <div class="cm-slide">
+                    <div class="cm-toggle-btn"></div>
+                    <div class="cm-tooltop cm-mobile-tooltop">
+                        <div class="cm-tooltop-content cm-tooltop-2 cm-clearfix">
+                            <div class="cm-item cm-left">
+                                <img width="108" height="108"
+                                     src="https://static.caimei365.com/app/img/icon2/cm_wechat_02.png" alt=""/>
+                                <span>展会咨询微信</span>
+                            </div>
+                            <div class="cm-left line"></div>
+                            <div class="cm-item cm-left">
+                                <img width="108" height="108"
+                                     src="https://static.caimei365.com/app/img/icon2/cm_wechat_01.png" alt=""/>
+                                <span>客服咨询微信</span>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-        </template>
+            </template>
+        </div>
     </div>
     <!-- 获取入口图标 -->
     <div class="cm-entry" v-show="activityEntryVisiable && isActive">

src/main/resources/templates/product/detail.html

@@ -26,13 +26,15 @@
                 <div v-if="isPC" class="bigImage">
                     <img :src="images[0]">
                     <span class="mask"></span>
-                    <span class="cm-product-cover-tag" v-if="isPC && pcActType === 1">云上美博会</span>
+<!--                    <span class="cm-product-cover-tag" v-if="isPC && pcActType === 1">云上美博会</span>-->
+                    <span class="cm-product-cover-tag" v-if="isPC && pcActType === 1"></span>
                 </div>
                 <div id="swiperImage" class="smallImage swiper-container">
                     <ul class="swiper-wrapper clear">
                         <li class="swiper-slide mfc" v-for="img in images">
                             <img :src="img">
-                            <span class="cm-product-cover-tag" v-if="!isPC && pcActType === 1">云上美博会</span>
+<!--                            <span class="cm-product-cover-tag" v-if="!isPC && pcActType === 1">云上美博会</span>-->
+                            <span class="cm-product-cover-tag" v-if="!isPC && pcActType === 1"></span>
                         </li>
                     </ul>
                     <div class="swiper-pagination mfc"></div>