美博会

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

@@ -353,4 +353,19 @@
     width: auto;
     margin-top: 1vw;
 }
+.section_page .page_main_text .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 !important;
+    background-image: linear-gradient(270deg,
+            #f9c023 0%,
+            #f83600 100%);
+    border-radius: 0px 10px 0px 0px;
+    margin-top: .5vw;
+}
 

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

@@ -539,3 +539,19 @@ 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;
+}

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

@@ -0,0 +1,189 @@
+.special .banner{width: 100%;height: 510px;}
+			.special .banner img{width: 100%;height: 100%;}
+			.special .content{width: 100%;height: auto;}
+			.special .content .inner{width: 1184px;margin: 0 auto;}
+			.special .content .inner a{cursor: pointer;text-decoration: none;}
+			.special .content .left-box{width: 900px; float: left;}
+			.special .content .right-box{width: 284px; float: right;padding-top: 103px;}
+			.special .content {overflow: hidden;}
+			.special .content .left-box .Beautyfair-page{width: 100%;height: auto;float: left;}
+			.special .content .left-box .Beautyfair-page .page-title{
+					width: 100%;
+				    height: 103px;
+				    box-sizing: border-box;
+				    padding: 31px 0 16px 0
+			}
+			.special .content .left-box .Beautyfair-page .page-title h1{
+				    font-size: 24px;
+				    line-height: 31px;
+				    text-align: left;
+				    color: #4a4f58;
+			}
+			.special .content .left-box .Beautyfair-page .page-title p{
+				    font-size: 14px;
+				    line-height: 19px;
+				    text-align: left;
+				    color: #93979f;
+				    margin-top: 6px;
+					float: left;
+			}
+			.special .content .left-box .Beautyfair-page .page-title p.more{
+				float: right;
+				padding-right: 20px;
+				cursor: pointer;
+			}
+			.special .content .left-box .Beautyfair-page .list a{
+				width: 434px;
+				height: 220px;
+				display: block;
+				float: left;
+				margin-right: 16px;
+				margin-bottom: 16px;
+				background-color: #FFFFFF;
+				transition: all 0.4s;
+			}
+			.special .content .left-box .Beautyfair-page .list{
+				transition: all 0.6s;
+			}
+			.special .content .left-box .Beautyfair-page .list.Floorplan{height: 612px;}
+			.special .content .left-box .Beautyfair-page .list.max{
+				height: auto;
+			}
+			.special .content .left-box .Beautyfair-page .list a:hover{
+				    transform: translateY(-5px);
+				    box-shadow: 0 8px 8px rgb(102 102 102 / 5%), 0 10px 10px rgb(102 102 102 / 5%), 0 12px 12px rgb(102 102 102 / 5%)
+			}
+			.special .content .left-box .Beautyfair-page .list.exhibitor a{
+				width: 134px;
+				height: 134px;
+			}
+			.special .content .left-box .Beautyfair-page .list.live a{
+				width: 164px;
+				height: 212px;
+			}
+			.special .content .left-box .Beautyfair-page .list.Floorplan a{
+				width: 434px;
+				height: 290px;
+			}
+			.special .content .left-box .Beautyfair-page .list.supplier a{
+				width: 164px;
+				height: 268px;
+			}
+			.special .content .left-box .Beautyfair-page .list a img{
+				width: 100%;
+				height: 100%;
+			}
+			.special .content .left-box .Beautyfair-page .list.live a img{
+				width: 164px;
+				height: 164px;
+			}
+			.special .content .left-box .Beautyfair-page .list.supplier a img{
+				width: 164px;
+				height: 164px;
+			}
+			.special .content .left-box .Beautyfair-page .list.Floorplan a img{
+				height: 210px;
+			}
+			.special .content .right-box .right-coupon{
+				    width: 100%;
+				    height: auto;
+				    background-color: #FFFFFF;
+				    float: left;
+				    margin-bottom: 16px;
+				    padding: 16px;
+				    box-sizing: border-box;
+				    border-radius: 2px;
+			}
+			.special .content .right-box .right-coupon .right_item_title{
+				    width: 100%;
+				    height: 22px;
+				    line-height: 22px;
+				    margin-bottom: 8px;
+					font-size: 16px;
+					font-weight: bold;
+					color: #4a4f58;
+			}
+			.special .content .right-box .right-coupon .right_item_img{
+				width: 100%;
+				height: 100%;
+			}
+			.special .content .left-box .Beautyfair-page .list a .page_main_text{
+				    height: 42px;
+				    padding: 0 8px;
+				    font-size: 14px;
+				    color: #4a4f58;
+					line-height: 21px;
+			}
+			.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;
+			}
+			.special .content .left-box .Beautyfair-page .list a .page_main_text p{
+				width: 150px;
+				height: 48px;
+				line-height: 48px;
+				white-space:nowrap;
+				overflow:hidden;
+				text-overflow:ellipsis;
+			}
+			.special .content .left-box .Beautyfair-page .list a .Booth_text{
+				height: 80px;
+			}
+			.special .content .left-box .Beautyfair-page .list a .Booth_text p{
+				text-align: center;
+				line-height: 21px;
+			}
+			.special .content .left-box .Beautyfair-page .list a .Booth_text p.name{
+				font-size: 16px;
+				color: #4a4f58;
+				padding: 16px 0 5px 0;
+			}
+			.special .content .left-box .Beautyfair-page .list a .Booth_text p.number{
+				font-size: 14px;
+				color: #93979f;
+			}
+			.section_page_more {
+			    width: 100%;
+			    height: 32px;
+			    margin-top: 16px;
+			    float: left;
+			}
+			.section_page_more .more {
+			    width: 98px;
+			    height: 32px;
+			    line-height: 32px;
+			    font-size: 14px;
+			    margin: 0 auto;
+			    border-radius: 2px;
+			    border: 1px solid #cccccc;
+			    color: #909090;
+			    text-align: left;
+			    transition: all 0.2s;
+			    cursor: pointer;
+			    padding-left: 15px;
+			    box-sizing: border-box;
+			    position: relative;
+			}
+			.section_page_more .more:hover {
+			    color: #E15616;
+			    border-color: #E15616;
+			}
+			.special .content .left-box .Beautyfair-page .list a .page_main_text.shop_name .tag{
+				width: 44px;
+				height: 18px;
+				line-height: 18px;
+				font-size: 12px;
+				float: left;
+				margin-right: 5px;
+				text-align: center;
+				color: #FFFFFF;
+				background-image: linear-gradient(270deg,
+						#f9c023 0%,
+						#f83600 100%);
+					border-radius: 0px 10px 0px 0px;
+			}

src/main/resources/static/css/product/detail.h5.css

@@ -84,3 +84,18 @@ li{list-style:none}
 .comment-right{float: right}
 .noprice{color: #e15616;font-size: 3vw}
 .noprice .mIcon::before{width: 5vw;height: 4vw;background-position: -48.2vw -69.2vw;position: relative;top: 1vw}
+.Beautyfair .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 !important;
+        background-image: linear-gradient(270deg,
+                #f9c023 0%,
+                #f83600 100%);
+        border-radius: 0px 10px 0px 0px;
+        margin-top: 1.6vw;
+}

src/main/resources/static/css/product/detail.pc.css

@@ -146,3 +146,18 @@ input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{-webkit-appear
 .WechatBg{background: url(/img/base/Wechat.bg.png) no-repeat left top;width: 174px;height: 218px;position: absolute;right: -150px;top: -20px;opacity: 0}
 .WechatBg img{margin: 18px auto 10px;width: 132px;height: 132px;}
 .WechatBg p{font-size: 12px;text-align: center;width: 120px;margin: auto;}
+.Beautyfair .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: 6px;
+}

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

@@ -150,6 +150,8 @@
     .productItem .price .price_text_tag .listTag{margin: 0;float: left}
     .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
     .productItem .price .main_price_show { width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
+    .productItem .name .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;}
+
 }
 
 
@@ -183,6 +185,7 @@
     .productItem .price .main_price_unde {width: 100%;height: 6.5vw;line-height: 6.5vw;font-size: 3.4vw;color: #4a4f58;text-align: left;float: left;}
     .productItem .price .price_text_tag {width: 100%;box-sizing: border-box;}
     .productItem .price .main_price_show{color: #f94b4b}
+    .productItem .name span.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 !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;margin-top: .25vw;}
 
 }
 

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

@@ -69,6 +69,8 @@
     .price .right-box{margin:12px 0 0 0}
     .productItem .price .price_grade.sec{display: block;margin-top: 15px;margin-left: 0}
     .section_page_main .page_main_item.default{cursor: default}
+    .productItem .name .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;}
+
 }
 
 
