美博会测试

src/main/resources/static/css/index/index_new.h5.css

@@ -370,8 +370,8 @@
 }
 .Popup{position: fixed;background: rgba(34,39,46, 0.3);top: 0;left: 0;width: 100%;height: 100%;z-index: 99999;opacity: 0;}
 .Popup.show{opacity: 1;}
-.Popup .show_popup{width: 77vw;height: 85vw;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;}
+.Popup .show_popup{width: 97vw;height: 73.6vw;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;}
 .bg_img img{width: 100%;height: 100%;}
-.bg_icon{text-align: right;padding-right: 10vw}
+.bg_icon{text-align: right;position: absolute;right: 10vw;}
 .bg_icon .mIcon{width: 10vw;height: 10vw;display: inline-block;}
 .bg_icon .mIcon:before{width: 10vw;height: 10vw;background-position: -33.3vw -77.3vw;cursor: pointer;}

src/main/resources/static/css/index/index_new.pc.css

@@ -543,8 +543,8 @@ footer{
 .section_page .page_main_text .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;margin-top: 2px;}
 .Popup{position: fixed;background: rgba(34,39,46, 0.3);top: 0;left: 0;width: 100%;height: 100%;z-index: 99999;opacity: 0;}
 .Popup.show{opacity: 1;}
-.Popup .show_popup{width: 408px;height: 346px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;cursor: pointer}
+.Popup .show_popup{width: 655px;height: 460px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;cursor: pointer}
 .bg_img img{width: 100%;height: 100%;}
-.bg_icon{text-align: right}
+.bg_icon{text-align: right;position: absolute;right: 70px; top: 50px;}
 .bg_icon .icon{width: 50px;height: 50px;display: inline-block;}
 .bg_icon .icon:before{width: 50px;height: 50px;background-position: -187px -545px;cursor: pointer;}

src/main/resources/static/js/index.js

@@ -52,7 +52,7 @@ var homeData = new Vue({
 
         zhuanti:function(){
             this.showflag=false;
-            window.location.href='/product/beautytopic.html';
+            window.location.href='/activity/activityTopic.html?id=306&name=美博会';
             localStorage.setItem('lockTime',Date.now());
             window.localStorage.setItem('isActivityStatus',true);
         },
@@ -334,17 +334,17 @@ var homeData = new Vue({
         $('#advertising').on('click','.close',function () {
             $(this).parents('.item').hide();
         });
-        // var isActivityStatus =  localStorage.getItem('isActivityStatus');
-        // //新加优惠券弹窗
-        // if(isActivityStatus){
-        //     var  lockTime = localStorage.getItem('lockTime');
-        //     var  eTime = this.diffTime(lockTime);
-        //     _this.showflag = eTime;
-        // }else{
-        //     setTimeout(function () {
-        //          _this.showflag = true;
-        //     },1000);
-        // }
+        var isActivityStatus =  localStorage.getItem('isActivityStatus');
+        //新加优惠券弹窗
+        if(isActivityStatus){
+            var  lockTime = localStorage.getItem('lockTime');
+            var  eTime = this.diffTime(lockTime);
+            _this.showflag = eTime;
+        }else{
+            setTimeout(function () {
+                 _this.showflag = true;
+            },1000);
+        }
     }
 });
 

src/main/resources/templates/components/head-link.html

@@ -15,4 +15,5 @@
     <link th:href="@{/css/base/base.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <!--百度统计 start-->
     <script th:if="${siteEnv}==2">var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src = "https://hm.baidu.com/hm.js?ccdb07ae255aa2a1d68c7c725a40d99c";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script>
-    <!--百度统计 end-->
+    <!--百度统计 end-->
+    <script th:if="${siteEnv}==2">var _czc = _czc || [];_czc.push(["_setAccount", "1279558759"]);</script>

src/main/resources/templates/user-center/Beautyfair.html

@@ -39,8 +39,8 @@
                         <span v-else>优惠券仅限{{name}}使用</span>
                     </div>
                     <div class="container">
-                        <img src="/img/Beautyfair/coupon.jpg" v-if="isPC"/>
-                        <img src="/img/Beautyfair/coupon.h5.jpg" v-else/>
+                        <img src="https://static.caimei365.com/app/meibohui/www/activity-detail-pc.jpg" v-if="isPC"/>
+                        <img src="https://static.caimei365.com/app/meibohui/www/activity-detail-h5.jpg" v-else/>
                     </div>
                 </div>
             </div>

src/main/resources/templates/user-center/dashboard.html

@@ -101,12 +101,12 @@
                         </div>
                     </div>
                     <!--美博会活动标题-->
-<!--                    <div class=" user-content coupon">-->
-<!--                        <a href="/user/beautyfair.html">-->
-<!--                            <img src="/img/Beautyfair/activty-pc.jpg" class="coupon_img" v-if="isPC"/>-->
-<!--                            <img src="/img/Beautyfair/activty-h5.png" class="coupon_img" v-else>-->
-<!--                        </a>-->
-<!--		            </div>-->
+                    <div class=" user-content coupon">
+                        <a href="/user/beautyfair.html" id="meibohui" onclick="_czc.push(['_trackEvent','美博会','点击','用户访问','','meibohui'])">
+                            <img src="https://static.caimei365.com/app/meibohui/www/activity-in-pc.jpg" class="coupon_img" v-if="isPC"/>
+                            <img src="https://static.caimei365.com/app/meibohui/www/activity-in-h5.jpg" class="coupon_img" v-else>
+                        </a>
+		            </div>
                     <div class="user-content">
                         <div class="title">今日推荐</div>
                         <div class="section">