Browse Source

下架美博会相关信息内容

zhengjinyi 4 years ago
parent
commit
ec6dfec587

+ 11 - 11
src/main/resources/static/js/index.js

@@ -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);
+        // }
     }
 });
 

+ 6 - 6
src/main/resources/templates/index.html

@@ -894,12 +894,12 @@
             </div>
         </div>
         <!--美博会弹窗-->
-        <div class="Popup" v-if="showflag" :class="showflag ? 'show' :'' ">
-            <div class="show_popup">
-                <div class="bg_icon" @click="closepopup"><i class="icon mIcon"></i></div>
-                <div class="bg_img" @click="zhuanti"><img src="/img/Beautyfair/youhui-pc.png" v-if="isPC"><img src="/img/Beautyfair/youhui.h5.png" v-else></div>
-            </div>
-        </div>
+<!--        <div class="Popup" v-if="showflag" :class="showflag ? 'show' :'' ">-->
+<!--            <div class="show_popup">-->
+<!--                <div class="bg_icon" @click="closepopup"><i class="icon mIcon"></i></div>-->
+<!--                <div class="bg_img" @click="zhuanti"><img src="/img/Beautyfair/youhui-pc.png" v-if="isPC"><img src="/img/Beautyfair/youhui.h5.png" v-else></div>-->
+<!--            </div>-->
+<!--        </div>-->
     </template>
 </div>
 <!-- 引入底部 -->

+ 7 - 6
src/main/resources/templates/user-center/dashboard.html

@@ -100,12 +100,13 @@
                             </div>
                         </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">-->
+<!--                            <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">
                         <div class="title">今日推荐</div>
                         <div class="section">