Commit 81d8c298df766e38846aa6f815f08d71f4d113eb
Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp
Showing
1 changed file
with
1 additions
and
1 deletions
packageE/pages/cart/cart2/cart2.js
| @@ -8334,7 +8334,7 @@ Page({ | @@ -8334,7 +8334,7 @@ Page({ | ||
| 8334 | if(!fd) continue; | 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 | var gg_ite = { | 8338 | var gg_ite = { |
| 8339 | goods_id: goods[i].goods_id, | 8339 | goods_id: goods[i].goods_id, |
| 8340 | goods_num: goods[i].goods_num, | 8340 | goods_num: goods[i].goods_num, |