优惠券版本

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

@@ -321,6 +321,7 @@ iframe{width:320px !important;height: 280px !important}
 #scrollTop .item:hover .phoneHover{display:block}
 /* 活动标签，阶梯价格 */
 .priceTag{position:relative}
+.couponTag{display:inline-block;height:20px;line-height:20px;border:1px solid #f94b4b;border-radius:2px;font-size:12px;color:#f94b4b;background:#fff1eb;padding:0 10px;position:relative;font-style:normal}
 .priceTag .tag,.listTag{display:inline-block;height:20px;line-height:20px;border:1px solid #ffe6dc;border-radius:2px;font-size:12px;color:#E15616;cursor:pointer;background:#fff;padding:0 24px 0 10px;position:relative;font-style:normal}
 .listTag{float:right;padding:0 5px;margin:12px 15px 0 0;}
 .priceTag .tag:before{width:24px;height:24px;background-position:-88px 3px;position:absolute;right:0;top:0}

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

@@ -35,6 +35,7 @@
 .section_page .page_main_price .main_price_show.none{color:#999999;text-decoration:line-through}
 .section_page .page_main_price .section_page .page_main_price .main_price_show.none{display:none}
 .section_page .page_main_price .price_text_tag{width:100%;height:22px;box-sizing:border-box;float:left;margin-top:0px}
+.section_page .page_main_price .price_text_tag .couponTag{float:left;margin-right: 8px;}
 .section_page .page_main_price .price_text_tag .listTag{margin:0;float:left}
 .section_page .page_main_price .main_price_none{width:100%;height:24px;box-sizing:border-box;float:left;margin-top:2px}
 .section_page .page_main_price .main_price_none.sec{margin-top:25px}
@@ -84,7 +85,8 @@
 .section_page .page_main_price .main_price_show{color:#f94b4b}
 .section_page .page_main_price .section_page .page_main_price .main_price_show.none{display:none}
 .section_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}
-.section_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}
+.section_page .page_main_price .price_text_tag .couponTag{padding:0 2vw;border:.27vw solid #f94b4b;background:#fff1eb;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;color: #f94b4b;border-radius: 0.2vw;margin-right: 1vw;}
+.section_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;border-radius: 0.2vw;}
 .section_page .section_page_main.section_6{height:auto}
 .section_page .section_page_main.section_6 .section_page_more{display:none}
 .section_page .section_page_main.section_3,.section_page .section_page_main.section_4,.section_page .section_page_main.section_5{height:167vw}

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

@@ -22,8 +22,8 @@
 .section_page .page_main_text .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}
 .Popup{position:fixed;background:rgba(34,39,46,0.5);top:0;left:0;width:100%;height:100%;z-index:99999;opacity:0}
 .Popup.show{opacity:1}
-.Popup .show_popup{width:97vw;height:73.6vw;position:absolute;top:0;right:0;left:0;bottom:0;margin:auto}
+.Popup .show_popup{width:70vw;height:94.9vw;position:absolute;top:0;right:0;left:0;bottom:0;margin:auto}
 .bg_img img{width:100%;height:100%}
-.bg_icon{text-align:right;position:absolute;right:10vw}
+.bg_icon{text-align:right;position:absolute;right:-5vw}
 .bg_icon .mIcon{width:10vw;height:10vw;display:inline-block}
 .bg_icon .mIcon:before{width:10vw;height:10vw;background-position:-33.3vw -77.3vw;cursor:pointer}

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

@@ -70,8 +70,8 @@ footer{width:100%;height:auto;float:left}
 .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.5);top: 0;left: 0;width: 100%;height: 100%;z-index: 99999;opacity: 0;}
 .Popup.show{opacity: 1;}
-.Popup .show_popup{width: 655px;height: 460px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;cursor: pointer}
+.Popup .show_popup{width: 344px;height: 472px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;cursor: pointer}
 .bg_img img{width: 100%;height: 100%;}
-.bg_icon{text-align: right;position: absolute;right: 70px; top: 50px;}
+.bg_icon{text-align: right;position: absolute;right: -50px; top: 30px;}
 .bg_icon .icon{width: 50px;height: 50px;display: inline-block;}
 .bg_icon .icon:before{width: 50px;height: 50px;background-position: -187px -545px;cursor: pointer;}

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

