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

src/main/resources/static/css/base/base.pc.css

@@ -146,7 +146,7 @@ iframe{width:320px !important;height: 280px !important}
 .baseTopNav>.wrap{height:44px;box-sizing:border-box;position:relative;z-index:991;}
 .baseTopNav .home,.baseTopNav .classBtn,.baseTopNav .navBox{float:left}
 .baseTopNav .service{float:right}
-.baseTopNav .nav{display:inline-block;height:44px;line-height:44px;padding:0 36px;color:#4A4F58;font-size:14px;text-align:center;position:relative;border-left:1px solid transparent;border-right:1px solid transparent}
+.baseTopNav .nav{display:inline-block;height:44px;line-height:44px;padding:0 34px;color:#4A4F58;font-size:14px;text-align:center;position:relative;border-left:1px solid transparent;border-right:1px solid transparent}
 .baseTopNav .nav:hover,.baseTopNav .nav.on{color:#E15616;border-image:-webkit-linear-gradient(white,#E15616,white)1 20 1;border-image:-moz-linear-gradient(white,#E15616,white)1 20 1;border-image:-o-linear-gradient(white,#E15616,white)1 20 1;border-image:linear-gradient(white,#E15616,white)1 20 1}
 .baseTopNav .classBtn:after{background-position:0 -31px;transition: all .5s;}
 .baseTopNav .classBtn.on:after{transform:rotate(90deg);}

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

@@ -18,36 +18,36 @@ var beautytopic = new Vue({
              {descriptext:'专注于原装进口国际医疗美容设备',shopId:1217},//塑美颜
              ],//描述词
          VipList:[//vip品牌
-            {PCimage:'/img/Beautyfair/VIP/INDIBA-PC.jpg',H5image:'/img/Beautyfair/VIP/INDIBA-H5.jpg'},
             {PCimage:'/img/Beautyfair/VIP/keyiren- PC1.jpg',H5image:'/img/Beautyfair/VIP/keyiren-H51.jpg'},
             {PCimage:'/img/Beautyfair/VIP/keyiren- PC2.jpg',H5image:'/img/Beautyfair/VIP/keyiren-H52.jpg'},
+            {PCimage:'/img/Beautyfair/VIP/INDIBA-PC.jpg',H5image:'/img/Beautyfair/VIP/INDIBA-H5.jpg'},
             {PCimage:'/img/Beautyfair/VIP/weimei-PC.jpg',H5image:'/img/Beautyfair/VIP/weimei-H5.jpg'}
          ],
          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/RUID.jpg',H5image:'/img/Beautyfair/exhibitor/h5/RUID.jpg',link:'/supplier/index.html?id=1206'},//瑞恺迪
+            {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/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=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/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/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
+            {PCimage:'/img/Beautyfair/exhibitor/pc/CLASSYS-PC.jpg',H5image:'/img/Beautyfair/exhibitor/h5/CLASSYS-H5.jpg',link:'https://www.caimei365.com/product/list.html?keyword=ACTIVE'},//CLASSYS
+            {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/RUID.jpg',H5image:'/img/Beautyfair/exhibitor/h5/RUID.jpg',link:'/supplier/index.html?id=1206'},//瑞恺迪
+            {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/GMS.jpg',H5image:'/img/Beautyfair/exhibitor/h5/GMS.jpg',link:'/supplier/index.html?id=1193'},//GMS
+            {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/hcy.jpg',H5image:'/img/Beautyfair/exhibitor/h5/hcy.jpg',link:'/supplier/index.html?id=1201'},//和创元
+            {PCimage:'/img/Beautyfair/exhibitor/pc/SMY.jpg',H5image:'/img/Beautyfair/exhibitor/h5/SMY.jpg',link:'/supplier/index.html?id=1217'},//塑美颜
          ],
          liveList:[//现场直击
             {name:'采美LIVE带你体验美博会现场氛围',image:'/img/Beautyfair/live/CF.jpg',link:'https://wx.vzan.com/live/tvchat-1161018290?shareuid=87139484&v=1614932881980'},
             {name:'探访美博会采美合作展位上',image:'/img/Beautyfair/live/CFS.jpg',link:'https://wx.vzan.com/live/tvchat-37012015?shareuid=87139484&v=1614932922051'},
             {name:'探访美博会采美合作展位下',image:'/img/Beautyfair/live/CFX.jpg',link:'https://wx.vzan.com/live/tvchat-1843812438?shareuid=87139484&v=1614932956164'},
+            {name:'探访VIP品牌科医人体验点',image:'/img/Beautyfair/live/keyiren.jpg',link:'https://wx.vzan.com/live/tvchat-1947728484?shareuid=87139484&v=1614932848613'},
             {name:'探访VIP品牌INDIBA体验点',image:'/img/Beautyfair/live/INDIBA.jpg',link:'https://wx.vzan.com/live/tvchat-257628422?shareuid=87139484&v=1614932814028'},
-            {name:'探访VIP品牌科医人体验点',image:'/img/Beautyfair/live/keyiren.jpg',link:'https://wx.vzan.com/live/tvchat-1947728484?shareuid=87139484&v=1614932848613'}
          ],
          List:[
-             {PCimage: '/img/Beautyfair/zwt/pc/GMS.jpg',H5image:'/img/Beautyfair/zwt/h5/GMS.jpg',ame:'GMS',num:'B区 12.2馆C31'},
+             {PCimage: '/img/Beautyfair/zwt/pc/GMS.jpg',H5image:'/img/Beautyfair/zwt/h5/GMS.jpg',name:'GMS',num:'B区 12.2馆C31'},
              {PCimage: '/img/Beautyfair/zwt/pc/UFACE.jpg',H5image:'/img/Beautyfair/zwt/h5/UFACE.jpg',name:'优斐斯',num:'A区 4.2号馆A31'},
              {PCimage: '/img/Beautyfair/zwt/pc/WM.jpg',H5image:'/img/Beautyfair/zwt/h5/WM.jpg',name:'唯美概念',num:'B区 12.2馆B41号'},
              {PCimage: '/img/Beautyfair/zwt/pc/msm.jpg',H5image:'/img/Beautyfair/zwt/h5/msm.jpg',name:'美生美',num:'B区 12.2馆B39号'},

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

@@ -70,7 +70,7 @@
 										 <img :src="item.H5image" v-else>
 										 <div class="Booth_text">
 											 <p class="name">{{item.name}}</p>
-											 <p class="number">{{item.num}}</p>
+											 <p class="number">{{item.num}}&nbsp;可现场体验</p>
 										 </div>
 									 </a>
 								</div>
@@ -81,7 +81,7 @@
 							<div class="page-title">
 								<h1>{{item.shopName}}</h1>
 									<p>{{item.descriptext}}</p>
-									<p class="more" @click="gosupplier(item.shopId)"> 更多 > </p>
+									<p class="more" @click="gosupplier(item.shopId)" v-if="item.shopId != 1161"> 更多 > </p>
 							</div>
 							 <div class="list supplier">
 								 <a :href="'/product-'+pros.productID+'.html'" v-for="(pros,index) in item.productSet" >

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

@@ -8,14 +8,14 @@
 </head>
 <style>
 @media screen and (min-width:768px) {
-.crumbs{position: relative;}
-.crumbs span{position: absolute;top: 240%;left: 50%;color: #fd3c5b;font-weight: bold;}
+.right{position: relative;}
+.username {position: absolute;top: 45px;color: #fd3c5b;font-weight: bold;width: 100%; text-align: center;font-size: 16px;}
 }
 @media screen and (max-width:768px) {
     .container{width: 100%;height: 100%}
     .container img{width: 100%;height: 100%}
-    #coupon{position: relative}
-    .crumbs{position: absolute;top: 5%;left: 35%;color: #fd3c5b;font-size: 3.4vw;}
+    .right{position: relative}
+    .username{position: absolute;top: 5vw;color: #fd3c5b;font-size: 3.4vw;width: 100%;text-align: center}
 }
 
 
@@ -27,14 +27,17 @@
 <!--优惠券-->
     <div id="coupon" v-cloak>
         <div class="crumbs">
-            <span v-if="userIdentity==4">优惠券仅限{{name}}（机构）使用</span>
-            <span v-else>优惠券仅限{{name}}使用</span>
+
         </div>
         <div class="navLayout"  >
             <div class="wrap clear">
                  <!--左侧导航-->
                 <template th:replace="user-center/components/tableft" ></template>
                 <div class="right">
+                    <div class="username">
+                        <span v-if="userIdentity==4">优惠券仅限{{name}}（机构）使用</span>
+                        <span v-else>优惠券仅限{{name}}使用</span>
+                    </div>
                     <div class="container">
                         <img src="/img/Beautyfair/coupon.jpg" v-if="isPC"/>
                         <img src="/img/Beautyfair/coupon.h5.jpg" v-else/>