zhengjinyi пре 3 година
родитељ
комит
f40955f21f

+ 20 - 75
src/main/resources/static/css/supplier/index.css

@@ -18,7 +18,7 @@ li{list-style:none}
     #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{width:1200px;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}
@@ -26,7 +26,7 @@ li{list-style:none}
     .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{width:1200px;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}
@@ -42,84 +42,29 @@ li{list-style:none}
     .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 .productBox{box-sizing:border-box;width:100%;}
     .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;
-    }
+    .productList .productItem {width: 184px;height: 268px;float: left;background: #fff;position: relative;margin: 0 16px 16px 0;overflow: hidden;float: left;}
+    .productList .productItem:nth-child(6n){margin-right: 0;}
+    .productList .productItem a{width: 100%;height: 100%;display: block;box-sizing: border-box;}
+    .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;}

+ 60 - 60
src/main/resources/templates/activity/activityTopic.html

@@ -396,7 +396,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -406,7 +406,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -422,7 +422,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -430,7 +430,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -452,7 +452,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price">
@@ -518,7 +518,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -528,7 +528,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -544,7 +544,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -552,7 +552,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -574,7 +574,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price  ">
@@ -651,7 +651,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -661,7 +661,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -677,7 +677,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -685,7 +685,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -707,7 +707,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price  ">
@@ -757,7 +757,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -767,7 +767,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -783,7 +783,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -791,7 +791,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -813,7 +813,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price  ">
@@ -880,7 +880,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -890,7 +890,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -906,7 +906,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -914,7 +914,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -936,7 +936,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price  ">
@@ -997,7 +997,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -1007,7 +1007,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -1023,7 +1023,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -1031,7 +1031,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -1053,7 +1053,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price  ">
@@ -1114,7 +1114,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -1124,7 +1124,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -1140,7 +1140,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -1148,7 +1148,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -1170,7 +1170,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price  ">
@@ -1226,7 +1226,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -1236,7 +1236,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -1252,7 +1252,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -1260,7 +1260,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -1282,7 +1282,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price  ">
@@ -1339,7 +1339,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -1349,7 +1349,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -1365,7 +1365,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -1373,7 +1373,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -1395,7 +1395,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price  ">
@@ -1445,7 +1445,7 @@
                           <!-- 样式1 价格未公开-->
                           <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
-                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                              <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
                             <div class="price">¥价格未公开</div>
@@ -1455,7 +1455,7 @@
                             <template
                               v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
                                   <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price | NumFormat}}</span>
@@ -1471,7 +1471,7 @@
                             <!-- 样式3 -->
                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥会员可见</span></div>
@@ -1479,7 +1479,7 @@
                             <!-- 样式4 -->
                             <template v-else>
                               <div class="price-tag" v-if="pros.product.actStatus==1">
-                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>¥</span>
@@ -1501,7 +1501,7 @@
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
                           <div class="price-tag" v-if="params.userId>0">
-                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                            <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
                           <div class="price  ">
@@ -1561,7 +1561,7 @@
                                 <!-- 样式1 价格未公开-->
                                 <template v-if="pros.product.priceFlag==1">
                                   <div class="price-tag">
-                                    <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                    <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                     <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                   </div>
                                   <div class="price">¥价格未公开</div>
@@ -1571,7 +1571,7 @@
                                   <template
                                     v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                     <div class="price-tag">
-                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                       <span class="tag" v-if="pros.product.actStatus==1">
                                         {{pros.product.promotions.name}}
                                         <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price |
@@ -1588,7 +1588,7 @@
                                   <!-- 样式3 -->
                                   <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                     <div class="price-tag" v-if="pros.product.actStatus==1">
-                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                       <span class="tag">{{pros.product.promotions.name}}</span>
                                     </div>
                                     <div class="price"><span>¥会员可见</span></div>
@@ -1596,7 +1596,7 @@
                                   <!-- 样式4 -->
                                   <template v-else>
                                     <div class="price-tag" v-if="pros.product.actStatus==1">
-                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                       <span class="tag">{{pros.product.promotions.name}}</span>
                                     </div>
                                     <div class="price"><span>¥</span>
@@ -1619,7 +1619,7 @@
                               <!-- 样式6 -->
                               <template v-if="pros.product.productCategory == 1">
                                 <div class="price-tag" v-if="params.userId>0">
-                                  <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                  <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                   <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                 </div>
                                 <div class="price  ">
@@ -1670,7 +1670,7 @@
                                 <!-- 样式1 价格未公开-->
                                 <template v-if="pros.product.priceFlag==1">
                                   <div class="price-tag">
-                                    <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                    <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                     <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                   </div>
                                   <div class="price">¥价格未公开</div>
@@ -1680,7 +1680,7 @@
                                   <template
                                     v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                     <div class="price-tag">
