diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index df07dc9..25ce445 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -1140,27 +1140,38 @@ Page({ if (th.data.sele_g.viplimited > 0 && !th.data.is_normal && th.data.prom_type == 1) { var gd_buy_num = th.data.promcardbuynum; - if(t > th.data.sele_g.goods_num) { - wx.showModal({ - title: '超出活动库存', - }); - - var num = th.data.sele_g.goods_num; - th.setData({goodsInputNum: num}) - return false; + // 如果限购数量>活动库存数量,增加数量时会先超过库存数量,此时应该提示“超出活动库存”; + // 如果限购数量<=活动库存数量,增加数量时会先超过限购数量,此时应提示“超出活动限购数量” + if(th.data.sele_g.viplimited > th.data.sele_g.goods_num) { + + // 计算还可以购买的数量:库存量 - 已购数 + var num = th.data.sele_g.goods_num - gd_buy_num; + if(num < 0) num = 0; + if(t > num) { + wx.showModal({ + title: '超出活动库存', + }); + + th.setData({goodsInputNum: num}) + return false; + + }; + } else { + if ((t + gd_buy_num> th.data.sele_g.viplimited) && (t<=th.data.sele_g.goods_num)) { + wx.showModal({ + title: '超出活动限购数量', + }); + + var num = th.data.sele_g.viplimited - gd_buy_num; + if (num <= 0) num = 1; + th.setData({goodsInputNum: num}) + return false; + }; }; - if ((t + gd_buy_num> th.data.sele_g.viplimited) && (t<=th.data.sele_g.goods_num)) { - wx.showModal({ - title: '超出活动限购数量', - }); - - var num = th.data.sele_g.viplimited - gd_buy_num; - if (num <= 0) num = 1; - th.setData({goodsInputNum: num}) - return false; - } + + }; //--秒杀:判断商品是否超出活动限购-- @@ -1193,7 +1204,6 @@ Page({ } - th.setData({goodsInputNum: t}); }); @@ -3381,7 +3391,7 @@ Page({ var user_id = getApp().globalData.user_id; if (!user_id) user_id = 0; - var url = "/api/weshop/goods/listSkuFlash?store_id=" + os.stoid + "&goods_id=" + this.data.data.goods_id + "&user_id=" + user_id; + var url = "/api/weshop/goods/listSkuFlash?store_id=" + os.stoid + "&goods_id=" + this.data.options.goods_id + "&user_id=" + user_id; //获取秒杀的多规格 await getApp().request.promiseGet(url, {}).then(res => { if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {