美博会

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

@@ -54,7 +54,7 @@
     .section_page .page_main_text{
         padding: 0 3.2vw;
         height: 9.3vw;
-        line-height: 4.8vw;
+        line-height: 5vw;
         font-size: 3.4vw;
         vertical-align: middle;
         word-break: break-all;
@@ -368,4 +368,10 @@
     border-radius: 0px 10px 0px 0px;
     margin-top: .5vw;
 }
-
+.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;}
+.bg_img img{width: 100%;height: 100%;}
+.bg_icon{text-align: right}
+.bg_icon .mIcon{width: 9vw;height: 9vw;display: inline-block;}
+.bg_icon .mIcon:before{width: 9vw;height: 9vw;background-position: -187px -545px;cursor: pointer;}

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

@@ -539,58 +539,12 @@ footer{
     #sideNav,#scrollTop{right:10px;margin-right:0;opacity:.9;}
     #advertising{left:10px;margin-left:0;opacity:.9;}
 }
-/*美博会标签*/
-.section_page .page_main_text .tag{
-        width: 44px;
-        height: 18px;
-        line-height: 18px;
-        font-size: 12px;
-        float: left;
-        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;
-			}
-			.bg_img img{
-				width: 100%;
-				height: 100%;
-			}
-			.bg_icon{text-align: right}
-			.bg_icon .icon{
-			    width: 50px;
-				height: 50px;
-				display: inline-block;
-			}
-			.bg_icon .icon:before{
-				width: 50px;
-				height: 50px;
-				background-position: -187px -545px;
-    			cursor: pointer;
-			}
+/*美博会*/
+.section_page .page_main_text .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;float: left;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;}
+.bg_img img{width: 100%;height: 100%;}
+.bg_icon{text-align: right}
+.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/css/product/beautytopic.css

