Commit 0979c926d0c72246cbf88b03080c30399514e525

Authored by WXD-SEASON\season
2 parents 4f3483a8 40611253

Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

packageE/pages/cart/cart2/cart2.js
... ... @@ -8334,7 +8334,7 @@ Page({
8334 8334 if(!fd) continue;
8335 8335 }
8336 8336  
8337   - if (goods[i].erpwareid == you_item.WareId) {
  8337 + if (goods[i].erpwareid == you_item.WareId && !goods[i].is_gift) {
8338 8338 var gg_ite = {
8339 8339 goods_id: goods[i].goods_id,
8340 8340 goods_num: goods[i].goods_num,
... ...