Merge branch 'hotfix/brand-error-channel' into 'master'

changed: 商品列表页、猜你喜欢价格颜色修改



See merge request !43

@@ -49,7 +49,7 @@ module.exports = {
             color: req.query.color,
             color: req.query.color,
             price: req.query.price,
             price: req.query.price,
             size: req.query.size,
             size: req.query.size,
-            pd: req.query.pd,
+            pd: req.query.p_d,
             tagsFilter: req.query.tagsFilter
             tagsFilter: req.query.tagsFilter
         }).then(result => {
         }).then(result => {
             res.json(result);
             res.json(result);

@@ -148,7 +148,7 @@
         }
         }
 
 
         &.sale-price {
         &.sale-price {
-            color: #d0021b;
+            color: #000;
         }
         }
     }
     }
 
 

@@ -10,7 +10,8 @@
                     </a>
                     </a>
                 </a>
                 </a>
                 <div class="price">
                 <div class="price">
-                    <span class="discount" v-if="item.sales_price">¥{{item.sales_price}}</span>
+                    <span class="sale" :class="{'discount': item.sales_price !== item.market_price}" v-if="item.sales_price">¥{{item
+                        .sales_price}}</span>
                     <span class="market" :class="{'line-through': item.sales_price}" v-if="item.sales_price !== item.market_price">¥{{item.market_price}}</span>
                     <span class="market" :class="{'line-through': item.sales_price}" v-if="item.sales_price !== item.market_price">¥{{item.market_price}}</span>
                 </div>
                 </div>
             </div>
             </div>
@@ -70,13 +71,17 @@ export default {
                 text-overflow: ellipsis;
                 text-overflow: ellipsis;
             }
             }
 
 
-            .price .discount {
+            .price .sale {
                 margin-top: 10px;
                 margin-top: 10px;
-                color: #f00;
+                color: #b0b0b0;
                 font-size: 22px;
                 font-size: 22px;
                 display: inline-block;
                 display: inline-block;
                 margin-left: 7px;
                 margin-left: 7px;
                 vertical-align: bottom;
                 vertical-align: bottom;
+
+                &.discount {
+                    color: #000;
+                }
             }
             }
 
 
             .price .market {
             .price .market {