Authored by 周少峰

Merge branch 'hotfix/cart'

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