美博会

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

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

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

@@ -4,37 +4,48 @@ var beautytopic = new Vue({
         listLoading:true,
          productList:[],
          Descriptors:[
-             {descriptext:'这里是华熙生物描述词',shopId:1161},
-             {descriptext:'这里是供应商描述词',shopId:1252},
+             {descriptext:'光子嫩肤的黄金标准——美国高端技术品牌',shopId:1172},//科医人
+             {descriptext:'专注于细胞治疗的西班牙高端技术品牌',shopId:''},//INDIBA
+             {descriptext:'专注于进口医学美容仪器及产品',shopId:1258},//唯美概念
+             {descriptext:'坚持原装进口先进光电设备',shopId:1193},//GMS
+             {descriptext:'国货之光——专注医学美容术前术后修复',shopId:1285},//优斐斯
+             {descriptext:'专注于进口国际顶级医疗美容设备',shopId:1184},//美生美
+             {descriptext:'专注于进口国际品牌医疗美容设备和医用级护肤品',shopId:1292},//品辉
+             {descriptext:'',shopId:1205},//恩盛国际
+             {descriptext:'专注原装进口国际高端高科技美容设备',shopId:1201},//和创元
+             {descriptext:'致力于光学医疗美容设备的研发',shopId:1206},//瑞恺迪
+             {descriptext:'专注于原装进口国际医疗美容设备',shopId:1217},//塑美颜
+
              ],//描述词
          VipList:[//vip品牌
-            {PCimage:'/img/Beautyfair/VIP/INDIBA-PC.jpg',H5image:'/img/Beautyfair/VIP/INDIBA-H5.jpg',link:'/supplier/index.html?id=1174'},
+            {PCimage:'/img/Beautyfair/VIP/INDIBA-PC.jpg',H5image:'/img/Beautyfair/VIP/INDIBA-H5.jpg',link:'https://www.caimei365.com/product/list.html?keyword=INDIBA'},
             {PCimage:'/img/Beautyfair/VIP/keyiren- PC1.jpg',H5image:'/img/Beautyfair/VIP/keyiren-H51.jpg',link:'/supplier/index.html?id=1172'},
             {PCimage:'/img/Beautyfair/VIP/keyiren- PC2.jpg',H5image:'/img/Beautyfair/VIP/keyiren-H52.jpg',link:'/supplier/index.html?id=1172'},
-            {PCimage:'/img/Beautyfair/VIP/weimei-PC.jpg',H5image:'/img/Beautyfair/VIP/weimei-H5.jpg',link:'/supplier/index.html?id=1174'}
+            {PCimage:'/img/Beautyfair/VIP/weimei-PC.jpg',H5image:'/img/Beautyfair/VIP/weimei-H5.jpg',link:'/supplier/index.html?id=1258'}
          ],
          exhibitorList:[//参展商
             {PCimage:'/img/Beautyfair/exhibitor/pc/keyiren.jpg',H5image:'/img/Beautyfair/exhibitor/h5/keyiren.jpg',link:'/supplier/index.html?id=1172'},//科医人
             {PCimage:'/img/Beautyfair/exhibitor/pc/EunSung.jpg',H5image:'/img/Beautyfair/exhibitor/h5/EunSung.jpg',link:'/supplier/index.html?id=1205'},//恩盛国际
             {PCimage:'/img/Beautyfair/exhibitor/pc/RUID.jpg',H5image:'/img/Beautyfair/exhibitor/h5/RUID.jpg',link:'/supplier/index.html?id=1206'},//瑞恺迪
-            {PCimage:'/img/Beautyfair/exhibitor/pc/VS.jpg',H5image:'/img/Beautyfair/exhibitor/h5/VS.jpg',link:'/supplier/index.html?id=1215'},//维锶
+            {PCimage:'/img/Beautyfair/exhibitor/pc/VS.jpg',H5image:'/img/Beautyfair/exhibitor/h5/VS.jpg',link:'https://www.caimei365.com/product/list.html?keyword=%E7%BB%B4%E9%94%B6'},//维锶
             {PCimage:'/img/Beautyfair/exhibitor/pc/msm.jpg',H5image:'/img/Beautyfair/exhibitor/h5/msm.jpg',link:'/supplier/index.html?id=1184'},//美生美
             {PCimage:'/img/Beautyfair/exhibitor/pc/SMY.jpg',H5image:'/img/Beautyfair/exhibitor/h5/SMY.jpg',link:'/supplier/index.html?id=1217'},//塑美颜
-            {PCimage:'/img/Beautyfair/exhibitor/pc/hcy.jpg',H5image:'/img/Beautyfair/exhibitor/h5/hcy.jpg',link:'/supplier/index.html?id=1174'},//和创元
-            {PCimage:'/img/Beautyfair/exhibitor/pc/UFACE.jpg',H5image:'/img/Beautyfair/exhibitor/h5/UFACE.jpg',link:'/supplier/index.html?id=1174'},//优斐斯
-            {PCimage:'/img/Beautyfair/exhibitor/pc/YILUDA.jpg',H5image:'/img/Beautyfair/exhibitor/h5/YILUDA.jpg',link:'/supplier/index.html?id=1174'},//易路达
-            {PCimage:'/img/Beautyfair/exhibitor/pc/WM.jpg',H5image:'/img/Beautyfair/exhibitor/h5/WM.jpg',link:'/supplier/index.html?id=1174'},//唯美概念
-            {PCimage:'/img/Beautyfair/exhibitor/pc/ph.jpg',H5image:'/img/Beautyfair/exhibitor/h5/ph.jpg',link:'/supplier/index.html?id=1174'},//品辉
-            {PCimage:'/img/Beautyfair/exhibitor/pc/INDIBA.jpg',H5image:'/img/Beautyfair/exhibitor/h5/INDIBA.jpg',link:'/supplier/index.html?id=1174'},//INDIBA
-            {PCimage:'/img/Beautyfair/exhibitor/pc/ACTIVE.jpg',H5image:'/img/Beautyfair/exhibitor/h5/ACTIVE.jpg',link:'/supplier/index.html?id=1174'},//ACTIVE
-            {PCimage:'/img/Beautyfair/exhibitor/pc/Imperium.jpg',H5image:'/img/Beautyfair/exhibitor/h5/Imperium.jpg',link:'/supplier/index.html?id=1174'}//imperium
+            {PCimage:'/img/Beautyfair/exhibitor/pc/hcy.jpg',H5image:'/img/Beautyfair/exhibitor/h5/hcy.jpg',link:'/supplier/index.html?id=1201'},//和创元
+            {PCimage:'/img/Beautyfair/exhibitor/pc/UFACE.jpg',H5image:'/img/Beautyfair/exhibitor/h5/UFACE.jpg',link:'/supplier/index.html?id=1285'},//优斐斯
+            {PCimage:'/img/Beautyfair/exhibitor/pc/YILUDA.jpg',H5image:'/img/Beautyfair/exhibitor/h5/YILUDA.jpg',link:'https://www.caimei365.com/product/list.html?keyword=%E6%98%93%E8%B7%AF%E8%BE%BE'},//易路达
+            {PCimage:'/img/Beautyfair/exhibitor/pc/WM.jpg',H5image:'/img/Beautyfair/exhibitor/h5/WM.jpg',link:'/supplier/index.html?id=1258'},//唯美概念
+            {PCimage:'/img/Beautyfair/exhibitor/pc/ph.jpg',H5image:'/img/Beautyfair/exhibitor/h5/ph.jpg',link:'/supplier/index.html?id=1292'},//品辉
+            {PCimage:'/img/Beautyfair/exhibitor/pc/INDIBA.jpg',H5image:'/img/Beautyfair/exhibitor/h5/INDIBA.jpg',link:'https://www.caimei365.com/product/list.html?keyword=INDIBA'},//INDIBA
+            {PCimage:'/img/Beautyfair/exhibitor/pc/ACTIVE.jpg',H5image:'/img/Beautyfair/exhibitor/h5/ACTIVE.jpg',link:'https://www.caimei365.com/product/list.html?keyword=ACTIVE'},//ACTIVE
+            {PCimage:'/img/Beautyfair/exhibitor/pc/Imperium.jpg',H5image:'/img/Beautyfair/exhibitor/h5/Imperium.jpg',link:'https://www.caimei365.com/product/list.html?keyword=imperium'},//imperium
+            {PCimage:'/img/Beautyfair/exhibitor/pc/GMS.jpg',H5image:'/img/Beautyfair/exhibitor/h5/GMS.jpg',link:'/supplier/index.html?id=1193'}//GMS
          ],
          liveList:[//现场直击
             {name:'采美LIVE带你体验美博会现场氛围',image:'/img/Beautyfair/live/CF.jpg',link:''},
             {name:'探访美博会采美合作展位上',image:'/img/Beautyfair/live/CFS.jpg',link:''},
             {name:'探访美博会采美合作展位下',image:'/img/Beautyfair/live/CFX.jpg',link:''},
-            {name:'探访VIP品牌科医人体验点',image:'/img/Beautyfair/live/keyiren.jpg',link:''},
-            {name:'探访VIP品牌INDIBA体验点',image:'/img/Beautyfair/live/INDIBA.jpg',link:''}
+            {name:'探访VIP品牌INDIBA体验点',image:'/img/Beautyfair/live/INDIBA.jpg',link:''},
+            {name:'探访VIP品牌科医人体验点',image:'/img/Beautyfair/live/keyiren.jpg',link:''}
          ],
          List:[
              {PCimage: '/img/Beautyfair/zwt/pc/EunSung.jpg',H5image:'/img/Beautyfair/zwt/h5/EunSung.jpg',name:'恩盛',num:'B区11.3馆D29'},

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

@@ -40,7 +40,7 @@
 						<div class="Beautyfair-page">
 							<div class="page-title">
 								<h1>参展商</h1>
-								<p>美博会采美合作品牌（原产商/代理商）</p>
+								<p>美博会采美合作品牌</p>
 							</div>
 							 <div class="list exhibitor" :class="heightshow?'max':''">
 								 <a v-for="(item,index) in exhibitorList" :href="item.link" ><img  :src="item.PCimage" v-if="isPC" /><img :src="item.H5image" v-else/></a>

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

@@ -61,7 +61,7 @@
                                     <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" v-if="p.actflag==1"></span>
+                                    <span v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></span>
                                     <span v-html="p.name" v-else></span>
                                 </a>
                                 <div class="price mfhc">
@@ -105,7 +105,7 @@
                                     <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" v-if="p.actflag==1"></span>
+                                    <span v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></span>
                                     <span v-html="p.name" v-else></span>
                                 </a>
                                 <div class="price mfhc">