@@ -310,19 +310,19 @@
 	.special .content .left-box{margin-top: 3vw;overflow: hidden}
 	.special .content .left-box .Beautyfair-page .page-title{padding: 4.8vw 0 2.4vw 3.2vw}
 	.special .content .left-box .Beautyfair-page .page-title h1{font-size: 4.8vw;color: #4a4f58;font-weight: bold;line-height: 9.7vw}
-	.special .content .left-box .Beautyfair-page .page-title p{font-size: 3.4vw;color: #93979f;line-height: 4.3vw;}
+	.special .content .left-box .Beautyfair-page .page-title p{font-size: 3.4vw;color: #93979f;line-height: 4.3vw;float: left}
 	.special .content .left-box .Beautyfair-page .list a{width: 45.6vw;height: 32.4vw;display: block;float: left;margin-right:2.4vw;margin-bottom: 2.4vw;background-color: #FFFFFF;}
 	.special .content .left-box .Beautyfair-page {width: 100%;height: auto;float: left;}
 	.special .content .left-box .Beautyfair-page .list a img {width: 100%;height: 100%;}
-	.special .content .left-box .Beautyfair-page .list{padding-left: 3.2vw;overflow: hidden}
+	.special .content .left-box .Beautyfair-page .list{padding-left: 3.2vw;overflow: hidden;width: 100%;margin-top: 5vw}
 	.special .content .left-box .Beautyfair-page .list.exhibitor a{width: 21.6vw;height: 21.6vw;}
 	.special .content .left-box .Beautyfair-page .list.exhibitor{height: 47.9vw;}
-	.Beautyfair-page .section_page_more .more{width: 20vw;height: 6.4vw;margin: 5vw auto;border: .27vw solid #cccccc;color: #909090;font-size: 3vw;line-height: 6.4vw;border-radius: .54vw;position: relative;text-indent: 2vw;}
-    .Beautyfair-page .section_page_more .more .icon:before {background-position: -51.5vw 0px;width:5.4vw;height: 6.7vw;right: 0;position: absolute;}
+	.Beautyfair-page .Beautyfair-page_more .more{width: 20vw;height: 6.4vw;margin: 5vw auto;border: .27vw solid #cccccc;color: #909090;font-size: 3vw;line-height: 6.4vw;border-radius: .54vw;position: relative;text-indent: 2vw;}
+    .Beautyfair-page .Beautyfair-page_more .more .icon:before {background-position: -51.5vw 0px;width:5.4vw;height: 6.7vw;right: 0;position: absolute;}
 	.special .content .left-box .Beautyfair-page .list.live a{width: 41vw;height: 51.8vw;display: inline-block;float: none;flex-shrink: 0}
 	.special .content .left-box .Beautyfair-page .list.live a img{width: 41vw;height: 41vw;}
 	.special .content .left-box .Beautyfair-page .list.live,.special .content .left-box .Beautyfair-page .list.supplier{white-space: nowrap;overflow-x: auto;}
-	.special .content .left-box .Beautyfair-page .list a .page_main_text {height: 10.8vw;padding: 0 3vw;font-size: 3.1vw;color: #4a4f58;line-height:5vw;}
+	.special .content .left-box .Beautyfair-page .list a .page_main_text {height: 10.8vw;padding: 0 3vw;font-size: 3.1vw;color: #4a4f58;line-height:5.1vw;}
 	.special .content .left-box .Beautyfair-page .list a .page_main_text p {width: 33.5vw;height: 10.8vw;line-height: 10.8vw;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 	.special .content .left-box .Beautyfair-page .list.Floorplan a{height: 52.5vw;}
 	.special .content .left-box .Beautyfair-page .list.Floorplan a img{height: 35.7vw;}
@@ -334,7 +334,74 @@
 	.special .content .left-box .Beautyfair-page .list.supplier a img{height: 41vw;}
 	.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;margin-top: 2vw;}
 	.special .content .left-box .Beautyfair-page .list a .page_main_text.shop_name .tag{width: 11.3vw;height: 4.3vw;line-height: 4.3vw;font-size:2.8vw;float: left;margin-right: 1.3vw;text-align: center;color: #FFFFFF;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 2vw 0px 0px;}
-
+	.Beautyfair-page .page_main_price .icon:before { width:16.8vw;height: 5vw}
+    .Beautyfair-page .page_main_price .price_grade_1:before{
+        background-position: -83.5vw -69.4vw;
+    }
+    .Beautyfair-page .page_main_price .price_grade_2:before{
+        background-position: -83.5vw -76.4vw;
+    }
+    .Beautyfair-page .page_main_price .price_grade_3:before{
+        background-position: -83.5vw -83.4vw;
+    }
+    .Beautyfair-page .page_main_price .price_grade_4:before{
+         background-position: -83.5vw -90.4vw;
+    }
+    .Beautyfair-page .page_main_price .price_grade_5:before{
+        background-position: -83.5vw -97.4vw;
+    }
+    .price_grade .bold {font-weight: bold;}
+	.Beautyfair-page .page_main_price .main_price_none .listTag{
+        padding: 0 2vw;
+        border: .27vw solid #ffe6dc;
+        background: none;
+        font-size: 2.8vw;
+        float: right;
+    }
+    .Beautyfair-page .page_main_price .price_grade{
+        display: block;
+        height: 7vw;
+        line-height: 7vw;
+        color: #4A4F58;
+        font-style: normal;
+        float: left;
+    }
+    .Beautyfair-page .page_main_price .price_grade .icon {
+        display: inline-block;
+        font-size: 0;
+        height: 5vw;
+        line-height: 5vw;
+        vertical-align: text-bottom;
+    }
+     .Beautyfair-page .page_main_price{
+        width: 100%;
+        box-sizing: border-box;
+        padding:0 3.2vw;
+    }
+    .Beautyfair-page .page_main_price .price_text_tag{
+        width: 100%;
+        box-sizing: border-box;
+        float: left;
+    }
+    .Beautyfair-page .page_main_price .main_price_show{color:#f94b4b }
+    .Beautyfair-page .page_main_price .main_price_unde{
+        width: 100%;
+        height: 6.5vw;
+        line-height: 6.5vw;
+        font-size: 3.4vw;
+        color: #4a4f58;
+        text-align: left;
+        float: left;
+    }
+    .Beautyfair-page .page_main_price .price_text_tag .listTag{
+        padding: 0 2vw;
+        border: .27vw solid #ffe6dc;
+        background: none;
+        font-size: 2.8vw;
+        float: left;
+        height: 4.2vw;
+        line-height: 4.2vw;
+    }
 }
 
 

src/main/resources/static/css/supplier-center/dashboard.css

@@ -60,8 +60,6 @@
      #StatisticsEacths {width: 968px;height: 440px;box-sizing: border-box;background: #FFF;padding:20px 0;margin-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
      .Statistics .Stati_top{padding: 0 22px}
      .mainContent p{    display: inline-block;margin-right: 10px;}
-     .coupon{width: 100%;height: 240px}
-     .coupon .coupon_img{width: 100%;height: 100%;}
  }
 
 /*移动端*/

src/main/resources/static/js/base.js

@@ -622,7 +622,8 @@ function setSearchProductList(list, userId, callback) {//处理搜索
             priceFlag: item.p_price_flag,
             priceGrade: item.p_price_grade,
             actStatus: 0,
-            priceLoaded: false
+            priceLoaded: false,
+            actflag:item.p_act_flag
         });
         // 0公开价格 1不公开价格 2仅对会员机构公开
         if (item.p_price_flag !== 1) {

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

@@ -52,7 +52,7 @@ var homeData = new Vue({
         closepopup:function(){
               this.showflag=false;
               $('.Popup').slideUp(100);
-              window.localStorage.setItem('isNotice',true);
+              window.sessionStorage .setItem('beatyPop',false);
         },
         GetBanners: function(){
             var _self = this;
@@ -111,7 +111,7 @@ var homeData = new Vue({
         },
         GetHomeFloorData: function(){
             var _self = this;
-            PublicApi.GetHomeData({userId:GLOBAL_USER_ID,soure:1},function(response){
+            PublicApi.GetHomeData({userId:GLOBAL_USER_ID,source:1},function(response){
                 if(response.code == 0){
                     var data = response.data;
                     // var floorList = [];
@@ -270,12 +270,13 @@ var homeData = new Vue({
         this.GetHomeFloorData();
     },
     mounted: function() {
-     var isNotice =  window.localStorage.getItem('isNotice');
+        var _this = this;
+     var beatyPop =  window.sessionStorage .getItem('beatyPop');
         //新加  公告弹窗
-        if(isNotice){
-            this.showflag = false;
+        if(beatyPop){
+            _this.showflag = false;
         }else{
-            this.showflag = true;
+            _this.showflag = true;
             $('.Popup').slideDown(100);
 
         }

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

@@ -1,6 +1,7 @@
 var beautytopic = new Vue({
     el:'#beautytopic',
     data:{
+        listLoading:true,
          productList:[],
          Descriptors:[],//描述词
          List:[
@@ -19,10 +20,22 @@ var beautytopic = new Vue({
              }
          ],
          userId:0,
+         userIdentity:'',
          image:'',
          showflag:false,
     },
     methods:{
+        inletFn:function(){
+            if(this.userId==0){
+                window.location.href='/login.html'
+            }else {
+                if(this.userIdentity==3){
+                    window.location.href='/supplier-center/dashboard.html'
+                }else {
+                    window.location.href='/user-center/dashboard'
+                }
+            }
+        },
         gosupplier:function (id) {
             window.location.href='/supplier/index.html?id='+id
         },
@@ -72,14 +85,18 @@ var beautytopic = new Vue({
         _this.SwiperBanner();
         if(globalUserData){
             _this.userId = globalUserData.userId;
+            _this.userIdentity = globalUserData.userIdentity;
         }
         ProductApi.GetbeautyProduct({userId:_this.userId},function (res) {
             if (res.code==0){
                 _this.productList = res.data;
+                _this.listLoading = false;
                setTimeout(function(){
                 // 图片懒加载
                 $("img[data-original]").lazyload();
             },500);
+            }else {
+             _this.listLoading = true;
             }
         })
     }

src/main/resources/templates/index.html

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

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

@@ -12,18 +12,16 @@
 <template th:replace="components/header"></template>
 <!--美博会专题-->
     <div class="special" id="beautytopic">
-<!--    		<div v-if="listLoading" class="loading">-->
-<!--                <img src="/img/base/loading.gif">-->
-<!--            </div>-->
-<!--            <template v-else>-->
-<!--				-->
-<!--			</template>-->
+    		<div v-if="listLoading" class="loading">
+                <img src="/img/base/loading.gif">
+            </div>
+            <template v-else>
 			<div class="banner"><img src="https://img-b.caimei365.com/group1/M00/03/0E/Cmgy61_AbE6ASfSAAAXVQSfTjug588.jpg"></div>
 			<div class="content">
 				<div class="inner">
 				<div class="right-box">
-						<div class="right-coupon">
-							<a href="#">
+						<div class="right-coupon" @click="inletFn">
+							<a href="javascript:0;">
 								<div class="right_item_title" v-if="isPC">优惠券</div>
 								<img src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" class="right_item_img"/>
 							</a>
@@ -201,7 +199,9 @@
 					<div class="bg_img"><img :src="image"></div>
 				</div>
 			</div>
+			</template>
 		</div>
+
     <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>

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

@@ -47,7 +47,7 @@
 <!--                    <a th:href="@{'/product/list.html?category=' + *{bigTypeId} + '-' + *{smallTypeId} + '-' + *{tinyTypeId}}" th:text="*{tinyTypeText}"></a>-->
                 </div>
                 <div class="Beautyfair">
-                    <span class="tag">美博会</span>
+                    <span class="tag" v-if="priceObj.beautyActFlag==1">美博会</span>
                     <h1 class="title" th:text="*{name}">商品名称</h1>
                 </div>
                 <p class="tags">

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

@@ -83,11 +83,6 @@
                          </li>
                      </ul>
                 </div>
-                 <div class="coupon">
-                    <a href="/user/beautyfair.html">
-                        <img src="https://img.caimei365.com/group1/M00/03/E7/Cmis21__8PWAIwVFAAFDC-LzNbM213.jpg" class="coupon_img"/>
-                    </a>
-		         </div>
                 <div class="ranking">
                     <div class="rank_top">
                         <p>单品销售排名</p>

src/main/resources/templates/supplier/index.html

@@ -61,7 +61,8 @@
                                     <span v-if="p.actType==1||p.actType==2" :class="p.actType==1?'icon mIcon hot':'icon mIcon new'"></span>
                                 </a>
                                 <a class="name" :href="'/product-'+p.id+'.html'">
-                                    <span v-html="addhtml + p.name"></span>
+                                    <span v-html="addhtml + p.name" v-if="p.actflag==1"></span>
+                                    <span v-html="p.name" v-else></span>
                                 </a>
                                 <div class="price mfhc">
                                     <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
@@ -104,8 +105,8 @@
                                     <span v-if="p.actType==1||p.actType==2" :class="p.actType==1?'icon mIcon hot':'icon mIcon new'"></span>
                                 </a>
                                 <a class="name" :href="'/product-'+p.id+'.html'">
-<!--                                    <span v-html="p.name"></span>-->
-                                    <span v-html="addhtml + p.name"></span>
+                                    <span v-html="addhtml + p.name" v-if="p.actflag==1"></span>
+                                    <span v-html="p.name" v-else></span>
                                 </a>
                                 <div class="price mfhc">
                                     <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">