Commit e6622b895aff9098fa18246391596273e85ec7d1
1 parent
eea1c463
组合购使用券之后，erp无法调单的优化
Showing
1 changed file
with
2 additions
and
1 deletions
pages/cart/cart2/cart2.js
| @@ -2913,6 +2913,7 @@ Page({ | @@ -2913,6 +2913,7 @@ Page({ | ||
| 2913 | if (pdata.length == 0) return; | 2913 | if (pdata.length == 0) return; |
| 2914 | var str = JSON.stringify(pdata); | 2914 | var str = JSON.stringify(pdata); |
| 2915 | 2915 | ||
| 2916 | + | ||
| 2916 | wx.showLoading({ title: "加载中" }); | 2917 | wx.showLoading({ title: "加载中" }); |
| 2917 | wx.request({ | 2918 | wx.request({ |
| 2918 | url: oo.url + '/api/weshop/order/createWxdOrder', | 2919 | url: oo.url + '/api/weshop/order/createWxdOrder', |
| @@ -4397,7 +4398,7 @@ Page({ | @@ -4397,7 +4398,7 @@ Page({ | ||
| 4397 | var arr = []; | 4398 | var arr = []; |
| 4398 | //判断是不是有goods_id重复 | 4399 | //判断是不是有goods_id重复 |
| 4399 | for (var i = 0; i < goods.length; i++) { | 4400 | for (var i = 0; i < goods.length; i++) { |
| 4400 | - if (goods[i].prom_type != 7 && goods[i].erpwareid == you_item.WareId) { | 4401 | + if (goods[i].erpwareid == you_item.WareId) { |
| 4401 | var gg_ite = { | 4402 | var gg_ite = { |
| 4402 | goods_id: goods[i].goods_id, | 4403 | goods_id: goods[i].goods_id, |
| 4403 | goods_num: goods[i].goods_num, | 4404 | goods_num: goods[i].goods_num, |