美博会

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

@@ -10,230 +10,47 @@
 .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 .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: 660px;overflow: hidden}
-.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 !important;
-	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;
-		margin-top: 10px;
-}
+.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 !important;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;margin-top: 10px;}
 .special .content .left-box .Beautyfair-page .list.live a .page_main_text{margin: 0}
-.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;
-}
-
-.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;
-}
-.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;
-}
-.Beautyfair-page .page_main_price .main_price_show{
-	width: 100%;
-	height: 30px;
-	line-height: 30px;
-	font-size: 14px;
-	color: #f94b4b;
-	text-align: left;
-	float: left;
-}
-.Beautyfair-page .page_main_price .main_price_show.none{
-	color: #999999;
-	text-decoration: line-through;
-}
-.Beautyfair-page .page_main_price .price_text_tag{
-	width: 100%;
-	height: 22px;
-	box-sizing: border-box;
-	float: left;
-	margin-top: 0px;
-}
-.Beautyfair-page .page_main_price .price_text_tag .listTag{
-	margin:0;
-	float: left;
-}
-.Beautyfair-page .page_main_price .main_price_none{
-	width: 100%;
-	height: 24px;
-	box-sizing: border-box;
-	float: left;
-	margin-top: 2px;
-}
-.Beautyfair-page .page_main_price .main_price_none.sec{
-	margin-top: 25px;
-}
-.Beautyfair-page .page_main_price .main_price_none .listTag{
-	margin:0;
-}
-.Beautyfair-page .page_main_price .price_grade{
-	float: left;
-	margin:0;
-	height: 22px;
-	line-height: 22px;
-	color: #4A4F58;
-	font-style: normal;
-	font-size: 14px;
-}
-.Beautyfair-page .page_main_price .price_grade span{
-	display: inline-block;
-	float: left;
-}
-.Beautyfair-page .page_main_price .icon:before{
-	width: 67px;
-	height: 22px;
-}
-.Beautyfair-page .page_main_price .price_grade_1:before{
-	background-position:0 -714px;
-}
+.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;}
+.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;}
+.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;}
+.Beautyfair-page .page_main_price .main_price_show{width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
+.Beautyfair-page .page_main_price .main_price_show.none{color: #999999;text-decoration: line-through;}
+.Beautyfair-page .page_main_price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 0px;}
+.Beautyfair-page .page_main_price .price_text_tag .listTag{margin:0;float: left;}
+.Beautyfair-page .page_main_price .main_price_none{width: 100%;height: 24px;box-sizing: border-box;float: left;margin-top: 2px;}
+.Beautyfair-page .page_main_price .main_price_none.sec{margin-top: 25px;}
+.Beautyfair-page .page_main_price .main_price_none .listTag{margin:0;}
+.Beautyfair-page .page_main_price .price_grade{float: left;margin:0;height: 22px;line-height: 22px;color: #4A4F58;font-style: normal;font-size: 14px;}
+.Beautyfair-page .page_main_price .price_grade span{display: inline-block;float: left;}
+.Beautyfair-page .page_main_price .icon:before{width: 67px;height: 22px;}
+.Beautyfair-page .page_main_price .price_grade_1:before{background-position:0 -714px;}
 .Beautyfair-page .page_main_price .price_grade_2:before{
 	background-position:0 -744px;
 }
@@ -246,57 +63,22 @@
 .Beautyfair-page .page_main_price .price_grade_5:before{
 	background-position:0 -834px;
 }
-.special .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;
-}
-.special .Popup .show_popup{
-	width: 968px;
-	height: 510px;
-	position: absolute;
-	top: 0;
-	right: 0;
-	left: 0;
-	bottom: 0;
-	margin: auto;
-}
-.bg_img{
-	width: 968px;
-	height: 510px;
-}
-.bg_img img{
-	width: 100%;
-	height: 100%;
-}
+.special .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;}
+.special .Popup .show_popup{width: 968px;height: 510px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;}
+.bg_img{width: 968px;height: 510px;}
+.bg_img img{width: 100%;height: 100%;}
 .bg_icon{text-align: right}
