Merge branch 'feature/promotionV2' into 'release/5.8'

Feature/promotion v2



See merge request !636

@@ -401,6 +401,9 @@ $(
         }
         }
 
 
         promotionObj.init();
         promotionObj.init();
+        setTimeout(function() {
+            promotionObj.moreGoods();
+        }, 100);
     }
     }
 );
 );
 
 
@@ -431,7 +434,7 @@ promotionObj = {
     },
     },
     moreGoods: function() {
     moreGoods: function() {
         let goodsHbs = require('activity/promotion/goods.hbs');
         let goodsHbs = require('activity/promotion/goods.hbs');
-        let page = this.page;
+        let page = this.page || 1;
         let that = this;
         let that = this;
 
 
         this.loading = true;
         this.loading = true;

@@ -139,7 +139,7 @@ exports.processProductList = (list, options) => {
         // }
         // }
 
 
         // 市场价和售价一样，则不显示市场价
         // 市场价和售价一样，则不显示市场价
-        if (product.market_price === product.sales_price) {
+        if (!product.market_price || product.market_price === product.sales_price) {
             product.market_price = false;
             product.market_price = false;
         }
         }