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

src/main/resources/static/css/product/beautytopic.css

@@ -33,13 +33,13 @@
 .special .content .right-box .right-coupon{width: 100%;height: auto;background-color: #FFFFFF;float: left;margin-bottom: 16px;padding: 16px;box-sizing: border-box;border-radius: 2px;}
 .special .content .right-box .right-coupon .right_item_title{width: 100%;height: 22px;line-height: 22px;margin-bottom: 8px;font-size: 16px;font-weight: bold;color: #4a4f58;}
 .special .content .right-box .right-coupon .right_item_img{width: 100%;height: 100%;}
-.special .content .left-box .Beautyfair-page .list a .page_main_text{height: 42px;padding: 0 8px;font-size: 14px;color: #4a4f58;line-height: 21px;margin-top: 10px;}
+.special .content .left-box .Beautyfair-page .list a .page_main_text{height: 42px;padding: 0 8px;font-size: 14px;line-height: 21px;margin-top: 10px;}
 .special .content .left-box .Beautyfair-page .list.live a .page_main_text{margin: 0}
 .special .content .left-box .Beautyfair-page .list a .page_main_text.shop_name{white-space: normal;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;}
 .special .content .left-box .Beautyfair-page .list a .page_main_text p{width: 150px;height: 48px;line-height: 48px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
 .special .content .left-box .Beautyfair-page .list a .Booth_text{height: 80px;}
 .special .content .left-box .Beautyfair-page .list a .Booth_text p{text-align: center;line-height: 21px;}
-.special .content .left-box .Beautyfair-page .list a .Booth_text p.name{font-size: 16px;color: #4a4f58;padding: 16px 0 5px 0;}
+.special .content .left-box .Beautyfair-page .list a .Booth_text p.name{font-size: 16px;padding: 16px 0 5px 0;}
 .special .content .left-box .Beautyfair-page .list a .Booth_text p.number{font-size: 14px;color: #93979f;}
 .special .content .left-box .Beautyfair-page .list a .page_main_text.shop_name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;}
 .Beautyfair-page .page_main_price {width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 0 8px;}

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

@@ -53,7 +53,8 @@ var homeData = new Vue({
         zhuanti:function(){
             this.showflag=false;
             window.location.href='/product/beautytopic.html';
-            window.localStorage.setItem('beatyPop',true);
+            localStorage.setItem('lockTime',Date.now());
+            window.localStorage.setItem('isActivityStatus',true);
         },
         closepopup:function(){
               this.showflag=false;
@@ -334,10 +335,6 @@ var homeData = new Vue({
             $(this).parents('.item').hide();
         });
         var isActivityStatus =  localStorage.getItem('isActivityStatus');
-        //  window.onbeforeunload = function(e) {
-        //     e = e || window.event;
-        //      window.localStorage.removeItem('beatyPop');
-        // };
         //新加优惠券弹窗
         if(isActivityStatus){
             var  lockTime = localStorage.getItem('lockTime');