Kaynağa Gözat

修改svip标签

喻文俊 3 yıl önce
ebeveyn
işleme
2a03ac586b

+ 10 - 10
src/main/resources/static/css/base/floor.css

@@ -25,17 +25,17 @@
 .section_page_main.section_2 .page_main_item.ad_02,.section_page_main.section_4 .page_main_item.ad_03{width:344px}
 .section_page .page_main_item_adv{width:100%;height:100%;display:block}
 .section_page .page_main_image{width:164px;height:164px;display:block;float:left;border-radius:2px 2px 0 0}
-.section_page .page_main_text{width:100%;height:42px;float:left;box-sizing:border-box;margin-top:10px;padding:0 8px;white-space:normal;word-break:break-all;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;line-height:21px}
+.section_page .page_main_text{width:100%;height:42px;float:left;box-sizing:border-box;margin-top:10px;padding:0 4px;white-space:normal;word-break:break-all;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;line-height:21px}
 .section_page .page_main_tag{width:100%;height:24px;float:left;margin-top:16px;padding:0 8px}
 .section_page .page_main_tag p{display:block;padding:0 4px;height:24px;box-sizing:border-box;border:1px solid #e3ebf7;border-radius:2px;float:left;font-size:12px;line-height:22px;text-align:center;color:#9aa5b5}
-.section_page .page_main_price{width:100%;height:54px;float:left;box-sizing:border-box;padding:0 8px}
+.section_page .page_main_price{width:100%;height:54px;float:left;box-sizing:border-box;padding:0 4px}
 .section_page .page_main_price .main_price_text{width:100%;height:54px;float:left;box-sizing:border-box}
 .section_page .page_main_price .main_price_unde{width:100%;height:31px;line-height:31px;font-size:14px;color:#4a4f58;text-align:left;float:left}
 .section_page .page_main_price .main_price_show{width:100%;height:30px;line-height:30px;font-size:14px;color:#f94b4b;text-align:left;float:left}
 .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: 4px;}
+.section_page .page_main_price .price_text_tag .couponTag{float:left;margin-right: 2px;}
 .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}
@@ -51,9 +51,9 @@
 .section_page .page_main_price .price_grade_5:before{background-position:0 -834px}
 /*会员标签*/
 .section_page .page_main_price .price_text_tag .svip-tag{width:100%;height:22px;letter-spacing:0}
-.section_page .page_main_price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:36px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+.section_page .page_main_price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
-.section_page .page_main_price .price_text_tag .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-26px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:12px}
+.section_page .page_main_price .price_text_tag .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:12px}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-price span{color: #333}
 
 .section_page .section_page_more{width:100%;height:32px;margin-top:16px;float:left;display:none}
@@ -89,7 +89,7 @@
 .section_page .page_main_text{padding:0 2vw;height:9.3vw;line-height:5vw;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;margin-top:1vw}
 .section_page .page_main_item.ad_02 img,.section_page .page_main_item.ad_03 img,.section_page .page_main_item.ad_01 img{height:100%;width:100%}
 .section_page .page_main_price{width:100%;box-sizing:border-box;padding:0 1.5vw}
-.section_page .page_main_price .price_text_tag{width:100%;box-sizing:border-box;float:left}
+.section_page .page_main_price .price_text_tag{width:100%;box-sizing:border-box;float:left;margin-top: 1.2vw}
 .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}
