美博会

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

@@ -543,7 +543,7 @@ footer{
 .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;}
+.Popup .show_popup{width: 408px;height: 346px;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 .icon{width: 50px;height: 50px;display: inline-block;}

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

@@ -402,6 +402,7 @@
         height: 4.2vw;
         line-height: 4.2vw;
     }
+   .special .content .left-box .Beautyfair-page .list.exhibitor
 }
 
 

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

@@ -49,10 +49,15 @@ var homeData = new Vue({
         },
     },
     methods: {
+        zhuanti:function(){
+            this.showflag=false;
+            window.location.href='/user/beautyfair.html';
+            window.sessionStorage.setItem('beatyPop',true);
+        },
         closepopup:function(){
               this.showflag=false;
               $('.Popup').slideUp(100);
-              window.sessionStorage .setItem('beatyPop',false);
+              window.sessionStorage.removeItem('beatyPop');
         },
         GetBanners: function(){
             var _self = this;
@@ -271,15 +276,6 @@ var homeData = new Vue({
     },
     mounted: function() {
         var _this = this;
-     var beatyPop =  window.sessionStorage .getItem('beatyPop');
-        //新加  公告弹窗
-        if(beatyPop){
-            _this.showflag = false;
-        }else{
-            _this.showflag = true;
-            $('.Popup').slideDown(100);
-
-        }
         // this.getAdvertising();
         // 侧边栏滚动判断
         var distance = 0;
@@ -327,7 +323,16 @@ var homeData = new Vue({
         $('#advertising').on('click','.close',function () {
             $(this).parents('.item').hide();
         })
-             
+
+
+        var beatyPop =  window.sessionStorage.getItem('beatyPop');
+        //新加  公告弹窗
+        if(beatyPop){
+            _this.showflag = false;
+        }else{
+            _this.showflag = true;
+            $('.Popup').slideDown(100);
+        }    
     }
 });
 

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

@@ -4,6 +4,33 @@ var beautytopic = new Vue({
         listLoading:true,
          productList:[],
          Descriptors:[],//描述词
+         VipList:[//vip品牌
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'}
+         ],
+         exhibitorList:[//参展商
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'},
+            {image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:'/supplier/index.html?id=1174'}
+         ],
+         liveList:[//现场直击
+            {name:'热玛吉术后修复知多少沙发上',image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:''},
+            {name:'热玛吉术后修复知多少沙发上',image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:''},
+            {name:'热玛吉术后修复知多少沙发上',image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:''},
+            {name:'热玛吉术后修复知多少沙发上',image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:''},
+            {name:'热玛吉术后修复知多少沙发上',image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:''}
+         ],
          List:[
              {
                  shopName: '展位图',
@@ -23,16 +50,20 @@ var beautytopic = new Vue({
          userIdentity:'',
          image:'',
          showflag:false,
+         heightshow:false,
     },
     methods:{
+        showMorePageFn:function(){
+            this.heightshow = true;
+        },
         inletFn:function(){
             if(this.userId==0){
                 window.location.href='/login.html'
             }else {
                 if(this.userIdentity==3){
-                    window.location.href='/supplier-center/dashboard.html'
+                    window.location.href='/supplier/dashboard.html'
                 }else {
-                    window.location.href='/user-center/dashboard'
+                    window.location.href='/user/beautyfair.html'
                 }
             }
         },
@@ -45,6 +76,16 @@ var beautytopic = new Vue({
         },
         closepopup:function () {
              this.showflag=false;
+        },
+         PromotionsFormat:function(promo){//促销活动类型数据处理
+            if(promo!=null){
+                if(promo.type == 1 && promo.mode == 1){
+                    return true
+                }else{
+                    return false
+                }
+            }
+            return false
         },
          SwiperBanner: function(){
             setTimeout(function(){

src/main/resources/static/js/product/instruement-list.js

@@ -1,205 +0,0 @@
-var productList = new Vue({
-    el:'#productList',
-    data:{
-        userId:0,
-        searchFlag: false,
-        listLoading: true,
-        requestFlag: true,
-        noMore: false,
-        classify:[],
-        smalltypeList:[],//二级分类
-        tinytypeList:[],//三级分类
-        listData:[],
-        bigName:'',
-        smallName:'',
-        tinyName:'',
-        bigTypeID:'',
-        smallTypeID:'',//二级分类id
-        tinyTypeID:'',//三级分类id
-        listRecord: 0,
-        pageInput: '1',
-        source:'www',
-        params: {
-            id:'',
-            identity:GLOBAL_USER_IDENTITY,
-            sortField:'',
-            sortType: 1, // 1降序，其他升序
-            pageSize: 24,
-            pageNum: 1,
-            idType:1
-        },
-    },
-    computed: {
-        pageTotal: function () {
-            var total = Math.ceil(this.listRecord / this.params.pageSize);
-            return total > 0 ? total : 1;
-        },
-        showPageBtn: function () {
-            var total = Math.ceil(this.listRecord / this.params.pageSize);
-            total = total > 0 ? total : 1;
-            var index = this.params.pageNum, arr = [];
-            if (total <= 6) {
-                for (var i = 1; i <= total; i++) {
-                    arr.push(i);
-                }
-                return arr;
-            }
-            if (index <= 3) return [1, 2, 3, 4, 5, 0, total];
-            if (index >= total - 2) return [1, 0, total - 4, total - 3, total - 2, total - 1, total];
-            return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
-        }
-    },
-    methods:{
-        getclassify:function(){
-        var _self = this;
-        ProductApi.GetbigTypeclassify({source:_self.source,bigTypeID:_self.bigTypeID},function (res) {
-            if(res.code==0){
-                _self.smalltypeList = res.data;
-            }else {
-           CAIMEI.Alert(res.msg,'确定',false)
-            }
-        })
-    },
-       getproductList:function(){//分类商品列表
-           var _self=this;
-           ProductApi.GetSearchProduct(_self.params,function (res) {
-               if( res.code==0){
-                     var result = JSON.parse(res.data);
-                      _self.listData = [];
-                      _self.listRecord = result.total;
-                       var resultData = setSearchProductList(result.items, _self.userId, function(){
-                            _self.$forceUpdate();
-                            setTimeout(function(){
-                                // 图片懒加载
-                                $("img[data-original]").lazyload();
-                            },500);
-                        });
-                        if(isPC){
-                            _self.listData = resultData;
-                        }else{
-                            _self.listData = _self.listData.concat(resultData);
-                        }
-                        _self.listLoading = false;
-                        _self.requestFlag = true;
-               }else {
-                CAIMEI.Alert(res.msg,'确定',false)
-               }
-           })
-        },
-        checkNum: function () {
-            if (this.pageInput > this.pageTotal) {
-                this.pageInput = this.pageTotal;
-            } else if (this.pageInput < 1) {
-                this.pageInput = 1;
-            }
-        },
-        toPagination: function (pageNum) {
-            if (pageNum <= this.pageTotal) {
-                this.params.pageNum = pageNum;
-                this.getproductList();
-            }
-        },
-        toSortList: function (sortField, sortType) {
-             this.params.sortField= sortField;
-             this.params.sortType = sortType;
-             this.params.pageNum = 1;
-             this.getproductList();
-        },
-         removesmall:function(){//删除二级
-            this.smallName = '';
-        },
-        removetiny:function(){//删除三级分类
-            this.tinyName = ''
-        },
-        checkedClasslyFn:function(item,index){
-            this.params.pageNum = 1;
-            this.params.idType = index;
-            switch (index) {
-                case 1://选择1集分类查询
-                    this.bigName=item.name;
-                    this.smallName = '';
-                    this.bigTypeID = item.bigTypeID;
-                    this.params.id = item.bigTypeID;
-                    this.getclassify();
-                    break;
-                case 2://选择二级分类查询
-                    this.smallName = item.name;
-                    this.tinyName = '';
-                    this.smallTypeID = item.smallTypeID;
-                    this.params.id = item.smallTypeID;
-                    this.tinytypeList =item.tinytypeList;
-                    break;
-                case 3://选择三级分类查询
-                    this.tinyName = item.name;
-                    this.tinyTypeID = item.tinyTypeID;
-                    this.params.id = item.tinyTypeID;
-                    break;
-            }
-           this.getproductList();
-        },
-    },
-    created:function () {
-        var userInfo = localStorage.getItem('userInfo');
-        if(userInfo){
-            this.userId = JSON.parse(userInfo).userId;
-        }
-    },
-    mounted:function () {
-        var _self = this;
-        this.bigTypeID = getUrlParam('bigTypeID');
-        this.smallTypeID = getUrlParam('smallTypeID');
-        this.tinyTypeID = getUrlParam('tinyTypeID');
-        console.log( this.smallTypeID)
-        console.log( this.tinyTypeID)
-        if (this.bigTypeID){
-            this.params.id=this.bigTypeID;
-        }else if( this.smallTypeID){
-            this.params.id=this.smallTypeID;
-        }else {
-            this.params.id=this.tinyTypeID;
-        }
-        var typeSort =  getUrlParam('typeSort');
-        PublicApi.GetProductClassify({typeSort:typeSort,source:'www'},function (res) {
-                if (res.code==0){
-                    _self.classify = res.data;
-                    _self.classify.forEach(function (item) {
-                        if(_self.bigTypeID == item.bigTypeID){
-                            _self.bigName = item.name;
-                        }
-                    })
-                }else {
-                     CAIMEI.Alert(res.msg, '确定', false);
-                }
-            });
-        this.getclassify();
-        this.getproductList();
-        if(!isPC){
-            _self.getproductList();
-            $('footer').addClass("noneImportant");
-            //移动端上垃加载更多
-            $(window).on('scroll', function(){
-                var scrollTop = $(this).scrollTop();
-                var scrollHeight = $(document).height();
-                var windowHeight = window.innerHeight;
-                if (scrollTop + windowHeight >= scrollHeight) {
-                    //此处是滚动条到底部时候触发的事件，在这里写要加载的数据，或者是拉动滚动条的操作
-                    var totalPage = Math.ceil(_self.listRecord / _self.params.pageSize)?Math.ceil(_self.listRecord / _self.params.pageSize):1;
-                    var next = _self.params.pageNum+1;
-                    if(next <= totalPage){
-                        if (_self.requestFlag){
-                            _self.params.pageNum = next;
-                                // 获取列表数据
-                             _self.getproductList();
-                        }
-                        _self.requestFlag = false;
-                    }else{
-                        //到底了
-                        _self.noMore = true;
-                        $('footer').removeClass("noneImportant");
-                    }
-                }
-            });
-        }
-    }
-
-})

src/main/resources/static/js/user-center/beautyfair.js

@@ -1,12 +0,0 @@
-var coupon = new Vue({
-   el:'#coupon',
-   data:{
-        userIdentity:0
-   },
-  methods:{},
- mounted: function () {
-        if(globalUserData){
-            this.userIdentity = globalUserData.userIdentity;
-        }
-    }
-})

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" >美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" v-if="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" >美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" v-if="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" >美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" v-if="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" >美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag"v-if="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"><sapn class="tag" >美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text">{{ 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" >美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" v-if="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"><sapn class="tag" >美博会</sapn>{{ pros.name }}</div>
+                                    <div class="page_main_text">{{ 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" >美博会</sapn>{{pros.name}}</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_price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                     <!--正常商品, 二手商品-->
@@ -897,7 +897,7 @@
         <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"><img src="/img/Beautyfair/youhui.png" v-if="isPC"><img src="/img/Beautyfair/youhui.h5.png" v-else></div>
+                <div class="bg_img" @click="zhuanti"><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

@@ -34,9 +34,7 @@
 								<p>这里是VIP品牌线上馆描述词</p>
 							</div>
 							 <div class="list">
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
+								 <a v-for="(item,index) in VipList" :href="item.link" ><img  :src="item.image" /></a>
 							 </div>
 						</div>
 						<div class="Beautyfair-page">
@@ -44,22 +42,11 @@
 								<h1>参展商</h1>
 								<p>这里是参展商描述词</p>
 							</div>
-							 <div class="list exhibitor">
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /></a>
+							 <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">
-                                <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
+							 <div class="section_page_more" v-if="!isPC && exhibitorList.length>12">
+                                <div class="more" @click="showMorePageFn"> <i class="icon mIcon"></i>查看更多</div>
                             </div>
 						</div>
 						<div class="Beautyfair-page">
@@ -68,11 +55,7 @@
 								<p>这里是现场直击描述词</p>
 							</div>
 							 <div class="list live">
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /><div class="page_main_text"><p>热玛吉术后修复知多少沙发上</p></div></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /><div class="page_main_text"><p>热玛吉术后修复知多少沙发上</p></div></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /><div class="page_main_text"><p>热玛吉术后修复知多少沙发上</p></div></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /><div class="page_main_text"><p>热玛吉术后修复知多少沙发上</p></div></a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /><div class="page_main_text"><p>热玛吉术后修复知多少沙发上</p></div></a>
+								 <a v-for="(item,index) in liveList" :href="item.link"  ><img  :src="item.image" /><div class="page_main_text"><p>{{item.name}}</p></div></a>
 							 </div>
 						</div>
 						<div class="Beautyfair-page" v-for="item in List">

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

@@ -81,7 +81,8 @@
                     <li class="productItem " v-for="p in listData">
                         <a class="image" :href="'/product-'+p.id+'.html'">
                             <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
-                            <p class="name" v-html="addhtml + p.name"></p>
+                            <p class="name" v-html="addhtml + p.name" v-if="p.actflag==1"></p>
+                            <p class="name" v-html="p.name" v-else></p>
                             <div class="price">
                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->

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">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="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">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="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">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="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">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="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"><sapn class="tag">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank">{{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">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="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"><sapn class="tag">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank">{{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">美博会</sapn>{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag" v-if="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,普通机构-->

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

@@ -106,8 +106,8 @@
                         <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
                     </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">

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

@@ -27,12 +27,7 @@
         <div class="navLayout"  v-cloak>
             <div class="wrap clear">
                  <!--左侧导航-->
-                 <template v-if="userIdentity==3">
-                     <template th:replace="supplier-center/components/tableft"></template>
-                 </template>
-                 <template v-else>
-                      <template th:replace="user-center/components/tableft" ></template>
-                 </template>
+                <template th:replace="user-center/components/tableft" ></template>
                 <div class="right">
                     <div class="container">
                         <img src="/img/Beautyfair/coupon.jpg" v-if="isPC"/>
@@ -45,5 +40,11 @@
     <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/beautyfair.js(v=${version})}"></script>
+<script>
+    var coupon = new Vue({
+      el:'#coupon',
+      data:{},
+    })
+
+</script>
 </body>