@@ -122,5 +124,19 @@
     .bg{position: fixed;background: rgba(34,39,46, 0.3);left: 0;width: 100%;height: 100%;z-index: 1000;transition: 0.5s;}
     .noclick{pointer-events: none}
     .hotList .section_page_main.swiper-wrapper{height: inherit ;}
-
+    .productItem .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 !important;
+        background-image: linear-gradient(270deg,
+                #f9c023 0%,
+                #f83600 100%);
+        border-radius: 0px 10px 0px 0px;
+        margin-top: .25vw;
+    }
 }

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

@@ -22,7 +22,7 @@ li{list-style:none}
     .listTitle h1{font-size:20px;line-height:42px;font-weight:normal;margin-bottom:16px}
     .listTitle p{text-indent:1em;line-height:36px;font-size:16px}
     .listTitle p em{color:#e15616;font-style:normal;display:inline-block;height:24px;line-height:24px;padding:0 10px;background:#FFF}
-
+    .productItem .name span.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;}
 
 
 
@@ -49,7 +49,7 @@ li{list-style:none}
     .listTitle h1{font-size:4vw;line-height:8vw;font-weight:normal}
     .listTitle p{text-indent:1em;line-height:7vw;font-size:3.2vw}
     .listTitle p em{color:#e15616;font-style:normal;display:inline-block;height:4.8vw;line-height:4.8vw;padding:0 1.5vw;background:#FFF}
-
+    .productItem .name span.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 !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;margin-top: .5vw;}
 
 
 

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