@@ -26,6 +26,8 @@ li{list-style:none}
 .productBox .detailBox .row>em.p{font-weight:bold;}
 .productBox .detailBox .row>em.ser{color:#93979F;display:inline-block;width: 24%}
 .productBox .detailBox .row>em.ser:before{content:'\2713';display:inline-block;width:3.4vw;height:3.4vw;text-align:center;line-height:3.4vw;font-size:3.4vw;background:#E15616;border-radius:1.7vw;color:#FFF;margin-right:1.4vw}
+.productBox .detailBox .row .coupon-tags{display: inline-block;}
+.productBox .detailBox .row .coupon-tags>em{font-style:normal;display: inline-block;}
 .productBox .detailBox .price .icon{display:inline-block;font-size:0;height:5vw;line-height:5vw;vertical-align:text-bottom;}
 .productBox .detailBox .price .icon:before{width:11vw;height:5vw;}
 .productBox .detailBox .price .icon.i0:before{background-position:0 -23.2vw}

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

@@ -38,6 +38,9 @@ li{list-style:none;}
 .productBox .detailBox .row>em.p{font-weight:bold;}
 .productBox .detailBox .row>em.ser{color:#93979F;display:inline-block;margin-right:20px;}
 .productBox .detailBox .row>em.ser:before{width:20px;height:20px;margin-right:5px;background-position:-60px 0;vertical-align:text-top;}
+.productBox .detailBox .row .coupon-tags{display: inline-block;padding-left: 7px;}
+.productBox .detailBox .row .coupon-tags>em{font-style:normal;display: inline-block;margin-right: 8px;}
+.productBox .detailBox .row .coupon-tags>em.couponTag-more{color: #4a4f58;cursor: pointer;}
 .productBox .detailBox .price{height:24px}
 .productBox .detailBox .price .rmb{font-weight:bold;}
 .productBox .detailBox .price .icon{display:inline-block;font-size:0;height:24px;line-height:24px;vertical-align:text-top;}

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

@@ -148,6 +148,7 @@
     .productItem .price em.bold{font-weight: bold}
     .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
     .productItem .price .price_text_tag .listTag{margin: 0;float: left}
+    .productItem .price .price_text_tag .couponTag{margin: 0 8px 0 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 .price .main_price_show.none { color: #999999; text-decoration: line-through;}
@@ -170,7 +171,7 @@
     .sortBox li.down:after{border-top-color:#E15616}
     .sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
     .list-container ul{margin: 3.2vw auto;width: 97vw;}
-    .list-container ul li{width: 45.6vw;height: 68vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;}
+    .list-container ul li{width: 45.6vw;height: 70vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;}
     .productItem .price em {display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;float: left;}
     .productItem .price .mIcon:before{width:15.8vw;height: 5vw}
     .productItem .price .mIcon.i5:before {background-position: -84vw -97.5vw;}
@@ -181,10 +182,12 @@
     .productItem .price .mIcon {display: inline-block;font-size: 0;height: 5vw;line-height: 5vw;vertical-align: text-bottom;}
     .productItem img {width: 45.6vw;height: 45.6vw;}
     .productItem .name {display: block;padding: 0 3.2vw;height: 9.3vw;line-height: 4.8vw;font-size: 3.4vw;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
-    .price {padding: 2.7vw 3.2vw;overflow: hidden;}
-    .priceTag .tag, .listTag {padding: 0 2vw;border: .27vw solid #ffe6dc;background: none;font-size: 2.8vw;float: right;}
+    .price {padding: 2vw 3.2vw;overflow: hidden;}
+    .couponTag{padding:0 2vw;border:.27vw solid #f94b4b;background:#fff1eb;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;color: #f94b4b;border-radius: 0.2vw;margin-right: 1vw;}
+    .listTag{padding:0 2vw;border:.27vw solid #ffe6dc;background:none;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;border-radius: 0.2vw;}
+    .price_grade{width: 100%;float: left;margin-top: 2vw;}
     .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 .price_text_tag {width: 100%;box-sizing: border-box;float: left;}
     .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;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/list.css

@@ -16,7 +16,88 @@ li{list-style:none}
     .sortBox li.down:after{border-top-color:#E15616}
     .sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
     .productList{width:1200px;margin:0 auto;box-sizing:border-box}
-    .productList .productItem{margin-bottom:16px}
+    .productList .productItem {
+        width: 184px;
+        height: 268px;
+        float: left;
+        background: #fff;
+        position: relative;
+        margin: 0 16px 16px 0;
+        overflow: hidden;
+        float: left;
+    }
+    .productList .productItem img {
+        width: 100%;
+        height: 164px;
+    }
+    .productList .productItem .name{
+        display: block;
+        padding: 0 8px;
+        margin-top: 8px;
+        height: 40px;
+        line-height: 21px;
+        vertical-align: middle;
+        word-break: break-all;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-inline-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical
+    }
+    .productItem .price{
+        border: 0;
+        box-sizing: border-box;
+        padding: 0 8px;
+        height: 54px;
+        width: 100%;
+    }
+    .productItem .price .icon:before{
+        width: 63px;
+    }
+    .productItem .price .icon.i5:before {
+        background-position: -2px -832px;
+    }
+    .productItem .price .icon.i1:before {
+        background-position: -2px -712px;
+    }
+    .productItem .price .icon.i2:before {
+        background-position: -2px -742px;
+    }
+    .productItem .price .icon.i3:before {
+        background-position: -2px -772px;
+    }
+    .productItem .price .icon.i4:before {
+        background-position: -2px -802px;
+    }
+    .listTag{
+        margin: 12px 8px 0 0;
+        padding: 0 2px;
+    }
+    .productItem .image .icon{
+        position: inherit;
+    }
+    .sortBox li.on, .sortBox li.up, .sortBox li.down {
+        background: #FFE6DC;
+        color: #E15616;
+    }
+    .empty{
+        margin-top: 32px;
+        background: #fff;
+    }
+    .empty p{
+        color: #909090;
+        font-size: 14px;
+    }
+    .productItem .price em{font-weight: normal}
+    .productItem .price em.bold{font-weight: bold}
+    .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
+    .productItem .price .price_text_tag .listTag{margin: 0;float: left}
+    .productItem .price .price_text_tag .couponTag{margin: 0 8px 0 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 .price .main_price_show.none { color: #999999; text-decoration: line-through;}
+    .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;}
+
     .login-btn{font-size: 12px}
     .listTitle{width:1184px;margin:0 auto 16px auto;box-sizing:border-box;padding:16px 30px;border-radius:0 0 2px 2px;background:#fc5331 url(/img/cart/promotions.png) no-repeat right;background-size:auto 100%;color:#FFF}
     .listTitle h1{font-size:20px;line-height:42px;font-weight:normal;margin-bottom:16px}
@@ -43,13 +124,32 @@ li{list-style:none}
     .sortBox li.up:after{border-top-color:#E15616;opacity:.3}
     .sortBox li.down:after{border-top-color:#E15616}
     .sortBox li.down:before{border-bottom-color:#E15616;opacity:.3}
-    .productList{width:96.6vw;margin:1.3vw auto;box-sizing:border-box}
+    .productList{margin: 3.2vw auto;width: 97vw;}
+    .productList .productItem{width: 45.6vw;height: 70vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;}
+    .productItem .price em {display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;float: left;}
+    .productItem .price .mIcon:before{width:15.8vw;height: 5vw}
+    .productItem .price .mIcon.i5:before {background-position: -84vw -97.5vw;}
+    .productItem .price .mIcon.i1:before {background-position: -84vw -69.5vw;}
+    .productItem .price .mIcon.i2:before {background-position: -84vw -76.5vw;}
+    .productItem .price .mIcon.i3:before {background-position: -84vw -83.7vw;}
+    .productItem .price .mIcon.i4:before {background-position: -84vw -90.7vw;}
+    .productItem .price .mIcon {display: inline-block;font-size: 0;height: 5vw;line-height: 5vw;vertical-align: text-bottom;}
+    .productItem img {width: 45.6vw;height: 45.6vw;}
+    .productItem .name {display: block;padding: 0 3.2vw;height: 9.3vw;line-height: 4.8vw;font-size: 3.4vw;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
+    .price {padding: 2vw 3.2vw;overflow: hidden;}
+    .couponTag{padding:0 2vw;border:.27vw solid #f94b4b;background:#fff1eb;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;color: #f94b4b;border-radius: 0.2vw;margin-right: 1vw;}
+    .listTag{padding:0 2vw;border:.27vw solid #ffe6dc;background:none;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;border-radius: 0.2vw;}
+    .price_grade{width: 100%;float: left;margin-top: 2vw;}
+    .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;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;}
+
     .original-price{text-decoration:line-through}
     .listTitle{width:100%;min-height:3.2vw;box-sizing:border-box;padding:3.3vw;background:#fc5331 url(/img/cart/promotions.png) no-repeat right;background-size:auto 100%;color:#FFF}
     .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;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

@@ -4,94 +4,188 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-#supplierBanner{width:100%;height:358px;margin-top:10px;background:#FFF;overflow:hidden;position:relative}
-#supplierBanner .swiper-wrapper{position:relative;height:100%;z-index:0}
-#supplierBanner .swiper-wrapper li{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden}
-#supplierBanner .swiper-wrapper img{width:100%;height:358px;display:block;margin-left:50%;-o-transform:translateX(-50%);-ms-transform:translateX(-50%);-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%)}
-#supplierBanner .swiper-button-prev,#supplierBanner .swiper-button-next{position:absolute;top:50%;margin-top:-25px;width:30px;height:50px;line-height:50px;background:rgba(255,230,220,.2);color:#FFF;font-size:30px;text-align:center;border-radius:2px}
-#supplierBanner .swiper-button-prev{left:0;right:auto}
-#supplierBanner .swiper-button-next{left:auto;right:0}
-#supplierBanner .swiper-button-prev:after{content:"\276C"}
-#supplierBanner .swiper-button-next:after{content:"\276D"}
-#supplierBanner .swiper-button-prev:hover,#supplierBanner .swiper-button-next:hover{background:rgba(255,230,220,.6)}
-#supplierBanner .swiper-pagination{width:100%;height:14px;position:absolute;left:0;bottom:10px;z-index:1;text-align:center;font-size:0}
-#supplierBanner .swiper-pagination span{display:inline-block;border:5px solid transparent;cursor:pointer}
-#supplierBanner .swiper-pagination span:before{content:"";display:inline-block;width:14px;height:4px;background:rgba(255,255,255,.4);border-radius:2px}
-#supplierBanner .swiper-pagination span.on:before{width:28px;background:#fff}
-.supplierTit{width:1184px;margin:0 auto;background:#FFF;position:relative}
-.supplierTit .title{box-sizing:border-box;min-height:100px;padding:16px}
-.supplierTit .title img{display:inline-block;height:90px;width: 90px;margin-right:10px;vertical-align:middle}
-.supplierTit .title h1{display:inline-block;max-width:550px;line-height:36px;vertical-align:middle;font-size:24px;font-weight:bold;text-overflow: ellipsis;overflow: hidden;white-space: nowrap}
-.supplierTit .search{width:490px;height:44px;line-height:44px;box-sizing:border-box;border:1px solid #FFE6DC;position:absolute;bottom:27px;right:16px}
-.supplierTit .search input{width:100%;height:42px;line-height:42px;text-indent:15px;position:absolute;right:0;top:0;border:none;outline:none}
-.supplierTit .search .searchBtn{position:absolute;right:0;top:0;font-size:0;padding:7px 12px;height:30px;line-height:30px}
-.supplierTit .search .searchBtn:before{width:30px;height:30px;background-position:4px 4px}
-.supplierInfo{width:1184px;margin:0 auto;}
-.supplierInfo .tabTit{width:100%;height:40px;line-height:40px;margin:16px auto;background:#FFF;border-bottom:1px solid #ffe6dc;font-size:16px;color:#93979F}
-.supplierInfo .tabTit span{display:inline-block;box-sizing:border-box;min-width:130px;text-align:center;height:100%;padding:0 32px;cursor:pointer}
-.supplierInfo .tabTit span:hover{color:#E15621}
-.supplierInfo .tabTit span.on,.supplierInfo .tabTit span.on:hover{color:#E15621;background:#ffe6dc;font-weight:bold;}
-.supplierInfo .tabCon{width:100%;}
-.supplierInfo .infoBox{box-sizing:border-box;padding:16px;font-size:16px;line-height:22px;color:#4A4F58;background:#FFF;}
-.supplierInfo .infoBox .part{margin-top:30px}
-.supplierInfo .infoBox .part:first-child{margin-top:0}
-.supplierInfo .infoBox .title{height:24px;line-height:24px;font-size:24px;color:#4A4F58;font-weight:bold;text-align:left;margin-bottom:20px}
-.supplierInfo .infoBox span.l{display:inline-block;min-width:70px;height:24px;text-align:justify;vertical-align:top;overflow:hidden}
-.supplierInfo .infoBox span.l:after{content:'';display:inline-block;width:100%}
-.supplierInfo .tabCon .tag{display:inline-block;height:20px;line-height:20px;font-style:normal;background:#86B2FB;color:#FFF;border-radius:2px;margin-right:10px;padding:0 5px}
-.supplierInfo .infoBox .cont{text-indent:2em;text-align:justify}
-.supplierInfo .infoBox .photo img{width:240px;height:180px}
-.supplierInfo .infoBox p{margin:5px 0}
-.supplierInfo .productBox{box-sizing:border-box;width:100%;overflow:hidden;}
-.supplierInfo .productList{width:1200px;margin-left:-8px;margin-bottom:18px;}
-.supplierInfo .productBox .title{color:#4A4F58;font-size:20px;height:54px;line-height:54px}
-.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;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;}
+    #supplierBanner{width:100%;height:358px;margin-top:10px;background:#FFF;overflow:hidden;position:relative}
+    #supplierBanner .swiper-wrapper{position:relative;height:100%;z-index:0}
+    #supplierBanner .swiper-wrapper li{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden}
+    #supplierBanner .swiper-wrapper img{width:100%;height:358px;display:block;margin-left:50%;-o-transform:translateX(-50%);-ms-transform:translateX(-50%);-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%)}
+    #supplierBanner .swiper-button-prev,#supplierBanner .swiper-button-next{position:absolute;top:50%;margin-top:-25px;width:30px;height:50px;line-height:50px;background:rgba(255,230,220,.2);color:#FFF;font-size:30px;text-align:center;border-radius:2px}
+    #supplierBanner .swiper-button-prev{left:0;right:auto}
+    #supplierBanner .swiper-button-next{left:auto;right:0}
+    #supplierBanner .swiper-button-prev:after{content:"\276C"}
+    #supplierBanner .swiper-button-next:after{content:"\276D"}
+    #supplierBanner .swiper-button-prev:hover,#supplierBanner .swiper-button-next:hover{background:rgba(255,230,220,.6)}
+    #supplierBanner .swiper-pagination{width:100%;height:14px;position:absolute;left:0;bottom:10px;z-index:1;text-align:center;font-size:0}
+    #supplierBanner .swiper-pagination span{display:inline-block;border:5px solid transparent;cursor:pointer}
+    #supplierBanner .swiper-pagination span:before{content:"";display:inline-block;width:14px;height:4px;background:rgba(255,255,255,.4);border-radius:2px}
+    #supplierBanner .swiper-pagination span.on:before{width:28px;background:#fff}
+    .supplierTit{width:1184px;margin:0 auto;background:#FFF;position:relative}
+    .supplierTit .title{box-sizing:border-box;min-height:100px;padding:16px}
+    .supplierTit .title img{display:inline-block;height:90px;width: 90px;margin-right:10px;vertical-align:middle}
+    .supplierTit .title h1{display:inline-block;max-width:550px;line-height:36px;vertical-align:middle;font-size:24px;font-weight:bold;text-overflow: ellipsis;overflow: hidden;white-space: nowrap}
+    .supplierTit .search{width:490px;height:44px;line-height:44px;box-sizing:border-box;border:1px solid #FFE6DC;position:absolute;bottom:27px;right:16px}
+    .supplierTit .search input{width:100%;height:42px;line-height:42px;text-indent:15px;position:absolute;right:0;top:0;border:none;outline:none}
+    .supplierTit .search .searchBtn{position:absolute;right:0;top:0;font-size:0;padding:7px 12px;height:30px;line-height:30px}
+    .supplierTit .search .searchBtn:before{width:30px;height:30px;background-position:4px 4px}
+    .supplierInfo{width:1184px;margin:0 auto;}
+    .supplierInfo .tabTit{width:100%;height:40px;line-height:40px;margin:16px auto;background:#FFF;border-bottom:1px solid #ffe6dc;font-size:16px;color:#93979F}
+    .supplierInfo .tabTit span{display:inline-block;box-sizing:border-box;min-width:130px;text-align:center;height:100%;padding:0 32px;cursor:pointer}
+    .supplierInfo .tabTit span:hover{color:#E15621}
+    .supplierInfo .tabTit span.on,.supplierInfo .tabTit span.on:hover{color:#E15621;background:#ffe6dc;font-weight:bold;}
+    .supplierInfo .tabCon{width:100%;}
+    .supplierInfo .infoBox{box-sizing:border-box;padding:16px;font-size:16px;line-height:22px;color:#4A4F58;background:#FFF;}
+    .supplierInfo .infoBox .part{margin-top:30px}
+    .supplierInfo .infoBox .part:first-child{margin-top:0}
+    .supplierInfo .infoBox .title{height:24px;line-height:24px;font-size:24px;color:#4A4F58;font-weight:bold;text-align:left;margin-bottom:20px}
+    .supplierInfo .infoBox span.l{display:inline-block;min-width:70px;height:24px;text-align:justify;vertical-align:top;overflow:hidden}
+    .supplierInfo .infoBox span.l:after{content:'';display:inline-block;width:100%}
+    .supplierInfo .tabCon .tag{display:inline-block;height:20px;line-height:20px;font-style:normal;background:#86B2FB;color:#FFF;border-radius:2px;margin-right:10px;padding:0 5px}
+    .supplierInfo .infoBox .cont{text-indent:2em;text-align:justify}
+    .supplierInfo .infoBox .photo img{width:240px;height:180px}
+    .supplierInfo .infoBox p{margin:5px 0}
+    .supplierInfo .productBox{box-sizing:border-box;width:100%;overflow:hidden;}
+    .supplierInfo .productList{width:1200px;margin-left:-8px;margin-bottom:18px;}
+    .supplierInfo .productBox .title{color:#4A4F58;font-size:20px;height:54px;line-height:54px}
+    .supplierInfo .productItem {margin-bottom: 16px;}
+    .empty{background: #fff;margin-top: 10px;}
+    .navLayout{min-height: auto;}
+    .productList .productItem {
+        width: 184px;
+        height: 268px;
+        float: left;
+        background: #fff;
+        position: relative;
+        margin: 0 16px 16px 0;
+        overflow: hidden;
+        float: left;
+    }
+    .productList .productItem img {
+        width: 100%;
+        height: 164px;
+    }
+    .productList .productItem .name{
+        display: block;
+        padding: 0 8px;
+        margin-top: 8px;
+        height: 40px;
+        line-height: 21px;
+        vertical-align: middle;
+        word-break: break-all;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-inline-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical
+    }
+    .productItem .price{
+        border: 0;
+        box-sizing: border-box;
+        padding: 0 8px;
+        height: 54px;
+        width: 100%;
+    }
+    .productItem .price .icon:before{
+        width: 63px;
+    }
+    .productItem .price .icon.i5:before {
+        background-position: -2px -832px;
+    }
+    .productItem .price .icon.i1:before {
+        background-position: -2px -712px;
+    }
+    .productItem .price .icon.i2:before {
+        background-position: -2px -742px;
+    }
+    .productItem .price .icon.i3:before {
+        background-position: -2px -772px;
+    }
+    .productItem .price .icon.i4:before {
+        background-position: -2px -802px;
+    }
+    .listTag{
+        margin: 12px 8px 0 0;
+        padding: 0 2px;
+    }
+    .productItem .image .icon{
+        position: inherit;
+    }
+    .sortBox li.on, .sortBox li.up, .sortBox li.down {
+        background: #FFE6DC;
+        color: #E15616;
+    }
+    .empty{
+        margin-top: 32px;
+        background: #fff;
+    }
+    .empty p{
+        color: #909090;
+        font-size: 14px;
+    }
+    .productItem .price em{font-weight: normal}
+    .productItem .price em.bold{font-weight: bold}
+    .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
+    .productItem .price .price_text_tag .listTag{margin: 0;float: left}
+    .productItem .price .price_text_tag .couponTag{margin: 0 8px 0 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 .price .main_price_show.none { color: #999999; text-decoration: line-through;}
+    .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;}
 }
 
 /**
 * 移动端
 */
 @media screen and (max-width:768px){
-#supplierBanner{width:93.4vw;height:28.2vw;overflow:hidden;position:relative;margin:0 auto}
-#supplierBanner .swiper-wrapper{position:relative;height:100%;z-index:0}
-#supplierBanner .swiper-wrapper .swiper-slide{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden;text-align:center;background:#fff}
-#supplierBanner .swiper-wrapper img{width:100%;height:28.2vw;display:block}
-#supplierBanner .swiper-button-prev,#supplierBanner .swiper-button-next{display:none}
-#supplierBanner .swiper-pagination{width:100%;height:2.6vw;z-index:1;text-align:center;font-size:0;position:absolute;bottom:1.5vw;left:0}
-#supplierBanner .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}
-#supplierBanner .swiper-pagination .swiper-pagination-bullet:before{content:"";display:block;width:100%;height:.6vw;background:#FFF;border-radius:.3vw}
-#supplierBanner .swiper-pagination .swiper-pagination-bullet.swiper-pagination-bullet-active{width:3.8vw;opacity:1}
-.supplierTit{width:100%;background:#FFF;position:relative;box-sizing:border-box;padding:13.4vw 3.3vw 2vw 3.3vw;border-top:1px solid #F5F5F5;}
-.supplierTit .title{box-sizing:border-box;min-height:13.4vw;padding:2.2vw 0;position:absolute;top:0;left:3.3vw}
-.supplierTit .title img{display:inline-block;height:9vw;margin-right:1vw;vertical-align:middle}
-.supplierTit .title h1{display:inline-block;max-width:70vw;max-height:9vw;overflow:hidden;line-height:4.5vw;vertical-align:middle;font-size:3.7vw;font-weight:bold}
-.supplierTit .search{width:93.4vw;height:9.6vw;margin:2vw auto 0 auto;border:1px solid #FFE6DC;border-radius:2px;position:relative;overflow:hidden}
-.supplierTit .search input{border:none;outline:none;width:100%;height:9.6vw;line-height:9.2vw;font-size:3.7vw;color:#4A4F58;text-indent:2.6vw}
-.supplierTit .searchBtn{position:absolute;right:1.2vw;top:0}
-.supplierTit .searchBtn:before{content:'';display:block;width:9.6vw;height:9.6vw;background-position:-24vw 1.5vw}
-.supplierInfo{margin-bottom: 2.7vw;}
-.supplierInfo .tabTit{padding:1.5vw 3.3vw;background:#FFF;position:relative;}
-.supplierInfo .tabTit span{display:inline-block;height:7.5vw;line-height:7.5vw;border-bottom:2px solid transparent;color:#93979F;font-size:3.4vw;margin-left:8vw;}
-.supplierInfo .tabTit span.on{color:#E15621;border-color:#E15621}
-.supplierInfo .tabTit span:first-child{margin-left:0;}
-.supplierInfo .showSearch{position:absolute;right:3.3vw;bottom:1.5vw;padding:0 2vw;height:7.5vw;line-height:7.5vw;background:#E15621;color:#FFF;font-weight:normal;font-size:3.1vw;border-radius:2px}
-.supplierInfo .infoBox{padding:1.2vw 3.3vw 3.3vw;border-top:1px solid #F5F5F5;font-size:3.7vw;line-height:5.2vw;color:#93979F;}
-.supplierInfo .infoBox .title{color:#4A4F58;font-weight:bold;padding-left:1vw;border-left:.4vw solid #E15616;margin:2.7vw 0;}
-.supplierInfo .infoBox .tag{display:inline-block;height:4.4vw;line-height:4.4vw;font-size:2.6vw;font-style:normal;background:#86B2FB;color:#FFF;border-radius:2px;margin-right:2.2vw;padding:0 1vw}
-.supplierInfo .infoBox .part{margin-top:5.4vw}
-.supplierInfo .infoBox .part:first-child{margin-top:0}
-.supplierInfo .infoBox .cont{text-indent:2em;text-align: justify;}
-.supplierInfo .infoBox .photo img{width:45.3vw;height:34vw}
-.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;}
-
-
-
-
-
+    #supplierBanner{width:93.4vw;height:28.2vw;overflow:hidden;position:relative;margin:0 auto}
+    #supplierBanner .swiper-wrapper{position:relative;height:100%;z-index:0}
+    #supplierBanner .swiper-wrapper .swiper-slide{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden;text-align:center;background:#fff}
+    #supplierBanner .swiper-wrapper img{width:100%;height:28.2vw;display:block}
+    #supplierBanner .swiper-button-prev,#supplierBanner .swiper-button-next{display:none}
+    #supplierBanner .swiper-pagination{width:100%;height:2.6vw;z-index:1;text-align:center;font-size:0;position:absolute;bottom:1.5vw;left:0}
+    #supplierBanner .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}
+    #supplierBanner .swiper-pagination .swiper-pagination-bullet:before{content:"";display:block;width:100%;height:.6vw;background:#FFF;border-radius:.3vw}
+    #supplierBanner .swiper-pagination .swiper-pagination-bullet.swiper-pagination-bullet-active{width:3.8vw;opacity:1}
+    .supplierTit{width:100%;background:#FFF;position:relative;box-sizing:border-box;padding:13.4vw 3.3vw 2vw 3.3vw;border-top:1px solid #F5F5F5;}
+    .supplierTit .title{box-sizing:border-box;min-height:13.4vw;padding:2.2vw 0;position:absolute;top:0;left:3.3vw}
+    .supplierTit .title img{display:inline-block;height:9vw;margin-right:1vw;vertical-align:middle}
+    .supplierTit .title h1{display:inline-block;max-width:70vw;max-height:9vw;overflow:hidden;line-height:4.5vw;vertical-align:middle;font-size:3.7vw;font-weight:bold}
+    .supplierTit .search{width:93.4vw;height:9.6vw;margin:2vw auto 0 auto;border:1px solid #FFE6DC;border-radius:2px;position:relative;overflow:hidden}
+    .supplierTit .search input{border:none;outline:none;width:100%;height:9.6vw;line-height:9.2vw;font-size:3.7vw;color:#4A4F58;text-indent:2.6vw}
+    .supplierTit .searchBtn{position:absolute;right:1.2vw;top:0}
+    .supplierTit .searchBtn:before{content:'';display:block;width:9.6vw;height:9.6vw;background-position:-24vw 1.5vw}
+    .supplierInfo{margin-bottom: 2.7vw;}
+    .supplierInfo .tabTit{padding:1.5vw 3.3vw;background:#FFF;position:relative;}
+    .supplierInfo .tabTit span{display:inline-block;height:7.5vw;line-height:7.5vw;border-bottom:2px solid transparent;color:#93979F;font-size:3.4vw;margin-left:8vw;}
+    .supplierInfo .tabTit span.on{color:#E15621;border-color:#E15621}
+    .supplierInfo .tabTit span:first-child{margin-left:0;}
+    .supplierInfo .showSearch{position:absolute;right:3.3vw;bottom:1.5vw;padding:0 2vw;height:7.5vw;line-height:7.5vw;background:#E15621;color:#FFF;font-weight:normal;font-size:3.1vw;border-radius:2px}
+    .supplierInfo .infoBox{padding:1.2vw 3.3vw 3.3vw;border-top:1px solid #F5F5F5;font-size:3.7vw;line-height:5.2vw;color:#93979F;}
+    .supplierInfo .infoBox .title{color:#4A4F58;font-weight:bold;padding-left:1vw;border-left:.4vw solid #E15616;margin:2.7vw 0;}
+    .supplierInfo .infoBox .tag{display:inline-block;height:4.4vw;line-height:4.4vw;font-size:2.6vw;font-style:normal;background:#86B2FB;color:#FFF;border-radius:2px;margin-right:2.2vw;padding:0 1vw}
+    .supplierInfo .infoBox .part{margin-top:5.4vw}
+    .supplierInfo .infoBox .part:first-child{margin-top:0}
+    .supplierInfo .infoBox .cont{text-indent:2em;text-align: justify;}
+    .supplierInfo .infoBox .photo img{width:45.3vw;height:34vw}
+    .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}
+    .productList{margin: 3.2vw auto;width: 97vw;}
+    .productList .productItem{width: 45.6vw;height: 70vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;}
+    .productItem .price em {display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;float: left;}
+    .productItem .price .mIcon:before{width:15.8vw;height: 5vw}
+    .productItem .price .mIcon.i5:before {background-position: -84vw -97.5vw;}
+    .productItem .price .mIcon.i1:before {background-position: -84vw -69.5vw;}
+    .productItem .price .mIcon.i2:before {background-position: -84vw -76.5vw;}
+    .productItem .price .mIcon.i3:before {background-position: -84vw -83.7vw;}
+    .productItem .price .mIcon.i4:before {background-position: -84vw -90.7vw;}
+    .productItem .price .mIcon {display: inline-block;font-size: 0;height: 5vw;line-height: 5vw;vertical-align: text-bottom;}
+    .productItem img {width: 45.6vw;height: 45.6vw;}
+    .productItem .name {display: block;padding: 0 3.2vw;height: 9.3vw;line-height: 4.8vw;font-size: 3.4vw;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
+    .price {padding: 2vw 3.2vw;overflow: hidden;}
+    .couponTag{padding:0 2vw;border:.27vw solid #f94b4b;background:#fff1eb;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;color: #f94b4b;border-radius: 0.2vw;margin-right: 1vw;}
+    .listTag{padding:0 2vw;border:.27vw solid #ffe6dc;background:none;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;border-radius: 0.2vw;}
+    .price_grade{width: 100%;float: left;margin-top: 2vw;}
+    .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;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/index.js

@@ -353,14 +353,15 @@ var homeData = new Vue({
         //     $(this).parents('.item').hide();
         // });
         // var isActivityStatus =  localStorage.getItem('isActivityStatus');
-        // //新加优惠券弹窗
-        // if(isActivityStatus){
-        //     var  lockTime = localStorage.getItem('lockTime');
-        //     _this.popupFlag = this.diffTime(lockTime);
-        // }else{
-        //     setTimeout(function () {
-        //          _this.popupFlag = true;
-        //     },1000);
-        // }
+        var isActivityStatus =  true;
+        //新加优惠券弹窗
+        if(isActivityStatus){
+            var  lockTime = localStorage.getItem('lockTime');
+            _this.popupFlag = this.diffTime(lockTime);
+        }else{
+            setTimeout(function () {
+                 _this.popupFlag = true;
+            },1000);
+        }
     }
 });

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

@@ -28,6 +28,11 @@ var productList = new Vue({
         userToken: '',
         addhtml:'<span class="tag">美博会</span>'
     },
+    filters: {
+        NumFormat:function(value) {
+            return Number(value).toFixed(2);
+        }
+    },
     computed: {
         pageTotal: function () {
             var total = Math.ceil(this.listRecord / this.params.size);
@@ -69,6 +74,16 @@ var productList = new Vue({
                 this.pageInput = 1;
             }
         },
+        PromotionsFormat:function(promo){//促销活动类型数据处理
+            if(promo!=null){
+                if(promo.type == 1 && promo.mode == 1){
+                    return true
+                }else{
+                    return false
+                }
+            }
+            return false
+        },
         getListByKeyword: function () {
             var _self = this;
             ProductApi.GetProductSearchList({

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

@@ -18,6 +18,11 @@ var supplierHome = new Vue({
     },
     computed: {
 
+    },
+    filters: {
+        NumFormat:function(value) {
+            return Number(value).toFixed(2);
+        }
     },
     methods: {
         getShopInfo: function(){
@@ -129,6 +134,16 @@ var supplierHome = new Vue({
                 }
             );
         },
+        PromotionsFormat:function(promo){//促销活动类型数据处理
+            if(promo!=null){
+                if(promo.type == 1 && promo.mode == 1){
+                    return true
+                }else{
+                    return false
+                }
+            }
+            return false
+        },
         keyupSearch: function(event) {
             // 搜索输入框 按回车键搜索
             var keyCode = event.keyCode || event.which;

src/main/resources/templates/index.html

@@ -165,6 +165,7 @@
                                                 <!-- 正常商品 -->
                                                 <template v-if="pros.product.productCategory == 1">
                                                     <div class="price_text_tag">
+                                                        <p class="couponTag">优惠券</p>
                                                         <p class="listTag" v-if="pros.product.actStatus ==1 && pros.product.promotions">
                                                             <span v-text="pros.product.promotions.name"></span>
                                                             <template v-if="PromotionsFormat(pros.product.promotions)">
@@ -290,6 +291,7 @@
                                                             <!-- 正常商品 -->
                                                             <th:block th:if="*{productCategory}==1">
                                                                 <div class="price_text_tag" th:if="${pros.get('product').containsKey('actStatus')}">
+                                                                    <p class="couponTag">优惠券</p>
                                                                     <p class="listTag" th:if="*{actStatus}==1 and ${pros.get('product').get('promotions')}!=null">
                                                                         <template th:text="*{promotions.name}"></template>
                                                                         <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">
@@ -313,7 +315,6 @@
                                                 </div>
                                             </a>
                                         </th:block>
-
                                         <!-- 广告图 -->
                                         <th:block th:if="*{templateType}==6">
                                             <a th:href="*{#strings.isEmpty(adsLink1)}? 'javascript:;' : *{adsLink1}" th:attr="target=(*{#strings.isEmpty(adsLink1)} ? '_self' : '_blank')" class="page_main_item ad_01">
@@ -357,17 +358,17 @@
             <a class="item-sideNav" href="javascript:void(0);" v-for="nav in asideNav" :data-id="nav.id" v-text="nav.value" ></a>
         </div>
     </div>
-    <!--美博会弹窗-->
-<!--    <div id="meibohui" class="Popup" v-if="popupFlag" :class="popupFlag ? 'show' :'' "-->
-<!--         onclick="_czc.push(['_trackEvent','美博会','点击','用户访问','','meibohui'])">-->
-<!--        <div class="show_popup">-->
-<!--            <div class="bg_icon" @click="closePopup"><i class="icon mIcon"></i></div>-->
-<!--            <div class="bg_img" @click="popupPage">-->
-<!--                <img src="https://static.caimei365.com/app/meibohui/www/activity-pop-pc.png" v-if="isPC">-->
-<!--                <img src="https://static.caimei365.com/app/meibohui/www/activity-pop-h5.png" v-else>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--    </div>-->
+    <!--新用户优惠券弹窗-->
+    <div id="meibohui" class="Popup" v-if="popupFlag" :class="popupFlag ? 'show' :'' "
+         onclick="_czc.push(['_trackEvent','美博会','点击','用户访问','','meibohui'])">
+        <div class="show_popup">
+            <div class="bg_icon" @click="closePopup"><i class="icon mIcon"></i></div>
+            <div class="bg_img" @click="popupPage">
+                <img src="https://static.caimei365.com/app/meibohui/www/coupon-pop-pc.png" v-if="isPC">
+                <img src="https://static.caimei365.com/app/meibohui/www/coupon-pop-h5.png" v-else>
+            </div>
+        </div>
+    </div>
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>

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

@@ -138,6 +138,16 @@
                             </div>
                         </template>
                     </div>
+                    <div class="row" >
+                        <span class="l">优惠券</span>
+                        <i>：</i>
+                        <span class="coupon-tags">
+                            <em class="couponTag">满50000减400</em>
+                            <em class="couponTag">满50000减400</em>
+                            <em class="couponTag">满50000减400</em>
+                            <em class="couponTag-more">更多></em>
+                        </span>
+                    </div>
                     <div th:if="not${#strings.isEmpty(product.brandName)}" class="row"><span class="l">品牌</span><i>：</i><em th:text="*{brandName}"></em></div>
                     <div class="row" th:if="not${#strings.isEmpty(product.unit)}"><span class="l">包装规格</span><i>：</i><em th:text="*{unit}"></em></div>
                     <div class="row" th:if="not${#strings.isEmpty(product.productCode)}"><span class="l">商品编码</span><i>：</i><em th:text="*{productCode}"></em></div>

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

@@ -95,6 +95,7 @@
                                     <template v-else>
                                         <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID)">
                                            <div class="price_text_tag">
+                                                <p class="couponTag">优惠券</p>
                                                 <p class="listTag" v-if="p.actStatus==1">
                                                     {{p.promotions.name}}
                                                     <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
@@ -106,12 +107,14 @@
                                         </template>
                                         <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                              <div class="price_text_tag">
+                                                <p class="couponTag">优惠券</p>
                                                 <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
                                             </div>
                                             <div class="main_price_unde">￥会员可见</div>
                                         </template>
                                         <template v-else>
                                          <div class="price_text_tag">
+                                            <p class="couponTag">优惠券</p>
                                             <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
                                         </div>
                                         <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
@@ -120,7 +123,8 @@
                                 </template>
                                 <template v-else>
                                      <div class="price_text_tag ">
-                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                         <p class="couponTag">优惠券</p>
+                                         <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
                                       </div>
                                       <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                 </template>

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

@@ -118,6 +118,7 @@
                                         <!-- 正常商品 -->
                                             <template v-if="pros.product.productCategory == 1">
                                                 <div class="price_text_tag">
+                                                    <p class="couponTag">优惠券</p>
                                                     <p class="listTag" v-if="pros.product.actStatus ==1 && pros.product.promotions">
                                                         <span v-text="pros.product.promotions.name"></span>
                                                         <template v-if="PromotionsFormat(pros.product.promotions)">
@@ -242,6 +243,7 @@
                                                         <!-- 正常商品 -->
                                                         <th:block th:if="*{productCategory}==1">
                                                             <div class="price_text_tag" th:if="${pros.get('product').containsKey('actStatus')}">
+                                                                <p class="couponTag">优惠券</p>
                                                                 <p class="listTag" th:if="*{actStatus}==1 and ${pros.get('product').get('promotions')}!=null">
                                                                     <template th:text="*{promotions.name}"></template>
                                                                     <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">

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

@@ -107,42 +107,58 @@
         </div>
         <!--商品列表-->
         <ul class="productList clear mfw">
-            <li class="productItem mfc" v-for="p in listData">
-                <div class="item">
-                    <a class="image" :href="'/product-'+p.productId+'.html'">
-                        <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
-                    </a>
-                    <a class="name" :href="'/product-'+p.productId+'.html'">
-                         <span v-html="addhtml +p.name" v-if="p.beautyActFlag==1"></span>
-                         <span v-html="p.name" v-else></span>
-                    </a>
-                    <div class="price mfhc">
+            <li class="productItem " v-for="p in listData">
+                <a class="image" :href="'/product-'+p.productId+'.html'">
+                    <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
+                    <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
+                    <p class="name" v-html="p.name" v-else></p>
+                    <div class="price">
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <template v-if="p.priceFlag==1">
-                                <em>￥价格未公开</em>
+                                <div class="price_text_tag">
+                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                </div>
+                                <div class="main_price_unde">￥价格未公开</div>
                             </template>
                             <template v-else>
                                 <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID)">
-                                    <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                    <div class="price_text_tag">
+                                        <p class="couponTag">优惠券</p>
+                                        <p class="listTag" v-if="p.actStatus==1">
+                                            {{p.promotions.name}}
+                                            <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
+                                        </p>
+                                    </div>
+                                    <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
+                                        ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
+                                    </div>
                                 </template>
                                 <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
-                                    <em>￥会员可见</em>
-                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                    <div class="price_text_tag">
+                                        <p class="couponTag">优惠券</p>
+                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                    </div>
+                                    <div class="main_price_unde">￥会员可见</div>
                                 </template>
                                 <template v-else>
-                                    <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                    <div class="price_text_tag">
+                                        <p class="couponTag">优惠券</p>
+                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                    </div>
+                                    <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                 </template>
                             </template>
                         </template>
                         <template v-else>
-                            <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                            <div class="price_text_tag ">
+                                <p class="couponTag">优惠券</p>
+                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                            </div>
+                            <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                         </template>
                     </div>
-                </div>
+                </a>
             </li>
         </ul>
     </template>

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

@@ -55,43 +55,58 @@
                     <div class="title">主推商品</div>
                     <!--主推商品列表-->
                     <ul class="productList clear mfw">
-                        <li class="productItem mfc" v-for="p in mainProducts">
-                            <div class="item">
-                                <a class="image" :href="'/product-'+p.productId+'.html'">
-                                    <img :src="p.image" :alt="p.name">
-                                    <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.productId+'.html'">
-                                    <span v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></span>
-                                    <span v-html="p.name" v-else></span>
-                                </a>
-                                <div class="price mfhc">
+                        <li class="productItem " v-for="p in mainProducts">
+                            <a class="image" :href="'/product-'+p.productId+'.html'">
+                                <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
+                                <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
+                                <p class="name" v-html="p.name" v-else></p>
+                                <div class="price">
                                     <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                         <template v-if="p.priceFlag==1">
-                                            <em>￥价格未公开</em>
+                                            <div class="price_text_tag">
+                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            </div>
+                                            <div class="main_price_unde">￥价格未公开</div>
                                         </template>
                                         <template v-else>
                                             <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID)">
-                                                <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                                <div class="price_text_tag">
+                                                    <p class="couponTag">优惠券</p>
+                                                    <p class="listTag" v-if="p.actStatus==1">
+                                                        {{p.promotions.name}}
+                                                        <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
+                                                    </p>
+                                                </div>
+                                                <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
+                                                    ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
+                                                </div>
                                             </template>
                                             <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
-                                                <em>￥会员可见</em>
-                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                                <div class="price_text_tag">
+                                                    <p class="couponTag">优惠券</p>
+                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                </div>
+                                                <div class="main_price_unde">￥会员可见</div>
                                             </template>
                                             <template v-else>
-                                                <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                                <div class="price_text_tag">
+                                                    <p class="couponTag">优惠券</p>
+                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                </div>
+                                                <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em class="">￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                        <span class="listTag " v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                        <div class="price_text_tag ">
+                                            <p class="couponTag">优惠券</p>
+                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                        </div>
+                                        <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                     </template>
                                 </div>
-                            </div>
+                            </a>
                         </li>
                     </ul>
                 </div>
@@ -99,43 +114,58 @@
                     <div class="title" id="supProduct">供应商产品</div>
                     <!--主推商品列表-->
                     <ul v-if="productLists.length>0" class="productList clear mfw">
-                        <li class="productItem mfc" v-for="p in productLists">
-                            <div class="item">
-                                <a class="image" :href="'/product-'+p.productId+'.html'">
-                                    <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
-                                    <span v-if="p.actType==1||p.actType==2" :class="p.actType==1?'icon mIcon hot':'icon mIcon new'"></span>
-                                </a>
-                                <a class="name" :href="'/product-'+p.id+'.html'">
-                                    <span v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></span>
-                                    <span v-html="p.name" v-else></span>
-                                </a>
-                                <div class="price mfhc">
+                        <li class="productItem " v-for="p in productLists">
+                            <a class="image" :href="'/product-'+p.productId+'.html'">
+                                <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
+                                <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
+                                <p class="name" v-html="p.name" v-else></p>
+                                <div class="price">
                                     <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                         <template v-if="p.priceFlag==1">
-                                            <em>￥价格未公开</em>
+                                            <div class="price_text_tag">
+                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            </div>
+                                            <div class="main_price_unde">￥价格未公开</div>
                                         </template>
                                         <template v-else>
                                             <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID)">
-                                                <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                                <div class="price_text_tag">
+                                                    <p class="couponTag">优惠券</p>
+                                                    <p class="listTag" v-if="p.actStatus==1">
+                                                        {{p.promotions.name}}
+                                                        <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
+                                                    </p>
+                                                </div>
+                                                <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
+                                                    ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
+                                                </div>
                                             </template>
                                             <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
-                                                <em>￥会员可见</em>
-                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                                <div class="price_text_tag">
+                                                    <p class="couponTag">优惠券</p>
+                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                </div>
+                                                <div class="main_price_unde">￥会员可见</div>
                                             </template>
                                             <template v-else>
-                                                <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                                <div class="price_text_tag">
+                                                    <p class="couponTag">优惠券</p>
+                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                </div>
+                                                <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em class="">￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                        <span class="listTag " v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                        <div class="price_text_tag ">
+                                            <p class="couponTag">优惠券</p>
+                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                        </div>
+                                        <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                     </template>
                                 </div>
-                            </div>
+                            </a>
                         </li>
                     </ul>
                     <div v-else class="empty">