商品模块

src/main/resources/static/css/activity/activityTopic.css

@@ -105,6 +105,7 @@ a:hover{color:#333}
 .product-template .floor-item .floor-item-text .pro-price{bottom:0;line-height:22px}
 .product-template .floor-item .floor-item-text .pro-price span{vertical-align:middle}
 .product-template .floor-item .floor-item-text .pro-price .price-tag{height:22px;margin:2px 0 ;}
+.product-template .floor-item .floor-item-text .pro-price .none{color: #999999;text-decoration: line-through;}
 .product-template .floor-item .floor-item-text .pro-price .price-tag .tag{display:inline-block;height:20px;line-height:20px;border:1px solid #ffe6dc;border-radius:2px;font-size:12px;color:#e15616;cursor:pointer;background:#fff;padding:0 4px;position:relative;font-style:normal}
 .product-template.floor-grid-1 .floor-main{height:604.42857px;overflow:hidden}
 .product-template.floor-grid-1 .floor-item-ad.ad1{width:100%;height:117.14286px;margin-right:0}

src/main/resources/templates/activity/activityTopic.html

@@ -407,7 +407,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -524,7 +524,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -652,7 +652,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -753,7 +753,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -871,7 +871,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -983,7 +983,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -1095,7 +1095,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -1202,7 +1202,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -1310,7 +1310,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -1411,7 +1411,7 @@
                               <div class="price-tag">
                                 <span class="tag" v-if="pros.product.actStatus==1">
                                   {{pros.product.promotions.name}}
-                                  <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
+                                  <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
@@ -1523,7 +1523,7 @@
                                     <div class="price-tag">
                                       <span class="tag" v-if="pros.product.actStatus==1">
                                         {{pros.product.promotions.name}}
-                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price |
+                                        <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price |
                                           NumFormat}}</span>
                                       </span>
                                     </div>
@@ -1629,7 +1629,7 @@
                                     <div class="price-tag">
                                       <span class="tag" v-if="pros.product.actStatus==1">
                                         {{pros.product.promotions.name}}
-                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price |
+                                        <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price |
                                           NumFormat}}</span>
                                       </span>
                                     </div>