-                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                       <span class="tag" v-if="pros.product.actStatus==1">
                                         {{pros.product.promotions.name}}
                                         <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:¥{{pros.product.price |
@@ -1697,7 +1697,7 @@
                                   <!-- 样式3 -->
                                   <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                     <div class="price-tag" v-if="pros.product.actStatus==1">
-                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                       <span class="tag">{{pros.product.promotions.name}}</span>
                                     </div>
                                     <div class="price"><span>¥会员可见</span></div>
@@ -1705,7 +1705,7 @@
                                   <!-- 样式4 -->
                                   <template v-else>
                                     <div class="price-tag" v-if="pros.product.actStatus==1">
-                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                      <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                       <span class="tag">{{pros.product.promotions.name}}</span>
                                     </div>
                                     <div class="price"><span>¥</span>
@@ -1728,7 +1728,7 @@
                               <!-- 样式6 -->
                               <template v-if="pros.product.productCategory == 1">
                                 <div class="price-tag" v-if="params.userId>0">
-                                  <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                  <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
                                   <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                 </div>
                                 <div class="price  ">

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

@@ -165,7 +165,7 @@
                                                 <!-- 正常商品 -->
                                                 <template v-if="pros.product.productCategory == 1">
                                                     <div class="price_text_tag">
-                                                        <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                                        <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)">

+ 5 - 5
src/main/resources/templates/product/beautytopic.html

@@ -101,7 +101,7 @@
                                                     <!--价格未公开-->
                                                     <div class="main_price_text">
                                                         <div class="price_text_tag">
-															<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>
+<!--															<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>-->
                                                             <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_unde">¥价格未公开</div>
@@ -112,7 +112,7 @@
                                                     <template v-if="(pros.price1TextFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.shopID==GLOBAL_SHOP_ID)">
                                                         <div class="main_price_text" v-if="pros.productCategory == 1">
                                                             <div class="price_text_tag">
-																<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>
+<!--																<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>-->
                                                                 <p class="listTag" v-if="pros.actStatus==1">
                                                                     {{pros.promotions.name}}
                                                                     <span v-if="pros.priceFlag != 1">:¥{{pros.retailPrice | NumFormat}}</span>
@@ -127,7 +127,7 @@
                                                     <template v-else-if="pros.price1TextFlag==2 && pros.userIdentity==4">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
-																<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>
+<!--																<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>-->
                                                                 <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
                                                             </div>
                                                             <div class="main_price_unde">¥会员可见</div>
@@ -135,7 +135,7 @@
                                                     </template>
                                                     <template v-else>
                                                         <div class="price_text_tag">
-															<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>
+<!--															<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>-->
                                                             <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
@@ -159,7 +159,7 @@
                                         <template v-else>
                                             <template v-if="pros.productCategory == 1">
                                                 <div class="price_text_tag ">
-													<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>
+<!--													<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>-->
                                                     <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">

+ 4 - 4
src/main/resources/templates/product/instruelist.html

@@ -95,7 +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"v-if="p.couponsLogo">优惠券</p>
+<!--                                                <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>
@@ -107,14 +107,14 @@
                                         </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="couponTag" v-if="p.couponsLogo">优惠券</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" v-if="p.couponsLogo">优惠券</p>
+<!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</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>
@@ -123,7 +123,7 @@
                                 </template>
                                 <template v-else>
                                      <div class="price_text_tag ">
-                                         <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+<!--                                         <p class="couponTag" v-if="p.couponsLogo">优惠券</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>

+ 1 - 1
src/main/resources/templates/product/instrument.html

@@ -118,7 +118,7 @@
                                         <!-- 正常商品 -->
                                             <template v-if="pros.product.productCategory == 1">
                                                 <div class="price_text_tag">
-                                                    <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
+<!--                                                    <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)">

+ 4 - 4
src/main/resources/templates/product/list.html

@@ -124,7 +124,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" v-if="p.couponsLogo">优惠券</p>
+<!--                                        <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>
@@ -136,14 +136,14 @@
                                 </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="couponTag" v-if="p.couponsLogo">优惠券</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" v-if="p.couponsLogo">优惠券</p>
+<!--                                        <p class="couponTag" v-if="p.couponsLogo">优惠券</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>
@@ -152,7 +152,7 @@
                         </template>
                         <template v-else>
                             <div class="price_text_tag ">
-                                <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+<!--                                <p class="couponTag" v-if="p.couponsLogo">优惠券</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>

+ 4 - 4
src/main/resources/templates/product/product-coupon.html

@@ -44,7 +44,7 @@
                                 <template v-else>
                                     <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || p.userIdentity==3">
                                         <div class="price_text_tag">
-                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+<!--                                            <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>
@@ -56,14 +56,14 @@
                                     </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="couponTag" v-if="p.couponsLogo">优惠券</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" v-if="p.couponsLogo">优惠券</p>
+<!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</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>
@@ -72,7 +72,7 @@
                             </template>
                             <template v-else>
                                 <div class="price_text_tag ">
-                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+<!--                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</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>

+ 8 - 8
src/main/resources/templates/supplier/index.html

@@ -72,7 +72,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" v-if="p.couponsLogo">优惠券</p>
+<!--                                                    <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>
@@ -84,14 +84,14 @@
                                             </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="couponTag" v-if="p.couponsLogo">优惠券</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" v-if="p.couponsLogo">优惠券</p>
+<!--                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</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>
@@ -100,7 +100,7 @@
                                     </template>
                                     <template v-else>
                                         <div class="price_text_tag ">
-                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+<!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</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>
@@ -131,7 +131,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" v-if="p.couponsLogo">优惠券</p>
+<!--                                                    <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>
@@ -143,14 +143,14 @@
                                             </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="couponTag" v-if="p.couponsLogo">优惠券</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" v-if="p.couponsLogo">优惠券</p>
+<!--                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</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>
@@ -159,7 +159,7 @@
                                     </template>
                                     <template v-else>
                                         <div class="price_text_tag ">
-                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+<!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</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>