fix购物车大于库存限购

泉州测试
1 parent a38fab6d
Showing 1 changed file with 39 additions and 24 deletions
pages/cart/cart/cart.js
@@ -2042,22 +2042,25 @@ Page({
                     if(redis_num == 0) {
                         wx.showToast({
                             title: '超出活动库存',
-														icon: 'none',
+							icon: 'none',
                         });
                         th.setData({[txt]: redis_num});
+                        await e.doCheckAll();
                         return false;
                     };
  
-                    if(t.goods_num > redis_num) {
-                        wx.showToast({
-                          title: '超出活动库存',
-													icon: 'none',
-                        });
-                        th.setData({[txt]: redis_num});
-                        return false;
-                    };
+                    var buylimit = 0
+                    await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + t.store_id + "/" + getApp().globalData.user_id + "/" + t.prom_id, {
+                        
+                    }).then(res => {
+                        if(res.data.code == 0) {
+                                
+                            th.data.sele_g = res.data.data;
+                            th.data.sele_g.viplimited = res.data.data.buy_limit;
+                            buylimit = res.data.data.buy_limit;
+                        };
+                    });
  
-                    // 个人限购
                     //----获取用户活动购买数----
                     await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum?store_id="+t.store_id+"&user_id="+getApp().globalData.user_id+"&card_id="+t.goods_id+"&prom_type="+t.prom_type+"&prom_id="+t.prom_id, {
                     }).then(tt => {
@@ -2068,33 +2071,45 @@ Page({
                             });
                         };
                     });
-                
-                var buylimit = 0
-                await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + t.store_id + "/" + getApp().globalData.user_id + "/" + t.prom_id, {
-                    
-                }).then(res => {
-                    if(res.data.code == 0) {
-                            
-                        th.data.sele_g = res.data.data;
-                        th.data.sele_g.viplimited = res.data.data.buy_limit;
-                        buylimit = res.data.data.buy_limit;
+                    var gd_buy_num = th.data.promcardbuynum;
+
+
+                    if(t.goods_num > redis_num) {
+                        wx.showToast({
+                          title: '超出活动库存',
+						    icon: 'none',
+                        });
+
+                        if (buylimit > 0) { 
+                            let num = buylimit - gd_buy_num;
+                            if (num > redis_num) {
+                                th.setData({[txt]: redis_num});
+                            } else {
+                                th.setData({[txt]: num});
+                            }
+                        } else {
+                            th.setData({[txt]: redis_num});
+                        }
+                        
+                        await e.doCheckAll();
+                        return false;
                     };
-                });
+
+                
                 //--秒杀：判断商品是否超出活动限购--
                 if (buylimit > 0) {
-
-                    var gd_buy_num = th.data.promcardbuynum;
  
                     // 如果限购数量<=活动库存数量，增加数量时会先超过限购数量，此时应提示“超出活动限购数量”
                     if(t.goods_num + gd_buy_num > buylimit) {
                         // 计算还可以购买的数量：库存量 - 已购数
                             wx.showToast({
                               title: '超出活动限购',
-															icon: 'none',
+							    icon: 'none',
                             });
                             let num = buylimit - gd_buy_num;
 					        if (num <= 0) num = 1;
                             th.setData({[txt]: num});
+                            await e.doCheckAll();
                             return false;
                         };