Authored by 陈峰

修改全场赠品加价购bug

... ... @@ -63,7 +63,7 @@ const formatAdvanceGoods = (advanceGood, isGift) => {
promotionId: advanceGood.promotion_id,
promotionTitle: advanceGood.promotion_title,
status: advanceGood.status,
goods: (_.get(advanceGood, 'gift_goods_List') || _.get(advanceGood, 'goods_list') || []).map(good => {
goods: _.get(advanceGood, 'goods_list').map(good => {
return {
id: good.product_skn,
name: good.product_name,
... ... @@ -300,7 +300,7 @@ const procCartData = (data, onlyGift = false, onlyAdvanceBuy = false, isAdvanceC
// 赠品
result.freebie = data.g_gift_list.filter(freebie => {
return freebie.status !== 30 || freebie.status !== 0;
return freebie.status !== 30 && freebie.status !== 0;
});
result.giftCount = result.freebie.length;
result.giftHasStorage = _.some(result.freebie, freebie => {
... ... @@ -309,7 +309,7 @@ const procCartData = (data, onlyGift = false, onlyAdvanceBuy = false, isAdvanceC
// 加价购
result.advanceBuy = data.g_price_gift_list.filter(advanceBuy => {
return advanceBuy.status !== 30 || advanceBuy.status !== 0;
return advanceBuy.status !== 30 && advanceBuy.status !== 0;
});
result.advanceBuyCount = result.advanceBuy.length;
result.advanceHasStorage = _.some(result.advanceBuy, advanceBuy => {
... ...