-.bg_icon .icon{
-	width: 50px;
-	height: 50px;
-	display: inline-block;
-}
-.bg_icon .icon:before{
-	width: 50px;
-	height: 50px;
-	background-position: -187px -545px;
-	cursor: pointer;
-}
+.bg_icon .icon{width: 50px;height: 50px;display: inline-block;}
+.bg_icon .icon:before{width: 50px;height: 50px;background-position: -187px -545px;cursor: pointer;}
 #recommendBox .swiper-pagination{width:100%;padding:10px 0;z-index:1;text-align:center;font-size:0;}
 #recommendBox .swiper-pagination span{display:inline-block;width:14px;height:4px;border:5px solid transparent;cursor:pointer;opacity:.2;}
 #recommendBox .swiper-pagination span:before{content:"";display:inline-block;width:100%;height:4px;background:#E15616;border-radius:2px}
-#recommendBox .swiper-pagination span.on{width:28px;opacity:1;}
-.Beautyfair-page .swiper-wrapper{height: 612 ;overflow: hidden}
+#recommendBox .swiper-pagination .swiper-pagination-bullet.swiper-pagination-bullet-active{width:28px;opacity:1;}
+.Beautyfair-page .swiper-wrapper{height: 612px ;overflow: hidden}
 }
 @media screen and (max-width:768px) {
- 	#recommendBox{width: calc(100%);height:120vw;overflow:hidden;position:relative;}
+ 	#recommendBox{width: calc(100%);height:120vw;overflow:hidden;position:relative;padding: 1vw}
     #recommendBox .swiper-pagination{width:100%;height:2.6vw;z-index:1;text-align:center;font-size:0;position:absolute;bottom:2.6vw;left:0}
     #recommendBox .swiper-pagination .swiper-pagination-bullet{display:block;width:2vw;border-width:1vw 1px;border-color:transparent;cursor:pointer;background:none;font-size:0;opacity:.2}
     #recommendBox .swiper-pagination .swiper-pagination-bullet:before{content:"";display:block;width:100%;height:.6vw;background:#E15616;border-radius:.3vw}
@@ -311,7 +93,7 @@
 	.special .content .left-box .Beautyfair-page .page-title{padding: 4.8vw 0 2.4vw 3.2vw}
 	.special .content .left-box .Beautyfair-page .page-title h1{font-size: 4.8vw;color: #4a4f58;font-weight: bold;line-height: 9.7vw}
 	.special .content .left-box .Beautyfair-page .page-title p{font-size: 3.4vw;color: #93979f;line-height: 4.3vw;float: left}
-	.special .content .left-box .Beautyfair-page .list a{width: 45.6vw;height: 32.4vw;display: block;float: left;margin-right:2vw;margin-bottom: 2vw;background-color: #FFFFFF;}
+	.special .content .left-box .Beautyfair-page .list a{vertical-align: top;width: 45.6vw;height: 32.4vw;display: block;float: left;margin-right:2vw;margin-bottom: 2vw;background-color: #FFFFFF;}
 	.special .content .left-box .Beautyfair-page {width: 100%;height: auto;float: left;}
 	.special .content .left-box .Beautyfair-page .list a img {width: 100%;height: 100%;}
 	.special .content .left-box .Beautyfair-page .list{padding-left: 3vw;overflow: hidden;width: 100%;margin-top: 5vw}
@@ -324,7 +106,7 @@
 	.special .content .left-box .Beautyfair-page .list.live,.special .content .left-box .Beautyfair-page .list.supplier{white-space: nowrap;overflow-x: auto;}
 	.special .content .left-box .Beautyfair-page .list a .page_main_text {height: 10.8vw;padding: 0 3vw;font-size: 3.1vw;color: #4a4f58;line-height:5.1vw;}
 	.special .content .left-box .Beautyfair-page .list a .page_main_text p {width: 33.5vw;height: 10.8vw;line-height: 10.8vw;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
-	.special .content .left-box .Beautyfair-page .list.Floorplan a{height: 52.5vw;width: 46vw !important;margin: 0 1vw 2vw 1vw }
+	.special .content .left-box .Beautyfair-page .list.Floorplan a{height: 52.5vw;width: 46vw !important;margin: 0 1vw 3vw 1vw }
 	.special .content .left-box .Beautyfair-page .list.Floorplan a img{height: 35.7vw;}
 	.special .content .left-box .Beautyfair-page .list a .Booth_text{height: 16.8vw;padding:0 3.2vw;}
 	.special .content .left-box .Beautyfair-page .list a .Booth_text p.name{font-size: 3.4vw;width:100%;color: #4a4f58;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;padding:4.2vw  0 2vw 0;}
@@ -351,125 +133,26 @@
         background-position: -83.5vw -97.4vw;
     }
     .price_grade .bold {font-weight: bold;}
-	.Beautyfair-page .page_main_price .main_price_none .listTag{
-        padding: 0 2vw;
-        border: .27vw solid #ffe6dc;
-        background: none;
-        font-size: 2.8vw;
-        float: right;
-    }
-    .Beautyfair-page .page_main_price .price_grade{
-        display: block;
-        height: 7vw;
-        line-height: 7vw;
-        color: #4A4F58;
-        font-style: normal;
-        float: left;
-    }
-    .Beautyfair-page .page_main_price .price_grade .icon {
-        display: inline-block;
-        font-size: 0;
-        height: 5vw;
-        line-height: 5vw;
-        vertical-align: text-bottom;
-    }
-     .Beautyfair-page .page_main_price{
-        width: 100%;
-        box-sizing: border-box;
-        padding:0 3.2vw;
-    }
-    .Beautyfair-page .page_main_price .price_text_tag{
-        width: 100%;
-        box-sizing: border-box;
-        float: left;
-    }
+	.Beautyfair-page .page_main_price .main_price_none .listTag{padding: 0 2vw;border: .27vw solid #ffe6dc;background: none;font-size: 2.8vw;float: right;}
+    .Beautyfair-page .page_main_price .price_grade{display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;float: left;}
+    .Beautyfair-page .page_main_price .price_grade .icon {display: inline-block;font-size: 0;height: 5vw;line-height: 5vw;vertical-align: text-bottom;}
+    .Beautyfair-page .page_main_price{width: 100%;box-sizing: border-box;padding:0 3.2vw;}
+    .Beautyfair-page .page_main_price .price_text_tag{width: 100%;box-sizing: border-box;float: left;}
     .Beautyfair-page .page_main_price .main_price_show{color:#f94b4b }
-    .Beautyfair-page .page_main_price .main_price_unde{
-        width: 100%;
-        height: 6.5vw;
-        line-height: 6.5vw;
-        font-size: 3.4vw;
-        color: #4a4f58;
-        text-align: left;
-        float: left;
-    }
-    .Beautyfair-page .page_main_price .price_text_tag .listTag{
-        padding: 0 2vw;
-        border: .27vw solid #ffe6dc;
-        background: none;
-        font-size: 2.8vw;
-        float: left;
-        height: 4.2vw;
-        line-height: 4.2vw;
-    }
-   .special .content .left-box .Beautyfair-page .list.exhibitor.max{height: auto}
-   .Beautyfair-page .section_page_more .more {
-		width: 20vw;
-		height: 6.4vw;
-		margin: 5vw auto;
-		border: .27vw solid #cccccc;
-		color: #909090;
-		font-size: 3vw;
-		line-height: 6.4vw;
-		border-radius: .54vw;
-		position: relative;
-		text-indent: 2vw;
-	}
-	.special .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;
-	}
-	.special .Popup .show_popup{
-		width: 94vw;
-		height: 85vw;
-		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		bottom: 0;
-		margin: auto;
-	}
-	.bg_img{
-		width: 94vw;
-		height: 73vw;
-	}
-	.bg_img img{
-		width: 100%;
-		height: 100%;
-	}
+    .Beautyfair-page .page_main_price .main_price_unde{width: 100%;height: 6.5vw;line-height: 6.5vw;font-size: 3.4vw;color: #4a4f58;text-align: left;float: left;}
+    .Beautyfair-page .page_main_price .price_text_tag .listTag{padding: 0 2vw;border: .27vw solid #ffe6dc;background: none;font-size: 2.8vw;float: left;height: 4.2vw;line-height: 4.2vw;}
+    .special .content .left-box .Beautyfair-page .list.exhibitor.max{height: auto}
+    .Beautyfair-page .section_page_more .more {width: 20vw;height: 6.4vw;margin: 5vw auto;border: .27vw solid #cccccc;color: #909090;font-size: 3vw;line-height: 6.4vw;border-radius: .54vw;position: relative;text-indent: 2vw;}
+	.special .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;}
+	.special .Popup .show_popup{width: 94vw;height: 85vw;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;}
+	.bg_img{width: 94vw;height: 73vw;}
+	.bg_img img{width: 100%;height: 100%;}
 	.bg_icon{text-align: right}
-	.bg_icon .mIcon{
-		width: 10vw;
-		height: 10vw;
-		display: inline-block;
-	}
-	.bg_icon .icon:before{
-		width:10vw;
-		height: 10vw;
-		background-position: -33.3vw -77.3vw;
-	}
-	.Beautyfair-page .section_page_more .more .icon:before {
-		background-position: -51.5vw 0px;
-		width: 5.4vw;
-		height: 6.7vw;
-		right: 0;
-		position: absolute;
-	}
-	.special .content .left-box .Beautyfair-page .list .mainBox{
-	    margin: auto;
-		width: 97vw;
-		height: 120vw;
-		overflow: hidden;
-	}
+	.bg_icon .mIcon{width: 10vw;height: 10vw;display: inline-block;}
+	.bg_icon .icon:before{width:10vw;height: 10vw;background-position: -33.3vw -77.3vw;}
+	.Beautyfair-page .section_page_more .more .icon:before {background-position: -51.5vw 0px;width: 5.4vw;height: 6.7vw;right: 0;position: absolute;}
+	.special .content .left-box .Beautyfair-page .list .mainBox{margin: auto;width: 97vw;height: 120vw;overflow: hidden;}
 }
 
 

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

@@ -96,6 +96,6 @@ li{list-style:none}
         background-image: linear-gradient(270deg,
                 #f9c023 0%,
                 #f83600 100%);
-        border-radius: 0px 10px 0px 0px;
-        margin-top: 1.6vw;
+        border-radius: 0px 2.7vw 0px 0px;
+        margin-top: 1vw;
 }

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

@@ -124,7 +124,8 @@ li{list-style:none}
     .user-content .user-main .new-list:before{content:'\25CF';color:#9aa5b5;position:absolute;left:0}
     .user-content .user-main .new-list .text{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#4a4f58}
     .user-content .user-main .new-list .time{color:#9aa5b5}
-
+    .user-content.coupon{width: 100%;height: 32vw}
+    .user-content.coupon .coupon_img{width: 100%;height: 100%;}
 
 
 }

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

@@ -53,7 +53,7 @@ var homeData = new Vue({
         zhuanti:function(){
             this.showflag=false;
             window.location.href='/user/beautyfair.html';
-             window.localStorage.setItem('beatyPop',true);
+            window.localStorage.setItem('beatyPop',true);
         },
         closepopup:function(){
               this.showflag=false;

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

@@ -3,7 +3,10 @@ var beautytopic = new Vue({
     data:{
         listLoading:true,
          productList:[],
-         Descriptors:[],//描述词
+         Descriptors:[
+             {descriptext:'这里是华熙生物描述词',shopId:1161},
+             {descriptext:'这里是供应商描述词',shopId:1252},
+             ],//描述词
          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'},
@@ -89,6 +92,17 @@ var beautytopic = new Vue({
             }
             return false
         },
+        ReturnNewFlootData:function(listA,listB){
+				var NewArray = [];
+				listA.forEach(function (item) {
+                    for (var i=0;i < listB.length; i++){
+                        if( item.shopId == listB[i].shopId ){
+							NewArray.push(Object.assign(item,listB[i]))
+						}
+                    }
+                })
+				return NewArray
+			},
     },
     mounted:function () {
         var _this = this;
@@ -99,6 +113,7 @@ var beautytopic = new Vue({
         ProductApi.GetbeautyProduct({userId:_this.userId},function (res) {
             if (res.code==0){
                 _this.productList = res.data;
+                _this.productList = _this.ReturnNewFlootData(res.data,_this.Descriptors);
                 _this.listLoading = false;
                setTimeout(function(){
                 // 图片懒加载
@@ -108,9 +123,9 @@ var beautytopic = new Vue({
              _this.listLoading = true;
             }
         });
+
         setTimeout(function(){
-                if (isPC) {
-                     var swiper = new Swiper('.swiper-container', {
+                 var swiper = new Swiper('.swiper-container', {
                         slidesPerView: 2,
                         slidesPerColumn: 2,
                         spaceBetween:0,
@@ -123,22 +138,6 @@ var beautytopic = new Vue({
                             el: '.swiper-pagination'
                         },
                     });
-                } else {
-                    var swiper = new Swiper('.swiper-container', {
-                        slidesPerView: 2,
-                        slidesPerColumn: 2,
-                        spaceBetween:0,
-                        slidesPerGroup: 2,
-                        autoplay: {
-                            delay: 3000,
-                            disableOnInteraction: false
-                        },
-                        pagination: {
-                            el: '.swiper-pagination'
-                        }
-                    });
-
-                }
             },500);
     }
 })

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

@@ -33,6 +33,7 @@ var productDetail = new Vue({
         isNoneDisabled:false,
         isServiceInfo:false,
         productTypeName:"",
+        beautyActFlag:'',
     },
     computed: {},
     methods: {
@@ -74,6 +75,7 @@ var productDetail = new Vue({
             ProductApi.GetProductDdtails({userId:GLOBAL_USER_ID,productID:_self.productId},function (response) {
                 if(response.code == 0){
                     var product = response.data;
+                    _self.beautyActFlag = product.beautyActFlag
                     _self.productTypeName = product.typeName;
                     if(product.productDetail.orderInfo!='' && product.productDetail.serviceInfo!=''){
                         _self.isServiceInfo = true;

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

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网--医疗美容生活美容正品采购平台</title>
+    <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">
@@ -79,7 +79,7 @@
 						<div class="Beautyfair-page" v-for="(item,index) in productList">
 							<div class="page-title">
 								<h1>{{item.shopName}}</h1>
-									<p>这里是华熙生物描述词</p>
+									<p>{{item.descriptext}}</p>
 									<p class="more" @click="gosupplier(item.shopId)"> 更多 > </p>
 							</div>
 							 <div class="list supplier">

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

@@ -47,7 +47,7 @@
 <!--                    <a th:href="@{'/product/list.html?category=' + *{bigTypeId} + '-' + *{smallTypeId} + '-' + *{tinyTypeId}}" th:text="*{tinyTypeText}"></a>-->
                 </div>
                 <div class="Beautyfair">
-                    <span class="tag" v-if="priceObj.beautyActFlag==1">美博会</span>
+                    <span class="tag" v-if="beautyActFlag==1">美博会</span>
                     <h1 class="title" th:text="*{name}">商品名称</h1>
                 </div>
                 <p class="tags">