Merge branch 'feature/cart' into 'release/5.4.1'

购物车促销全角人民币符号



See merge request !319

@@ -28,7 +28,7 @@ const formatPromotionTitle = (promo) => {
     let match = regPromoTitle.exec(promo.promotion_title);
     let match = regPromoTitle.exec(promo.promotion_title);
     let promotionTitle = match !== null && match.length > 1 ? match[1] : promo.promotion_title;
     let promotionTitle = match !== null && match.length > 1 ? match[1] : promo.promotion_title;
 
 
-    promotionTitle = promotionTitle.replace('￥', '¥');
+    promotionTitle = promotionTitle.replace(/￥/g, '¥');
     return `${title}【${promotionTitle}】`;
     return `${title}【${promotionTitle}】`;
 };
 };
 const formatPromotionOpt = (promo) => {
 const formatPromotionOpt = (promo) => {
@@ -300,7 +300,7 @@ const procCartData = (data, isAdvanceCart) => {
         result.giftHasStorage = _.some(result.freebie, freebie => freebie.status === 10);
         result.giftHasStorage = _.some(result.freebie, freebie => freebie.status === 10);
 
 
         // 加价购
         // 加价购
-        result.advanceBuy = data.g_price_gift_list.filter(advanceBuy => advanceBuy.status !== 30 && advanceBuy.status !== 0);
+        result.advanceBuy = data.g_price_gift_list.filter(advanceBuy => advanceBuy.status !== 30 && advanceBuy.status !== 0);// eslint-disable-line
         result.selectAdvanceBuy = result.advanceBuy.filter(advanceBuy => advanceBuy.status === 10);
         result.selectAdvanceBuy = result.advanceBuy.filter(advanceBuy => advanceBuy.status === 10);
         result.advanceHasStorage = _.some(result.advanceBuy, advanceBuy => advanceBuy.status === 10);
         result.advanceHasStorage = _.some(result.advanceBuy, advanceBuy => advanceBuy.status === 10);
     }
     }
@@ -341,7 +341,7 @@ const procCartData = (data, isAdvanceCart) => {
 
 
     result.formulaPrice = data.shopping_cart_data.promotion_formula;
     result.formulaPrice = data.shopping_cart_data.promotion_formula;
     result.count = data.shopping_cart_data.selected_goods_count;
     result.count = data.shopping_cart_data.selected_goods_count;
-    result.isAllSelected = (goodCount <= data.shopping_cart_data.selected_goods_count) && (data.shopping_cart_data.selected_goods_count > 0);
+    result.isAllSelected = (goodCount <= data.shopping_cart_data.selected_goods_count) && (data.shopping_cart_data.selected_goods_count > 0);// eslint-disable-line
     result.sumPrice = transPrice(data.shopping_cart_data.last_order_amount);
     result.sumPrice = transPrice(data.shopping_cart_data.last_order_amount);
     result.hasNoSaleGoods = result.notValidGoods.length || result.offShelveGoods.length;
     result.hasNoSaleGoods = result.notValidGoods.length || result.offShelveGoods.length;