Authored by 周少峰

global block

@@ -619,8 +619,10 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => { @@ -619,8 +619,10 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
619 } 619 }
620 620
621 // promotionInfos, gifts, priceGifts 放一起展示 621 // promotionInfos, gifts, priceGifts 放一起展示
622 - let hasGifts = _.get(result, 'ordinaryCart.gifts') && _.get(result, 'ordinaryCart.gifts').length;  
623 - let hasPrices = _.get(result, 'ordinaryCart.priceGifts') && _.get(result, 'ordinaryCart.priceGifts').length; 622 + let hasGifts = _.get(result, 'ordinaryCart.giftsPromotionInfos') &&
  623 + _.get(result, 'ordinaryCart.giftsPromotionInfos').length;
  624 + let hasPrices = _.get(result, 'ordinaryCart.priceGiftsPromotionInfos') &&
  625 + _.get(result, 'ordinaryCart.priceGiftsPromotionInfos').length;
624 let hasPromo = _.get(result, 'ordinaryCart.promotionInfos') && _.get(result, 'ordinaryCart.promotionInfos').length; 626 let hasPromo = _.get(result, 'ordinaryCart.promotionInfos') && _.get(result, 'ordinaryCart.promotionInfos').length;
625 let orderAmount = (parseFloat(_.get(advStat, 'orderAmount', 0)) + 627 let orderAmount = (parseFloat(_.get(advStat, 'orderAmount', 0)) +
626 parseFloat(_.get(ordStat, 'orderAmount', 0))).toFixed(2); 628 parseFloat(_.get(ordStat, 'orderAmount', 0))).toFixed(2);