@@ -139,12 +139,12 @@
 .section_page .page_main_tag{color:#9aa5b5;margin:1vw 3.2vw;border:.27vw solid #e3ebf7;display:inline-block;padding:0 1.3vw;border-radius:.54vw}
 .section_page .page_main_price .bold{font-weight:bold}
 /*会员标签*/
-.section_page .page_main_price .price_text_tag .svip-tag{float: left; height:4.44vw;letter-spacing:0}
-.section_page .page_main_price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.46vw;text-align:center;line-height:4.46vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+.section_page .page_main_price .price_text_tag .svip-tag{float: left; height:4.74vw;letter-spacing:0;overflow: hidden}
+.section_page .page_main_price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
-.section_page .page_main_price .price_text_tag .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.1vw;padding-right:0.6vw;margin-left:-6.2vw;line-height:4.46vw;background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+.section_page .page_main_price .price_text_tag .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-price span{color: #333}
-
+.section_page .page_main_price .price_text_tag .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
 
 #recommendBox{width: calc(100%);height:150vw;overflow:hidden;position:relative;}
 #recommendBox .swiper-pagination{width:100%;height:2.6vw;z-index:1;text-align:center;font-size:0;position:absolute;bottom:2.6vw;left:0}

+ 9 - 0
src/main/resources/static/css/product/detail.h5.css

@@ -40,6 +40,15 @@ li{list-style:none}
 .productBox .detailBox .price .icon.i3:before{background-position:0 -33.8vw}
 .productBox .detailBox .price .icon.i4:before{background-position:0 -38.8vw}
 .productBox .detailBox .price .icon.i5:before{background-position:0 -44vw}
+
+/*会员标签*/
+.productBox .detailBox .price .svip-tag{height:4.74vw;letter-spacing:0;overflow: hidden;display: inline-block;vertical-align: text-bottom}
+.productBox .detailBox .price .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+.productBox .detailBox .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+.productBox .detailBox .price .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+.productBox .detailBox .price .svip-tag .svip-price span{color: #333}
+.productBox .detailBox .price .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
+
 .productBox .detailBox .number{display:inline-block;width:26.6vw;line-height:6.4vw;height:6.4vw;box-sizing:border-box;border:1px solid #FFE6DC;border-radius:2px;font-size:0;white-space:nowrap;text-align:center;overflow:hidden;vertical-align:top}
 .productBox .detailBox .number>em{display:inline-block;width:6.4vw;height:6.4vw;background:#FFE6DC;font-size:4vw;line-height:6vw;vertical-align:top}
 .productBox .detailBox .number input{width:13.5vw;border:none;line-height:6vw;vertical-align:top;text-align:center;color:#E15616;font-size:3.4vw}

+ 8 - 0
src/main/resources/static/css/product/detail.pc.css

@@ -53,6 +53,14 @@ li{list-style:none;}
 .productBox .detailBox .price .icon.i4:before{background-position:-295px -242px}
 .productBox .detailBox .price .icon.i5:before{background-position:-295px -276px}
 .productBox .detailBox .priceTag {position:absolute;top:0px;left:88px;}
+
+/*会员标签*/
+.productBox .detailBox .price .svip-tag{width:100%;height:22px;letter-spacing:0;display: inline;margin-left: 10px}
+.productBox .detailBox .price .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:36px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+.productBox .detailBox .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+.productBox .detailBox .price .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:14px}
+.productBox .detailBox .price .svip-tag .svip-price span{color: #333}
+
 .productBox .detailBox .number{display:inline-block;width:96px;line-height:24px;height:24px;box-sizing:border-box;border:1px solid #FFE6DC;border-radius:2px;font-size:0;white-space:nowrap;text-align:center;overflow:hidden;vertical-align:top;}
 .productBox .detailBox .number>em{display:inline-block;width:24px;height:22px;background:#FFE6DC;font-size:20px;font-style:normal;line-height:20px;vertical-align:top;cursor:pointer}
 .productBox .detailBox .number input{width:48px;border:none;line-height:22px;font-size:14px;vertical-align:top;text-align:center;color:#E15616;}

+ 43 - 138
src/main/resources/static/css/product/instruement-list.css

@@ -10,140 +10,33 @@
     .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}
-    .classification .class-nav-main div,.classification .class-nav-main li{
-        text-align: center;
-        display: inline-block;
-        line-height: 64px;
-        color: #4a4f58;
-        font-size: 16px;
-        cursor: pointer;
-        padding: 0 16px;
-    }
-    #listClassify{
-        margin: 0 auto;
-        box-sizing: border-box;
-        background: rgba(255,255,255,1);
-        border-radius: 0 0 2px 2px;
-    }
-     .classification {
-        border-bottom: 1px solid #f7f7f7;
-        align-items: center;
-        display: -webkit-flex;
-    }
-    .classification .class-title{
-        width: 127px;
-        text-align: center;
-        font-size: 16px;
-        line-height: 64px;
-    }
-    .classification .class-nav-main{
-        width:1040px;
-        display: inline-block;
-        border-left: 1px solid #f7f7f7;
-        font-size: 0;
-    }
-    .classification .class-nav-main div.on, .classification .class-nav-main div.on a{
-        color: #e15616;
-    }
-    .crumbs-nav >div{display: inline-block}
-    .crumbs-nav-item{
-        display: inline-block;
-        padding: 0 12px;
-        border: 1px solid #cccccc;
-        line-height: 24px;
-        margin-right: 16px;
-        color: #909090;
-        border-radius: 2px;
-        cursor: pointer;
-    }
-    .crumbs-nav-item.on{
-        color: #e15616;
-        border: 1px solid #e15616;
-    }
-    .sortBox .on{background:#ffe6dc }
-    .classification.sortBox .class-nav-main li{
-        border-right: 1px solid #f7f7f7;
-        width: 127px;
-        padding: 0;
-        position: relative;
-    }
-
-    .list-container{
-        margin-top: 32px;
-        width: 1200px;
-    }
-    .list-container ul li.productItem {
-        width: 184px;
-        height: 268px;
-        float: left;
-        background: #fff;
-        position: relative;
-        margin: 0 16px 16px 0;
-        overflow: hidden;
-        float: left;
-    }
-    .list-container ul li img {
-        width: 100%;
-        height: 164px;
-    }
-    .list-container ul li .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;
-    }
+    .classification .class-nav-main div,.classification .class-nav-main li{text-align:center;display:inline-block;line-height:64px;color:#4a4f58;font-size:16px;cursor:pointer;padding:0 16px}
+    #listClassify{margin:0 auto;-webkit-box-sizing:border-box;box-sizing:border-box;background:rgba(255,255,255,1);border-radius:0 0 2px 2px}
+    .classification{border-bottom:1px solid #f7f7f7;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-flex}
+    .classification .class-title{width:127px;text-align:center;font-size:16px;line-height:64px}
+    .classification .class-nav-main{width:1040px;display:inline-block;border-left:1px solid #f7f7f7;font-size:0}
+    .classification .class-nav-main div.on,.classification .class-nav-main div.on a{color:#e15616}
+    .crumbs-nav >div{display:inline-block}
+    .crumbs-nav-item{display:inline-block;padding:0 12px;border:1px solid #cccccc;line-height:24px;margin-right:16px;color:#909090;border-radius:2px;cursor:pointer}
+    .crumbs-nav-item.on{color:#e15616;border:1px solid #e15616}
+    .sortBox .on{background:#ffe6dc}
+    .classification.sortBox .class-nav-main li{border-right:1px solid #f7f7f7;width:127px;padding:0;position:relative}
+    .list-container{margin-top:32px;width:1200px}
+    .list-container ul li.productItem{width:184px;height:268px;float:left;background:#fff;position:relative;margin:0 16px 16px 0;overflow:hidden;float:left}
+    .list-container ul li img{width:100%;height:164px}
+    .list-container ul li .name{display:block;padding:0 8px;margin-top:8px;height:40px;line-height:21px;vertical-align:middle;word-break:break-all;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-inline-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
+    .productItem .price{border:0;-webkit-box-sizing:border-box;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;}
@@ -153,6 +46,12 @@
     .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;}
+    /*会员标签*/
+    .productItem .price .price_text_tag .svip-tag{width:100%;height:22px;letter-spacing:0}
+    .productItem .price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .productItem .price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .productItem .price .price_text_tag .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:12px}
+    .productItem .price .price_text_tag .svip-tag .svip-price span{color: #333}
 
 }
 
@@ -181,15 +80,21 @@
     .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;}
+    .productItem .name {display: block;padding: 0 1.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 1.2vw;overflow: hidden;}
+    .couponTag{padding:0 0.4vw;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;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;}
-
+    /*会员标签*/
+    .productItem .price .price_text_tag .svip-tag{float: left; height:4.74vw;letter-spacing:0;overflow: hidden}
+    .productItem .price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .productItem .price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .productItem .price .price_text_tag .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+    .productItem .price .price_text_tag .svip-tag .svip-price span{color: #333}
+    .productItem .price .price_text_tag .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
 }
 

+ 13 - 13
src/main/resources/static/css/product/list.css

@@ -49,11 +49,11 @@ li{list-style:none}
     .listTitle p{text-indent:1em;line-height:36px;font-size:16px}
     .listTitle p em{color:#e15616;font-style:normal;display:inline-block;height:24px;line-height:24px;padding:0 10px;background:#FFF}
     .productItem .name span.tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;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;}
-
+    /*会员标签*/
     .productItem .price .svip-tag{width:100%;height:22px;letter-spacing:0}
-    .productItem .price .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:36px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .productItem .price .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
     .productItem .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
-    .productItem .price .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-26px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:12px}
+    .productItem .price .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:12px}
     .productItem .price .svip-tag .svip-price span{color: #333}
 }
 /**
@@ -83,9 +83,9 @@ li{list-style:none}
     .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;}
+    .productItem .name {display: block;padding: 0 1.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 1.2vw;overflow: hidden;}
+    .couponTag{padding:0 .4vw;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: .4vw;}
     .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;}
@@ -99,13 +99,13 @@ li{list-style:none}
     .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 .price .svip-tag{float: left; height:4.74vw;letter-spacing:0;overflow: hidden}
+    .productItem .price .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .productItem .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .productItem .price .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+    .productItem .price .svip-tag .svip-price span{color: #333}
+    .productItem .price .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
 
 }
 

+ 17 - 2
src/main/resources/static/css/shopping/shopping.css

@@ -73,7 +73,7 @@ li{list-style:none}
     .listWrap .del:hover .tips{opacity:1}
     .listWrap .price{position:relative;display:inline-block;line-height:24px}
     .listWrap .price>em{font-style:normal;font-size:16px;display:inline-block;width:100%}
-    .listWrap .price>del{font-size:16px;display:inline-block;width:100%}
+    .listWrap .price>del{font-size:16px;display:inline-block;width:100%;color:#B8BFCA}
     .invalidTit{height:44px;line-height:44px;padding-top:16px;font-size:16px}
     .invalidTit .tit{color:#22272e;float:left}
     .invalidTit .delAll{color:#e15616;float:right;cursor:pointer}
@@ -230,7 +230,12 @@ li{list-style:none}
     .coupon-popup .coupon-list-cell .coupon-list-ri{width: 70px;height: 148px;float: left;box-sizing: border-box;padding: 54px 27px;font-size: 16px;color: #FFF;cursor: pointer;}
     .coupon-popup .coupon-list-cell .coupon-list-ri.none{padding: 45px 27px;}
     .coupon-popup .coupon-list-cell .coupon-tags{height: 24px;line-height: 24px;text-align: center;border-radius: 8px 0 8px 0;position: absolute;top: 0;left: 0;padding: 0 10px;background-color: #f94b4b;color: #FFF;}
-
+    /*会员标签*/
+    .listWrap .cartItem .priceTag .svip-tag{width:100%;height:22px;letter-spacing:0}
+    .listWrap .cartItem .priceTag .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .listWrap .cartItem .priceTag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .listWrap .cartItem .priceTag .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:14px}
+    .listWrap .cartItem .priceTag .svip-tag .svip-price span{color: #333}
 
 }
 
@@ -263,6 +268,16 @@ li{list-style:none}
     .listWrap .supplierTit .shop{display: block;float: left;}
     .listWrap .supplierTit .couponTag{float:left;margin-left: 10px;height: 6.4vw;line-height: 6.4vw;box-sizing: border-box;border-radius: 0.2vw;}
     .listWrap .supplierTit .priceTag .tag{float: left;position: relative;top: 0;left: 0;margin-left: 2vw;}
+
+    /*会员标签*/
+    .listWrap .cartItem .c4{height: auto !important;}
+    .listWrap .cartItem .price .svip-tag{height:4.74vw;letter-spacing:0;overflow: hidden}
+    .listWrap .cartItem .price .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .listWrap .cartItem .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .listWrap .cartItem .price .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+    .listWrap .cartItem .price .svip-tag .svip-price span{color: #333}
+    .listWrap .cartItem .price .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
+
     .listWrap .cartItem{padding:2.2vw 3.3vw;height:24vw;line-height:24vw;position:relative}
     .listWrap .supplierBtn{border-top:1px solid #F7F7F7;width:93vw;margin:0 auto;padding-bottom:2vw;color:#22272e;font-size:3.4vw;text-align:right}
     .listWrap .supplierBtn em{color:#f55c5c}

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

@@ -131,7 +131,7 @@ li{list-style:none}
     .user-header .account .user-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-ms-flex-wrap:wrap;flex-wrap:wrap}
     .user-header .account .user-info a,.user-header .account .user-info span{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-sizing:border-box;box-sizing:border-box;margin-right:1.6vw}
     .user-header .account .user-info .username{width:100%;font-size:3.6vw;font-weight:bold;color:#22272e;display:inline-block}
-    .user-header .account .user-info .update{position:relative;width:28vw;height:5.4vw;background:#FFE6DC;border:1px solid #E15616;opacity:1;border-radius:2px;color:#E15616;font-size:3.2vw;line-height:22px;text-align:center;margin-left:0}
+    .user-header .account .user-info .update{position:relative;height:5.4vw;background:#FFE6DC;border:1px solid #E15616;opacity:1;border-radius:2px;color:#E15616;font-size:3.2vw;line-height:22px;text-align:center;margin-left:0}
     .user-header .account .user-info .update .name-tips{width:44px;height:19px;line-height:19px;text-align:center;border-radius:10px;background-color:#ffe6dc;font-size:12px;color:#E15616;position:absolute;right:0;top:-25px;z-index:99}
     .user-header .account .user-info .update .name-tips:before{content:'';width:6px;height:6px;background-color:#ffe6dc;position:absolute;bottom:-3px;left:12px;z-index:-1;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}
     .user-header .account .user-info .agency{width:16vw;height:5.4vw;text-align:center;border-radius:2px;font-size:3.2vw;-webkit-box-sizing:border-box;box-sizing:border-box}

+ 19 - 2
src/main/resources/static/css/user-center/order/detail.css

@@ -45,8 +45,16 @@ li{list-style:none}
     .order-container .section-shopinfo .product-t .text{width: 810px;float: left;}
     .order-container .section-shopinfo .product-t .tit{float: left;width: 100%;margin-bottom: 6px;line-height: 22px;font-size: 16px;text-align: left;color: #22272E;}
     .order-container .section-shopinfo .product-t .info{width: 100%;height: auto;float: left;}
-    .order-container .section-shopinfo .product-t .info>p{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:30%}
-    .order-container .section-shopinfo .product-t .info>p .red{color: #FF2A2A;}
+    .order-container .section-shopinfo .product-t .info>.col{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:25%}
+    .order-container .section-shopinfo .product-t .info>.col .red{color: #FF2A2A;}
+    .order-container .section-shopinfo .product-t .info>div.col{width: 40%;}
+    /*会员标签*/
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag{width:100%;height:22px;letter-spacing:0;display: inline;margin-left: 10px;}
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:14px}
+    .order-container .section-shopinfo .product-t .info>.col .svip-tag .svip-price span{color: #333}
+
     .order-container .section-shopinfo .product-t .price>p{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:30%}
     .order-container .section-shopinfo .product-t .price>p .red{color: #FF2A2A;}
     .price-total{padding-top:20px;text-align:right;color:#22272e;font-size:16px}
@@ -152,6 +160,15 @@ li{list-style:none}
     .section-prosinfo .text .info .priceTag .tag{position:absolute;right:0;top:auto;left:auto;}
     .section-prosinfo .text .info>p{display:inline-block;min-width:48%;font-size:3.1vw;color:#627386}
     .section-prosinfo .text .info>p .red{color:#FF2A2A}
+
+    /*会员标签*/
+    .section-prosinfo .text .svip-tag{height:4.74vw;letter-spacing:0;overflow: hidden;margin-left: 12vw;}
+    .section-prosinfo .text .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .section-prosinfo .text .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .section-prosinfo .text .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+    .section-prosinfo .text .svip-tag .svip-price span{color: #333}
+    .section-prosinfo .text .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
+
     .section-prosinfo .text .price{font-size:3.4vw;color:#627386}
     .section-prosinfo .text .price .red{color:#f94b4b}
     .shopinfo-bott{border-top:1px solid #F7F7F7;width:100%;box-sizing:border-box;margin:0 auto;line-height:10.6vw;color:#22272e;font-size:3.4vw;text-align:right;padding:0 3.2vw}

+ 1 - 1
src/main/resources/templates/index.html

@@ -171,7 +171,7 @@
                                                             <div class="svip-tag">
                                                                 <div class="svip-icon btr">SVIP</div>
                                                                 <div class="svip-price">
-                                                                    <span>¥</span><span>9999999</span>
+                                                                    <span>¥</span><span>9999999.00</span>
                                                                 </div>
                                                             </div>
                                                         </template>

+ 1 - 1
src/main/resources/templates/pay/caimei-pay.html

@@ -77,7 +77,7 @@
                 </div>
             </template>
             <!--购买会员-->
-            <template v-else-if="true">
+            <template v-else-if="false">
                 <div class="pay-svip">
                     <div class="pay-svip-title">购买超级会员</div>
                     <div class="content">

+ 30 - 7
src/main/resources/templates/product/detail.html

@@ -61,21 +61,44 @@
                             <p>扫码添加采美微信客服咨询更快捷</p></div>
                     </div>
                     <div class="row price"><span class="l">采美价</span><i>:</i>
+                        <!--登录-->
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <em v-if="priceObj.priceFlag==1" v-text="'¥价格未公开'"></em>
                             <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity==4" v-text="'¥会员可见'"></em>
-                            <template
-                                    v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID)">
-                                <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1"
-                                    class="p">
+                            <template v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID)">
+                                <!--SVIP会员标签价格 有svip会员价 && 价格可见-->
+                                <template v-if="true">
                                     <del v-text="'¥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
-                                </em>
-                                <em v-else class="p" v-text="'¥'+parseFloat(priceObj.price).toFixed(2)"></em>
+                                    <div class="svip-tag">
+                                        <div class="svip-icon btr">SVIP</div>
+                                        <div class="svip-price">
+                                            <span>¥</span><span>9999999.00</span>
+                                        </div>
+                                    </div>
+                                </template>
+                                <template v-else>
+                                    <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1"
+                                        class="p">
+                                        <del v-text="'¥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
+                                    </em>
+                                    <em v-else class="p" v-text="'¥'+parseFloat(priceObj.price).toFixed(2)"></em>
+                                </template>
                             </template>
                             <em v-else>¥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
+                            <!--SVIP会员标签 有svip会员价 && 价格不可见-->
+                            <div class="svip-tag" v-if="true && priceObj.actStatus==1 && !((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID))">
+                                <div class="svip-icon">SVIP</div>
+                            </div>
+                        </template>
+                        <!--未登录-->
+                        <template v-else>
+                            <em>¥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
+                            <!--SVIP会员标签 有svip会员价-->
+                            <div class="svip-tag" v-if="true">
+                                <div class="svip-icon">SVIP</div>
+                            </div>
                         </template>
-                        <em v-else>¥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
                     </div>
                     <template
                             v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID))">

+ 57 - 13
src/main/resources/templates/product/instruelist.html

@@ -110,7 +110,7 @@
                             <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">-->
+                                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                     <template v-if="p.priceFlag==1">
                                         <div class="price_text_tag">
@@ -121,11 +121,22 @@
                                     <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"v-if="p.couponsLogo">优惠券</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>
+                                                <p class="couponTag"v-if="p.couponsLogo">优惠券</p>
+                                                <!--超级会员价格标签-->
+                                                <template v-if="p.actStatus==1 && true">
+                                                    <div class="svip-tag">
+                                                        <div class="svip-icon btr">SVIP</div>
+                                                        <div class="svip-price">
+                                                            <span>¥</span><span>9999999.00</span>
+                                                        </div>
+                                                    </div>
+                                                </template>
+                                                <template v-else>
+                                                    <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>
+                                                </template>
                                             </div>
                                             <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
                                                 ¥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
@@ -133,27 +144,60 @@
                                         </template>
                                         <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                              <div class="price_text_tag">
-<!--                                                <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                                <!--超级会员价格标签-->
+                                                <template v-if="p.actStatus==1 && true">
+                                                    <div class="svip-tag">
+                                                        <div class="svip-icon btr">SVIP</div>
+                                                        <div class="svip-price">
+                                                            <span>¥</span><span>9999999.00</span>
+                                                        </div>
+                                                    </div>
+                                                </template>
+                                                <template v-else>
+                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                </template>
                                             </div>
                                             <div class="main_price_unde">¥会员可见</div>
                                         </template>
                                         <template v-else>
                                          <div class="price_text_tag">
-<!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                            <!--超级会员价格标签-->
+                                            <template v-if="p.actStatus==1 && true">
+                                                <div class="svip-tag">
+                                                    <div class="svip-icon btr">SVIP</div>
+                                                    <div class="svip-price">
+                                                        <span>¥</span><span>9999999.00</span>
+                                                    </div>
+                                                </div>
+                                            </template>
+                                            <template v-else>
+                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            </template>
                                         </div>
                                         <div class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                         </template>
                                     </template>
-                                <!--</template>
+                                </template>
                                 <template v-else>
                                      <div class="price_text_tag ">
                                          <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                         <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                         <!--超级会员价格标签-->
+                                         <template v-if="p.actStatus==1 && true">
+                                             <div class="svip-tag">
+                                                 <div class="svip-icon btr">SVIP</div>
+                                                 <div class="svip-price">
+                                                     <span>¥</span><span>9999999.00</span>
+                                                 </div>
+                                             </div>
+                                         </template>
+                                         <template v-else>
+                                             <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                         </template>
                                       </div>
                                       <div class="price_grade "><span class="bold">¥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
-                                </template>-->
+                                </template>
                             </div>
                         </a>
                     </li>

+ 37 - 15
src/main/resources/templates/product/instrument.html

@@ -118,14 +118,25 @@
                                         <!-- 正常商品 -->
                                             <template v-if="pros.product.productCategory == 1">
                                                 <div class="price_text_tag">
-<!--                                                    <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</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)">
-                                                            <!--单品优惠:优惠价-->
-                                                            <span class="price_unit">:¥</span><span class="price_num">{{ pros.product.price | NumFormat }}</span>
-                                                        </template>
-                                                    </p>
+                                                    <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+                                                    <!--超级会员价格标签-->
+                                                    <template v-if="pros.product.actStatus==1 && true">
+                                                        <div class="svip-tag">
+                                                            <div class="svip-icon btr">SVIP</div>
+                                                            <div class="svip-price">
+                                                                <span>¥</span><span>9999999.00</span>
+                                                            </div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
+                                                        <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)">
+                                                                <!--单品优惠:优惠价-->
+                                                                <span class="price_unit">:¥</span><span class="price_num">{{ pros.product.price | NumFormat }}</span>
+                                                            </template>
+                                                        </p>
+                                                    </template>
                                                 </div>
                                                 <div class="main_price_login">
                                                     <!--0公开价格 1不公开价格 2仅对会员机构公开-->
@@ -244,13 +255,24 @@
                                                         <th:block th:if="*{productCategory}==1">
                                                             <div class="price_text_tag">
                                                                 <p class="couponTag" th:if="*{couponsLogo}">优惠券</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">
-                                                                        <!--单品优惠:优惠价-->
-                                                                        <span class="price_unit" style="display:none;">:¥</span><span class="price_num"></span>
-                                                                    </th:block>
-                                                                </p>
+                                                                <!--超级会员价格标签-->
+                                                                <template v-if="pros.product.actStatus==1 && true">
+                                                                    <div class="svip-tag">
+                                                                        <div class="svip-icon btr">SVIP</div>
+                                                                        <div class="svip-price">
+                                                                            <span>¥</span><span>9999999.00</span>
+                                                                        </div>
+                                                                    </div>
+                                                                </template>
+                                                                <template v-else>
+                                                                    <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">
+                                                                            <!--单品优惠:优惠价-->
+                                                                            <span class="price_unit" style="display:none;">:¥</span><span class="price_num"></span>
+                                                                        </th:block>
+                                                                    </p>
+                                                                </template>
                                                             </div>
                                                             <div class="main_price_none">
                                                                 <em class="price_grade"><span class="bold">¥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>

+ 8 - 5
src/main/resources/templates/product/list.html

@@ -116,14 +116,14 @@
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <template v-if="p.priceFlag==1">
-                                <div class="price_text_tag">
+                                <div class="price_text_tag clear">
                                     <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)">
-                                    <div class="price_text_tag">
+                                    <div class="price_text_tag clear">
                                         <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
                                         <!--超级会员价格标签-->
                                         <template v-if="p.actStatus==1 && true">
@@ -146,12 +146,15 @@
                                     </div>
                                 </template>
                                 <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
-                                    <div class="price_text_tag">
+                                    <div class="price_text_tag clear">
                                         <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
                                         <!--超级会员价格标签-->
                                         <template v-if="p.actStatus==1 && true">
                                             <div class="svip-tag">
                                                 <div class="svip-icon">SVIP</div>
+                                                <div class="svip-price">
+                                                    <span>¥</span><span>9999999.99</span>
+                                                </div>
                                             </div>
                                         </template>
                                         <template v-else>
@@ -161,7 +164,7 @@
                                     <div class="main_price_unde">¥会员可见</div>
                                 </template>
                                 <template v-else>
-                                    <div class="price_text_tag">
+                                    <div class="price_text_tag clear">
                                         <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
                                         <!--超级会员价格标签-->
                                         <template v-if="p.actStatus==1 && true">
@@ -178,7 +181,7 @@
                             </template>
                         </template>
                         <template v-else>
-                            <div class="price_text_tag ">
+                            <div class="price_text_tag clear ">
                                 <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
                                 <!--超级会员价格标签-->
                                 <template v-if="p.actStatus==1 && true">

+ 50 - 37
src/main/resources/templates/shopping/cart.html

@@ -95,53 +95,66 @@
                     </div>
                     <div class="c4">
                         <div class="price">
-                            <template v-if="cart.actStatus==1 && cart.promotions && cart.promotions.type==1 && cart.promotions.mode==1">
+                            <template v-if="true || (cart.actStatus==1 && cart.promotions && cart.promotions.type==1 && cart.promotions.mode==1)">
                                 <del v-text="'¥'+toFloat(cart.originalPrice)"></del>
                             </template>
                             <template v-else>
                                 <em> {{ cart.price | NumFormat }} </em>
                             </template>
                             <!-- 促销活动 -->
-                            <div v-if="cart.actStatus==1 && cart.promotions" class="priceTag">
-                                <i v-if="cart.promotions.type==1 && cart.promotions.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="cart.promotions.name+':¥'+toFloat(cart.promotions.touchPrice)"></i>
-                                <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="cart.promotions?cart.promotions.name:''"></i>
-                                <div class="promotion mFixed">
-                                    <div>
-                                        <p class="t">
-                                            <em v-if="cart.promotions.type==1 && cart.promotions.mode==1">{{cart.promotions.name+':¥'+toFloat(cart.promotions.touchPrice)}}</em>
-                                            <em v-if="cart.promotions.mode==2">{{cart.promotions.name+',满 ¥'+toFloat(cart.promotions.touchPrice)+' 减 ¥'+toFloat(cart.promotions.reducedPrice)}}</em>
-                                            <em v-if="cart.promotions.mode==3">{{cart.promotions.name+',满 ¥'+toFloat(cart.promotions.touchPrice)+' 赠送商品'}}</em>
-                                        </p>
-                                        <p>促销时间:<em v-if="cart.promotions.status==1">不限时</em><em v-else>{{cart.promotions.beginTime.substr(0,10)+' ~ '+cart.promotions.endTime.substr(0,10)}}</em></p>
-                                        <p v-if="cart.promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+cart.promotions.id">更多凑单商品>>></a></p>
-                                        <template v-if="cart.promotions.mode==3">
-                                            <p>赠品:</p>
-                                            <p>
-                                                <span v-for="g in cart.promotions.giftList" class="p">
-                                                    <img :src="g.image">
-                                                    <span v-text="g.name"></span>
-                                                    <span v-text="'× '+g.number"></span>
-                                                </span>
+                            <template v-if="true">
+                                <div class="priceTag">
+                                    <!--超级会员价格标签-->
+                                    <div class="svip-tag">
+                                        <div class="svip-icon btr">SVIP</div>
+                                        <div class="svip-price">
+                                            <span>¥</span><span>9999999.00</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </template>
+                            <template v-else>
+                                <div v-if="cart.actStatus==1 && cart.promotions" class="priceTag">
+                                    <i v-if="cart.promotions.type==1 && cart.promotions.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="cart.promotions.name+':¥'+toFloat(cart.promotions.touchPrice)"></i>
+                                    <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="cart.promotions?cart.promotions.name:''"></i>
+                                    <div class="promotion mFixed">
+                                        <div>
+                                            <p class="t">
+                                                <em v-if="cart.promotions.type==1 && cart.promotions.mode==1">{{cart.promotions.name+':¥'+toFloat(cart.promotions.touchPrice)}}</em>
+                                                <em v-if="cart.promotions.mode==2">{{cart.promotions.name+',满 ¥'+toFloat(cart.promotions.touchPrice)+' 减 ¥'+toFloat(cart.promotions.reducedPrice)}}</em>
+                                                <em v-if="cart.promotions.mode==3">{{cart.promotions.name+',满 ¥'+toFloat(cart.promotions.touchPrice)+' 赠送商品'}}</em>
                                             </p>
-                                        </template>
-                                        <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                            <p>促销时间:<em v-if="cart.promotions.status==1">不限时</em><em v-else>{{cart.promotions.beginTime.substr(0,10)+' ~ '+cart.promotions.endTime.substr(0,10)}}</em></p>
+                                            <p v-if="cart.promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+cart.promotions.id">更多凑单商品>>></a></p>
+                                            <template v-if="cart.promotions.mode==3">
+                                                <p>赠品:</p>
+                                                <p>
+                                                    <span v-for="g in cart.promotions.giftList" class="p">
+                                                        <img :src="g.image">
+                                                        <span v-text="g.name"></span>
+                                                        <span v-text="'× '+g.number"></span>
+                                                    </span>
+                                                </p>
+                                            </template>
+                                            <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <!-- 阶梯价 -->
-                            <div v-else-if="cart.ladderFlag" class="priceTag">
-                                <i class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
-                                <div class="ladder mFixed">
-                                    <span>
-                                        <em class="t"><i>价格</i><i>起订量</i></em>
-                                        <em v-for="l in cart.ladderPrices">
-                                            <i class="p">¥{{toFloat(l.buyPrice)}}</i>
-                                            <i>{{l.numRange}}</i>
-                                        </em>
-                                        <em @click="hideThisLadder($event)" class="close">了解</em>
-                                    </span>
+                                <!-- 阶梯价 -->
+                                <div v-else-if="cart.ladderFlag" class="priceTag">
+                                    <i class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
+                                    <div class="ladder mFixed">
+                                        <span>
+                                            <em class="t"><i>价格</i><i>起订量</i></em>
+                                            <em v-for="l in cart.ladderPrices">
+                                                <i class="p">¥{{toFloat(l.buyPrice)}}</i>
+                                                <i>{{l.numRange}}</i>
+                                            </em>
+                                            <em @click="hideThisLadder($event)" class="close">了解</em>
+                                        </span>
+                                    </div>
                                 </div>
-                            </div>
+                            </template>
                         </div>
                     </div>
                     <div class="c5">

+ 54 - 40
src/main/resources/templates/shopping/confirm.html

@@ -146,53 +146,67 @@
                     </div>
                     <div class="c4">
                         <div class="price">
-                            <template v-if="cart.actStatus==1 && cart.promotions && cart.promotions.type==1 && cart.promotions.mode==1">
+                            <template v-if="true">
                                 <del v-text="'¥'+toFloat(cart.originalPrice)"></del>
+                                <div class="priceTag">
+                                    <!--超级会员价格标签-->
+                                    <div class="svip-tag">
+                                        <div class="svip-icon btr">SVIP</div>
+                                        <div class="svip-price">
+                                            <span>¥</span><span>9999999.00</span>
+                                        </div>
+                                    </div>
+                                </div>
                             </template>
                             <template v-else>
-                                <em v-text="'¥'+toFloat(cart.price)"></em>
-                            </template>
-                            <!-- 促销活动 -->
-                            <div v-if="cart.actStatus==1 && cart.promotions" class="priceTag">
-                                <i v-if="cart.promotions.type==1 && cart.promotions.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="cart.promotions.name+':¥'+toFloat(cart.promotions.touchPrice)"></i>
-                                <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="cart.promotions?cart.promotions.name:''"></i>
-                                <div class="promotion mFixed">
-                                    <div>
-                                        <p class="t">
-                                            <em v-if="cart.promotions.type==1 && cart.promotions.mode==1">{{cart.promotions.name+':¥'+toFloat(cart.promotions.touchPrice)}}</em>
-                                            <em v-if="cart.promotions.mode==2">{{cart.promotions.name+',满 ¥'+toFloat(cart.promotions.touchPrice)+' 减 ¥'+toFloat(cart.promotions.reducedPrice)}}</em>
-                                            <em v-if="cart.promotions.mode==3">{{cart.promotions.name+',满 ¥'+toFloat(cart.promotions.touchPrice)+' 赠送商品'}}</em>
-                                        </p>
-                                        <p>促销时间:<em v-if="cart.promotions.status==1">不限时</em><em v-else>{{cart.promotions.beginTime.substr(0,10)+' ~ '+cart.promotions.endTime.substr(0,10)}}</em></p>
-                                        <p v-if="cart.promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+cart.promotions.id">更多凑单商品>>></a></p>
-                                        <template v-if="cart.promotions.mode==3">
-                                            <p>赠品:</p>
-                                            <p>
-                                                <span v-for="g in cart.promotions.giftList" class="p">
-                                                    <img :src="g.image">
-                                                    <span v-text="g.name"></span>
-                                                    <span v-text="'× '+g.number"></span>
-                                                </span>
+                                <template v-if="cart.actStatus==1 && cart.promotions && cart.promotions.type==1 && cart.promotions.mode==1">
+                                    <del v-text="'¥'+toFloat(cart.originalPrice)"></del>
+                                </template>
+                                <template v-else>
+                                    <em v-text="'¥'+toFloat(cart.price)"></em>
+                                </template>
+                                <!-- 促销活动 -->
+                                <div v-if="cart.actStatus==1 && cart.promotions" class="priceTag">
+                                    <i v-if="cart.promotions.type==1 && cart.promotions.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="cart.promotions.name+':¥'+toFloat(cart.promotions.touchPrice)"></i>
+                                    <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="cart.promotions?cart.promotions.name:''"></i>
+                                    <div class="promotion mFixed">
+                                        <div>
+                                            <p class="t">
+                                                <em v-if="cart.promotions.type==1 && cart.promotions.mode==1">{{cart.promotions.name+':¥'+toFloat(cart.promotions.touchPrice)}}</em>
+                                                <em v-if="cart.promotions.mode==2">{{cart.promotions.name+',满 ¥'+toFloat(cart.promotions.touchPrice)+' 减 ¥'+toFloat(cart.promotions.reducedPrice)}}</em>
+                                                <em v-if="cart.promotions.mode==3">{{cart.promotions.name+',满 ¥'+toFloat(cart.promotions.touchPrice)+' 赠送商品'}}</em>
                                             </p>
-                                        </template>
-                                        <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                            <p>促销时间:<em v-if="cart.promotions.status==1">不限时</em><em v-else>{{cart.promotions.beginTime.substr(0,10)+' ~ '+cart.promotions.endTime.substr(0,10)}}</em></p>
+                                            <p v-if="cart.promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+cart.promotions.id">更多凑单商品>>></a></p>
+                                            <template v-if="cart.promotions.mode==3">
+                                                <p>赠品:</p>
+                                                <p>
+                                                    <span v-for="g in cart.promotions.giftList" class="p">
+                                                        <img :src="g.image">
+                                                        <span v-text="g.name"></span>
+                                                        <span v-text="'× '+g.number"></span>
+                                                    </span>
+                                                </p>
+                                            </template>
+                                            <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <!-- 阶梯价 -->
-                            <div v-else-if="cart.ladderFlag" class="priceTag">
-                                <i class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
-                                <div class="ladder mFixed">
-                                    <span>
-                                        <em class="t"><i>价格</i><i>起订量</i></em>
-                                        <em v-for="l in cart.ladderPrices">
-                                            <i class="p">¥{{toFloat(l.buyPrice)}}</i>
-                                            <i>{{l.numRange}}</i>
-                                        </em>
-                                        <em @click="hideThisLadder($event)" class="close">了解</em>
-                                    </span>
+                                <!-- 阶梯价 -->
+                                <div v-else-if="cart.ladderFlag" class="priceTag">
+                                    <i class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
+                                    <div class="ladder mFixed">
+                                        <span>
+                                            <em class="t"><i>价格</i><i>起订量</i></em>
+                                            <em v-for="l in cart.ladderPrices">
+                                                <i class="p">¥{{toFloat(l.buyPrice)}}</i>
+                                                <i>{{l.numRange}}</i>
+                                            </em>
+                                            <em @click="hideThisLadder($event)" class="close">了解</em>
+                                        </span>
+                                    </div>
                                 </div>
-                            </div>
+                            </template>
                         </div>
                     </div>
                     <div class="c5">{{cart.number}}</div>

+ 19 - 6
src/main/resources/templates/user-center/order/detail.html

@@ -107,12 +107,25 @@
                                             <div class="text">
                                                 <p class="tit">{{pros.name}}</p>
                                                 <div class="info">
-                                                    <p v-if="pros.productCategory != 2">规格:<span class="none">{{pros.productUnit ? pros.productUnit : ''}}</span> </p>
-                                                    <p>数量:<span class="none">{{pros.num}}</span> </p>
-                                                    <p>单价:<span class="none">¥{{pros.price | NumFormat}}</span></p>
-                                                    <p>税率:<span class="none">{{pros.taxRate}}%</span></p>
-                                                    <p>折扣:<span class="none">{{pros.discount == null ? '0' : pros.discount}}%</span></p>
-                                                    <p>折后单价:<span class="none">¥{{pros.discountPrice | NumFormat}}</span></p>
+                                                    <p class="col" v-if="pros.productCategory != 2">规格:<span class="none">{{pros.productUnit ? pros.productUnit : ''}}</span> </p>
+                                                    <p class="col">数量:<span class="none">{{pros.num}}</span> </p>
+                                                    <div class="col">
+                                                        <template v-if="true">
+                                                            <span>单价: </span>
+                                                            <span class="none"><del>¥{{pros.price | NumFormat}}</del></span>
+                                                            <!--超级会员价格标签-->
+                                                            <div class="svip-tag">
+                                                                <div class="svip-icon btr">SVIP</div>
+                                                                <div class="svip-price">
+                                                                    <span>¥</span><span>9999999.00</span>
+                                                                </div>
+                                                            </div>
+                                                        </template>
+                                                        <p v-else>单价: <span class="none">¥{{pros.price | NumFormat}}</span></p>
+                                                    </div>
+                                                    <p class="col">税率:<span class="none">{{pros.taxRate}}%</span></p>
+                                                    <p class="col">折扣:<span class="none">{{pros.discount == null ? '0' : pros.discount}}%</span></p>
+                                                    <p class="col">折后单价:<span class="none">¥{{pros.discountPrice | NumFormat}}</span></p>
                                                     <!-- 促销活动 -->
                                                     <div v-if="pros.productPromotion && pros.productPromotion.type !=3" class="priceTag">
                                                         <i v-if="pros.productPromotion.type==1 && pros.productPromotion.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="pros.productPromotion.name+':¥'+toFloat(pros.productPromotion.touchPrice)"></i>