Commit 6947c843538e2762305ae4f2d9acbbc1b404e86f
Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp
Showing
3 changed files
with
4 additions
and
3 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
| ... | ... | @@ -1496,7 +1496,7 @@ Page({ | 
| 1496 | 1496 | } | 
| 1497 | 1497 | } | 
| 1498 | 1498 | |
| 1499 | - if (th.data.sales_rules==1 && th.data.bn_goods.store_count<oods.goods_num){ | |
| 1499 | + if (th.data.sales_rules==1 && th.data.bn_goods.store_count<goods.goods_num){ | |
| 1500 | 1500 | getApp().confirmBox("商品的门店库存不足"); | 
| 1501 | 1501 | th.data.is_summit_ing = 0; | 
| 1502 | 1502 | th.setData({ | ... | ... | 
packageC/pages/presell/cart/cart2.js
| ... | ... | @@ -1611,7 +1611,7 @@ Page({ | 
| 1611 | 1611 | } | 
| 1612 | 1612 | } | 
| 1613 | 1613 | |
| 1614 | - if (th.data.sales_rules==1 && th.data.bn_goods.store_count<oods.goods_num){ | |
| 1614 | + if (th.data.sales_rules==1 && th.data.bn_goods.store_count<goods.goods_num){ | |
| 1615 | 1615 | getApp().confirmBox("商品的门店库存不足"); | 
| 1616 | 1616 | th.data.is_summit_ing = 0; | 
| 1617 | 1617 | th.setData({ | ... | ... | 
packageE/pages/cart/cart2_inte/cart2_inte.js
| ... | ... | @@ -1323,6 +1323,7 @@ Page({ | 
| 1323 | 1323 | } | 
| 1324 | 1324 | |
| 1325 | 1325 | |
| 1326 | + | |
| 1326 | 1327 | var goods = { | 
| 1327 | 1328 | 'goods_id': gg.goods_id, | 
| 1328 | 1329 | 'goods_name': gg.goods_name, | 
| ... | ... | @@ -1360,7 +1361,7 @@ Page({ | 
| 1360 | 1361 | } | 
| 1361 | 1362 | |
| 1362 | 1363 | |
| 1363 | - if (th.data.sales_rules==1 && th.data.bn_goods.store_count<oods.goods_num){ | |
| 1364 | + if (th.data.sales_rules==1 && th.data.bn_goods.store_count<goods.goods_num){ | |
| 1364 | 1365 | getApp().confirmBox("商品的门店库存不足"); | 
| 1365 | 1366 | th.data.is_summit_ing = 0; | 
| 1366 | 1367 | th.setData({ | ... | ... | 
