美博会

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

@@ -372,6 +372,6 @@
 .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;}
+.bg_icon{text-align: right;padding-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/product/beautytopic.css

@@ -311,12 +311,12 @@
 	.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;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 .list a{width: 45.6vw;height: 32.4vw;display: block;float: left;margin-right:2vw;margin-bottom: 2vw;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;width: 100%;margin-top: 5vw}
+	.special .content .left-box .Beautyfair-page .list{padding-left: 3vw;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;}
+	.special .content .left-box .Beautyfair-page .list.exhibitor{height: 46.9vw;}
 	.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}
@@ -324,7 +324,7 @@
 	.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: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{height: 52.5vw;width: 46vw !important;margin: 0 1vw 2vw 1vw }
 	.special .content .left-box .Beautyfair-page .list.Floorplan a img{height: 35.7vw;}
 	.special .content .left-box .Beautyfair-page .list a .Booth_text{height: 16.8vw;padding:0 3.2vw;}
 	.special .content .left-box .Beautyfair-page .list a .Booth_text p.name{font-size: 3.4vw;width:100%;color: #4a4f58;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;padding:4.2vw  0 2vw 0;}
@@ -402,7 +402,74 @@
         height: 4.2vw;
         line-height: 4.2vw;
     }
-   .special .content .left-box .Beautyfair-page .list.exhibitor
+   .special .content .left-box .Beautyfair-page .list.exhibitor.max{height: auto}
+   .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;
+	}
+	.special .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;
+	}
+	.special .Popup .show_popup{
+		width: 94vw;
+		height: 85vw;
+		position: absolute;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		margin: auto;
+	}
+	.bg_img{
+		width: 94vw;
+		height: 73vw;
+	}
+	.bg_img img{
+		width: 100%;
+		height: 100%;
+	}
+	.bg_icon{text-align: right}
+	.bg_icon .mIcon{
+		width: 10vw;
+		height: 10vw;
+		display: inline-block;
+	}
+	.bg_icon .icon:before{
+		width:10vw;
+		height: 10vw;
+		background-position: -33.3vw -77.3vw;
+	}
+	.Beautyfair-page .section_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 .mainBox{
+	    margin: auto;
+		width: 97vw;
+		height: 120vw;
+		overflow: hidden;
+	}
 }
 
 

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