@@ -60,6 +60,8 @@
      #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/css/supplier/index.css

@@ -48,7 +48,7 @@ li{list-style:none}
 .supplierInfo .productItem {margin-bottom: 16px;}
 .empty{background: #fff;margin-top: 10px;}
 .navLayout{min-height: auto;}
-
+.productItem .name span.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;}
 }
 
 /**

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

@@ -83,6 +83,8 @@ li{list-style:none}
     .user-content .section .user-main .new-list .text:hover{color: #E15616;text-decoration: underline;}
     .user-content .section .user-main .new-list .text:before{content: '';width: 6px;height: 6px;border-radius: 50%;background-color: #e15616;position: absolute;left: 0;top:15px;}
     .user-content .section .user-main .new-list .time{line-height: 36px;font-size: 12px;color: #9aa5b5;float: right;}
+    .user-content.coupon{width: 100%;height: 240px}
+    .user-content.coupon .coupon_img{width: 100%;height: 100%;}
 }
 
 /**

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

@@ -0,0 +1,6 @@
+var beautytopic = new Vue({
+    el:'#beautytopic',
+    data:{
+    }
+})
+

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

@@ -32,7 +32,7 @@ var productDetail = new Vue({
         disabledText:'',
         isNoneDisabled:false,
         isServiceInfo:false,
-        productTypeName:""
+        productTypeName:"",
     },
     computed: {},
     methods: {

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

@@ -25,7 +25,8 @@ var productList = new Vue({
         userId: 0,
         shopID:0,
         userIdentity: '',
-        userToken: ''
+        userToken: '',
+        addhtml:'<span class="tag">美博会</span>'
     },
     computed: {
         pageTotal: function () {

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

@@ -28,6 +28,7 @@ var productList = new Vue({
             pageNum: 1,
             idType:1
         },
+        addhtml:'<span class="tag">美博会</span>'
     },
      filters:{
          NumFormat:function(value) {//处理金额

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

@@ -13,7 +13,8 @@ var supplierHome = new Vue({
             keyword: ''
         },
         listRecord:0,
-        productLists:[]
+        productLists:[],
+        addhtml:'<span class="tag">美博会</span>'
     },
     computed: {
 

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

@@ -0,0 +1,12 @@
+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">{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" >美博会</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">{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" >美博会</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">{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" >美博会</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">{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" >美博会</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"><sapn class="tag" >美博会</sapn>{{ 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">{{ pros.name }}</div>
+                                    <div class="page_main_text"><sapn class="tag" >美博会</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"><sapn class="tag" >美博会</sapn>{{ 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">{{pros.name}}</div>
+                                            <div class="page_main_text" target="_blank"><sapn class="tag" >美博会</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

@@ -5,23 +5,131 @@
     <title>采美365网--医疗美容生活美容正品采购平台</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/product/beautytopic.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
+<!--美博会专题-->
+    <div class="special" id="beautytopic">
+			<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="left-box">
+						<div class="Beautyfair-page">
+							<div class="page-title">
+								<h1>VIP品牌线上馆</h1>
+								<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>
+							 </div>
+						</div>
+						<div class="Beautyfair-page">
+							<div class="page-title">
+								<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>
+						</div>
+						<div class="Beautyfair-page">
+							<div class="page-title">
+								<h1>现场直击</h1>
+								<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>
+							 </div>
+						</div>
+						<div class="Beautyfair-page">
+							<div class="page-title">
+								<h1>展位图</h1>
+								<p>这里是展位图描述词</p>
+							</div>
+							 <div class="list Floorplan">
+								 <a href="#" >
+									 <img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
+									 <div class="Booth_text">
+										 <p class="name">北京恩盛众成国际贸易有限公司</p>
+										 <p class="number">展位号：21F</p>
+									 </div>
+								 </a>
+								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
+									<div class="Booth_text">
+										 <p class="name">华熙生物</p>
+										 <p class="number">展位号：21F</p>
+									 </div>
+								 </a>
+								 <a href="#" >
+									 <img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
+									 <div class="Booth_text">
+										 <p class="name">北京恩盛众成国际贸易有限公司</p>
+										 <p class="number">展位号：21F</p>
+									 </div>
+								 </a>
+								 <a href="#" >
+									 <img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
+									 <div class="Booth_text">
+										 <p class="name">北京恩盛众成国际贸易有限公司</p>
+										 <p class="number">展位号：21F</p>
+									 </div>
+								 </a>
+							 </div>
+							 <div class="section_page_more" >
+							 	<div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
+							 </div>
+						</div>
+						<div class="Beautyfair-page">
+							<div class="page-title">
+								<h1>华熙生物</h1>
+									<p>这里是华熙生物描述词</p>
+									<p class="more"> 更多 > </p>
+							</div>
+							 <div class="list supplier">
+								 <a href="#" >
+									 <img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
+									 <div class="page_main_text shop_name">
+										 <span class="tag">美博会</span>
+										 热玛吉术后修复知多少沙发上热玛吉术后修复知多少沙发上
+									 </div>
+								 </a>
+							 </div>
+						</div>
 
-<!--优惠券-->
-    <div id="coupon">
-        <div class="navLayout"  v-cloak>
-            <div class="wrap clear">
-                 <!--左侧导航-->
-                <div class="right">
+					</div>
+					<div class="right-box">
+						<div class="right-coupon">
+							<a href="#">
+								<div class="right_item_title">优惠券</div>
+								<img src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" class="right_item_img"/>
+							</a>
+						</div>
+					</div>
+				</div>
+			</div>
 
-                </div>
-            </div>
-        </div>
-    </div>
+		</div>
     <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/product/beautytopic.js(v=${version})}"></script>
 </body>

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

@@ -46,7 +46,10 @@
 <!--                    <span>&gt;</span>-->
 <!--                    <a th:href="@{'/product/list.html?category=' + *{bigTypeId} + '-' + *{smallTypeId} + '-' + *{tinyTypeId}}" th:text="*{tinyTypeText}"></a>-->
                 </div>
-                <h1 class="title" th:text="*{name}">商品名称</h1>
+                <div class="Beautyfair">
+                    <span class="tag">美博会</span>
+                    <h1 class="title" th:text="*{name}">商品名称</h1>
+                </div>
                 <p class="tags">
                     <span th:each="tag: *{tagList}" th:text="${tag}"></span>
                 </p>

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

@@ -81,7 +81,7 @@
                     <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="p.name"></p>
+                            <p class="name" v-html="addhtml + p.name"></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">{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag">美博会</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">{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag">美博会</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">{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag">美博会</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">{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag">美博会</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"><sapn class="tag">美博会</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,普通机构-->
@@ -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">{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag">美博会</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"><sapn class="tag">美博会</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,普通机构-->
@@ -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">{{pros.name}}</div>
+                                            <div class="name" target="_blank"><sapn class="tag">美博会</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,7 +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="p.name"></span>-->
+                         <span v-html="addhtml +p.name"></span>
                     </a>
                     <div class="price mfhc">
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">

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

@@ -83,6 +83,11 @@
                          </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,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="p.name"></span>
+                                    <span v-html="addhtml + p.name"></span>
                                 </a>
                                 <div class="price mfhc">
                                     <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
@@ -104,7 +104,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="p.name"></span>-->
+                                    <span v-html="addhtml + p.name"></span>
                                 </a>
                                 <div class="price mfhc">
                                     <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">

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

@@ -6,21 +6,44 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
+<style>
+@media screen and (min-width:768px) {
+     #coupon{margin-top: 50px;}
+
+}
+@media screen and (max-width:768px) {
+    .container{width: 100%;height: 100%}
+    .container img{width: 100%;height: 100%}
+}
+
+
+</style>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!--优惠券-->
     <div id="coupon">
-        <div class="navLayout">
+        <div class="navLayout"  v-cloak>
             <div class="wrap clear">
                  <!--左侧导航-->
-                <template th:replace="supplier-center/components/tableft" v-if="userIdentity==3"></template>
-                <template th:replace="user-center/components/tableft" v-else></template>
+                 <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>
                 <div class="right">
-                    <div><img src="/img/Beautyfair/coupon.jpg"/></div>
+                    <div class="container">
+                        <img src="/img/Beautyfair/coupon.jpg" v-if="isPC"/>
+                        <img src="/img/Beautyfair/coupon.h5.jpg" v-else/>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
+    <!-- 引入底部 -->
+<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>
 </body>

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

@@ -100,6 +100,11 @@
                             </div>
                         </div>
                     </div>
+                    <div class=" user-content 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="user-content">
                         <div class="title">今日推荐</div>
                         <div class="section">