Authored by 郝肖肖

Merge branch 'feature/cartPromotionTip' into release/5.7

... ... @@ -608,7 +608,10 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
ensureUrl: helpers.urlFormat('/cart/ensure'),
// 免运费提示
tips: _.get(ordCartData, 'shipping_cost_prompt.shipping_cost_tips', '')
tips: _.get(ordCartData, 'shipping_cost_prompt.shipping_cost_tips', ''),
// 低档赠品
matchGiftIds: _.get(ordCartData, 'match_gift_ids', []).join(',')
};
let advStat = result.advanceCart.stat;
... ...
... ... @@ -195,6 +195,12 @@
{{/if}}
</div>
{{/soldOutPools}}
{{#if matchGiftIds}}
<div class="gift-sell-info hide" data-role="promotion-wrap" data-promotionid="{{matchGiftIds}}">
<span data-role="gift-resel-btn"></span>
</div>
{{/if}}
</div>
{{/ordinaryCart}}
... ...