@@ -49,15 +49,16 @@ var homeData = new Vue({
         },
     },
     methods: {
+
         zhuanti:function(){
             this.showflag=false;
             window.location.href='/user/beautyfair.html';
-            window.sessionStorage.setItem('beatyPop',true);
+             window.localStorage.setItem('beatyPop',true);
         },
         closepopup:function(){
               this.showflag=false;
               $('.Popup').slideUp(100);
-              window.sessionStorage.removeItem('beatyPop');
+              window.localStorage.setItem('beatyPop',true);
         },
         GetBanners: function(){
             var _self = this;
@@ -233,7 +234,7 @@ var homeData = new Vue({
                     var swiper = new Swiper('#recommendBox', {
                         slidesPerView: 2,
                         slidesPerColumn: 2,
-                        spaceBetween: 0,
+                        spaceBetween:0,
                         slidesPerGroup: 2,
                         autoplay: {
                             delay: 3000,
@@ -276,6 +277,7 @@ var homeData = new Vue({
     },
     mounted: function() {
         var _this = this;
+
         // this.getAdvertising();
         // 侧边栏滚动判断
         var distance = 0;
@@ -324,15 +326,20 @@ var homeData = new Vue({
             $(this).parents('.item').hide();
         })
 
-
-        var beatyPop =  window.sessionStorage.getItem('beatyPop');
-        //新加  公告弹窗
+        var beatyPop =  window.localStorage.getItem('beatyPop');
+        //  window.onbeforeunload = function(e) {
+        //     e = e || window.event;
+        //      window.sessionStorage.removeItem('beatyPop');
+        // };
+        //新加  优惠券弹窗
         if(beatyPop){
             _this.showflag = false;
         }else{
             _this.showflag = true;
-            $('.Popup').slideDown(100);
-        }    
+        }
+        setTimeout(function () {
+             window.localStorage.removeItem('beatyPop');
+        },7200)
     }
 });
 

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

@@ -51,10 +51,12 @@ var beautytopic = new Vue({
          image:'',
          showflag:false,
          heightshow:false,
+         moreflag:true,
     },
     methods:{
         showMorePageFn:function(){
             this.heightshow = true;
+            this.moreflag = false;
         },
         inletFn:function(){
             if(this.userId==0){
@@ -94,10 +96,9 @@ var beautytopic = new Vue({
                                 slidesPerView: 2,
                                 slidesPerColumn: 2,
                                 slidesPerGroup: 2,
-                                autoplay: {
-                                    delay: 3000,
-                                    disableOnInteraction: false
-                                },
+                                spaceBetween:0,
+                                slidesOffsetBefore:Number,
+                                autoplay:true,
                                 pagination: {
                                     el: '.swiper-pagination span'
                                 }

src/main/resources/templates/index.html

@@ -113,7 +113,7 @@
                                 <a :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                     <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
-                                    <div class="page_main_text"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                             <!--正常商品, 二手商品-->
@@ -214,7 +214,7 @@
                                 <a :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                     <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
-                                    <div class="page_main_text"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                             <!--正常商品, 二手商品-->
@@ -315,7 +315,7 @@
                                 <a :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                     <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
-                                    <div class="page_main_text"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                             <!--正常商品, 二手商品-->
@@ -422,7 +422,7 @@
                                 <a :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                     <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
-                                    <div class="page_main_text"><sapn class="tag"v-if="pros.product.beautyActFlag==1" >美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1" >美博会</sapn>{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                             <!--正常商品, 二手商品-->
@@ -517,7 +517,7 @@
                                 <a :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                     <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
-                                    <div class="page_main_text">{{ pros.name }}</div>
+                                    <div class="page_main_text"><span class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                             <!--正常商品, 二手商品-->
@@ -606,7 +606,7 @@
                                 <a  :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                     <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
-                                    <div class="page_main_text"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                             <!--正常商品, 二手商品-->
@@ -698,7 +698,7 @@
                                 <a :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                     <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
-                                    <div class="page_main_text">{{ pros.name }}</div>
+                                    <div class="page_main_text"><span class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                             <!--正常商品, 二手商品-->
@@ -786,7 +786,7 @@
                                         <a class="page_main_item ad_04 swiper-slide" :href="pros.link"  v-for="(pros,index) in page.floorImageList" target="_blank">
                                             <img class="page_main_image" :src="pros.image" :alt="pros.name">
                                             <div class="page_main_tag" v-if="pros.listType == 2">{{ pros.label }}</div>
-                                            <div class="page_main_text" target="_blank"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
+                                            <div class="page_main_text" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
                                             <div class="page_main_price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--正常商品, 二手商品-->

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

@@ -45,8 +45,8 @@
 							 <div class="list exhibitor" :class="heightshow?'max':''">
 								 <a v-for="(item,index) in exhibitorList" :href="item.link" ><img  :src="item.image" /></a>
 							 </div>
-							 <div class="section_page_more" v-if="!isPC && exhibitorList.length>12">
-                                <div class="more" @click="showMorePageFn"> <i class="icon mIcon"></i>查看更多</div>
+							 <div class="section_page_more" v-if="!isPC && exhibitorList.length >8">
+                                <div class="more" v-if="moreflag"  @click="showMorePageFn"> <i class="icon mIcon"></i>查看更多</div>
                             </div>
 						</div>
 						<div class="Beautyfair-page">
@@ -64,7 +64,7 @@
 								<p>这里是展位图描述词</p>
 							</div>
 							 <div class="list Floorplan swiper-container"  id="recommendBox" >
-							 	<div class="swiper-wrapper clear mfw ">
+							 	<div class="swiper-wrapper clear mfw mainBox">
 									<a href="javascript:0;" class="swiper-slide" v-for="pros in item.prolist" @click="bigImag(pros.image)">
 										 <img  :src="pros.image" />
 										 <div class="Booth_text">
@@ -178,7 +178,7 @@
 		<!-- 大图弹窗	-->
 			<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_icon" @click="closepopup"><i class="icon mIcon"></i></div>
 					<div class="bg_img"><img :src="image"></div>
 				</div>
 			</div>

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

@@ -56,7 +56,7 @@
                                         <a class="productItem" :href="pros.link" v-for="(pros,index) in page.floorImageList" >
                                             <img :src="pros.image ? pros.image : '/img/base/placeholder.png'" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
-                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
                                              <div class="price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
@@ -128,7 +128,7 @@
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
-                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
                                              <div class="price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
@@ -200,7 +200,7 @@
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
-                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
                                             <div class="price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
@@ -277,7 +277,7 @@
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
-                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
                                             <div class="price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
@@ -347,7 +347,7 @@
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
-                                            <div class="name" target="_blank">{{pros.name}}</div>
+                                            <div class="name" target="_blank"><span class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>{{pros.name}}</div>
                                             <div class="price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
@@ -415,7 +415,7 @@
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
-                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
                                             <div class="price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
@@ -485,7 +485,7 @@
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
-                                            <div class="name" target="_blank">{{pros.name}}</div>
+                                            <div class="name" target="_blank"><span class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>{{pros.name}}</div>
                                             <div class="price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
@@ -552,7 +552,7 @@
                                         <a class="productItem swiper-slide" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img :src="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
-                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>
                                             <div class="price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->