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

WXD-SEASON\season
2 parents daaded4d d8bc7f83
Showing 3 changed files with 4 additions and 3 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart2.js
packageE/pages/cart/cart2_inte/cart2_inte.js
@@ -1496,7 +1496,7 @@ Page({
         }
       }
-      if (th.data.sales_rules==1 && th.data.bn_goods.store_count<oods.goods_num){
+      if (th.data.sales_rules==1 && th.data.bn_goods.store_count<goods.goods_num){
         getApp().confirmBox("商品的门店库存不足");
         th.data.is_summit_ing = 0;
         th.setData({
@@ -1611,7 +1611,7 @@ Page({
                     }
                 }
-                if (th.data.sales_rules==1 && th.data.bn_goods.store_count<oods.goods_num){
+                if (th.data.sales_rules==1 && th.data.bn_goods.store_count<goods.goods_num){
                     getApp().confirmBox("商品的门店库存不足");
                     th.data.is_summit_ing = 0;
                     th.setData({
@@ -1323,6 +1323,7 @@ Page({
       }
+
       var goods = {
         'goods_id': gg.goods_id,
         'goods_name': gg.goods_name,
@@ -1360,7 +1361,7 @@ Page({
         }
-        if (th.data.sales_rules==1 && th.data.bn_goods.store_count<oods.goods_num){
+        if (th.data.sales_rules==1 && th.data.bn_goods.store_count<goods.goods_num){
           getApp().confirmBox("商品的门店库存不足");
           th.data.is_summit_ing = 0;
           th.setData({