美博会

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

@@ -358,7 +358,7 @@
     height: 4.3vw;
     line-height: 4.3vw;
     font-size: 2.8vw;
-    float: left;
+    display: inline-block;
     margin-right: 1.3vw;
     text-align: center;
     color: #FFFFFF !important;

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

@@ -540,7 +540,7 @@ footer{
     #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;}
+.section_page .page_main_text .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;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;cursor: pointer}

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

@@ -36,7 +36,7 @@
 .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;}
-.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;}
+.special .content .left-box .Beautyfair-page .list a .page_main_text.shop_name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;}
 .Beautyfair-page .page_main_price {width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 0 8px;}
 .Beautyfair-page  .page_main_price .main_price_text {width: 100%;height: 54px;float: left;box-sizing: border-box;}
 .Beautyfair-page .page_main_price .main_price_unde{width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
@@ -115,7 +115,7 @@
 	.special .content .left-box .Beautyfair-page .list.supplier a{width: 41vw;height: 68vw;display: inline-block;float: none;flex-shrink: 0;}
 	.special .content .left-box .Beautyfair-page .list.supplier a img{height: 41vw;}
 	.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;margin-top: 2vw;}
-	.special .content .left-box .Beautyfair-page .list a .page_main_text.shop_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;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 2vw 0px 0px;}
+	.special .content .left-box .Beautyfair-page .list a .page_main_text.shop_name .tag{width: 11.3vw;height: 4.3vw;line-height: 4.3vw;font-size:2.8vw;display: inline-block;margin-right: 1.3vw;text-align: center;color: #FFFFFF;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 2vw 0px 0px;}
 	.Beautyfair-page .page_main_price .icon:before { width:16.8vw;height: 5vw}
     .Beautyfair-page .page_main_price .price_grade_1:before{
         background-position: -83.5vw -69.4vw;

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

@@ -150,7 +150,7 @@
     .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;}
+    .productItem .name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;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;}
 
 }
 
@@ -185,7 +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;}
+    .productItem .name span.tag{width: 11.3vw;height: 4.3vw;line-height: 4.3vw;font-size: 2.8vw;display: inline-block;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,7 +69,7 @@
     .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;}
+    .productItem .name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display:inline-block ;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;}
 
 }
 
@@ -129,7 +129,7 @@
         height: 4.3vw;
         line-height: 4.3vw;
         font-size: 2.8vw;
-        float: left;
+       display: inline-block;
         margin-right: 1.3vw;
         text-align: center;
         color: #FFFFFF !important;

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;}
+    .productItem .name span.tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;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;}
+    .productItem .name span.tag{width: 11.3vw;height: 4.3vw;line-height: 4.3vw;font-size: 2.8vw;display: inline-block;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/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;}
+.productItem .name span.tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;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;}
 }
 
 /**
@@ -88,6 +88,7 @@ li{list-style:none}
 .supplierInfo .infoBox p{margin:1vw 0;}
 .supplierInfo .productList{width:96.6vw;margin:1.3vw auto;box-sizing:border-box}
 .supplierInfo .productBox .title{width:93.4vw;color:#2D3036;font-size:3.7vw;height:5vw;line-height:5vw;margin:2.7vw auto 0}
+.productItem .name span.tag{width: 11.3vw;height: 4.3vw;line-height: 4.3vw;font-size: 2.8vw;display: inline-block;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/js/product/beautytopic.js

@@ -35,19 +35,14 @@ var beautytopic = new Vue({
             {name:'热玛吉术后修复知多少沙发上',image:'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',link:''}
          ],
          List:[
-             {
-                 shopName: '展位图',
-                 prolist: [
-                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
-                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
-                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
-                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
-                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
-                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
-                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
-                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
-                 ],
-             }
+             {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+             {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+             {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+             {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+             {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+             {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+             {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+             {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
          ],
          userId:0,
          userIdentity:'',

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

@@ -58,18 +58,18 @@
 								 <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">
+						<div class="Beautyfair-page">
 							<div class="page-title">
-								<h1>{{item.shopName}}</h1>
+								<h1>展位图</h1>
 								<p>这里是展位图描述词</p>
 							</div>
 							 <div class="list Floorplan swiper-container"  id="recommendBox" >
 							 	<div class="swiper-wrapper clear mfw mainBox">
-									<a href="javascript:0;" class="swiper-slide" v-for="pros in item.prolist" @click="bigImag(pros.image)">
-										 <img  :src="pros.image" />
+									<a href="javascript:0;" class="swiper-slide" v-for="item in List" @click="bigImag(item.image)">
+										 <img  :src="item.image" />
 										 <div class="Booth_text">
-											 <p class="name">{{pros.name}}</p>
-											 <p class="number">{{pros.num}}</p>
+											 <p class="name">{{item.name}}</p>
+											 <p class="number">{{item.num}}</p>
 										 </div>
 									 </a>
 								</div>