diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 9d35000..f99e5f2 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -1113,6 +1113,7 @@ Page({ id: a.id, goods_id: a.service_id, store_id: oo.stoid, + is_pd_normal: a. is_pd_normal }; if(a.prom_type) { e.prom_type = a.prom_type; @@ -1151,7 +1152,8 @@ Page({ goods_num: a.goods_num - 1, id: a.id, goods_id: a.service_id, - store_id: oo.stoid + store_id: oo.stoid, + is_pd_normal: a. is_pd_normal }; this.postCardList_ser(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems); @@ -2027,124 +2029,126 @@ Page({ [txt]: t.goods_num }); - - - if(t.prom_type == 1) { - var txt = "service_data[" + pitem + "].goods[" + item + "].goods_num"; - var redis_num = 0; - - // 获取其他门店,同类商品的数量 - var cartGoodsNum = 0; - await getApp().request.promiseGet("/api/weshop/cartService/page?store_id="+t.store_id+"&user_id="+getApp().globalData.user_id+"&service_id="+t.goods_id, - { }).then(res => { - if (res.data.data.pageData.length > 0) { - const tmpObj = res.data.data.pageData; - tmpObj.forEach(v => { - if (t.id != v.id) { - cartGoodsNum += parseInt(v.goods_num); - } - - }); + // 1.秒杀活动 + // 2.活动开始 + if(t.prom_type == 1 && t.is_pd_normal == 0) { + var txt = "service_data[" + pitem + "].goods[" + item + "].goods_num"; + var redis_num = 0; + + // 获取其他门店,同类商品的数量 + var cartGoodsNum = 0; + await getApp().request.promiseGet("/api/weshop/cartService/page?store_id="+t.store_id+"&user_id="+getApp().globalData.user_id+"&service_id="+t.goods_id, + { }).then(res => { + if (res.data.data.pageData.length > 0) { + const tmpObj = res.data.data.pageData; + tmpObj.forEach(v => { + if (t.id != v.id) { + cartGoodsNum += parseInt(v.goods_num); } + }); - // 当前商品数量包括其他门店 - var totalNum = 0 - if (cartGoodsNum > 0) { - totalNum = t.goods_num + cartGoodsNum; - } else { - totalNum = t.goods_num; - } + } + }); + // 当前商品数量包括其他门店 + var totalNum = 0 + if (cartGoodsNum > 0) { + totalNum = t.goods_num + cartGoodsNum; + } else { + totalNum = t.goods_num; + } - //获取当前商品活动库存 - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + - t.store_id + "/" + t.prom_type + "/" + t.prom_id, { - 1: 1 - }).then(res => { - redis_num = res.data.data; - }); - - // 检测库存 - if(redis_num == 0) { - wx.showToast({ - title: '超出活动库存', - icon: 'none', - }); - th.setData({[txt]: redis_num}); - await e.doCheckAll(); - return false; - }; + //获取当前商品活动库存 + await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + + t.store_id + "/" + t.prom_type + "/" + t.prom_id, { + 1: 1 + }).then(res => { + redis_num = res.data.data; + }); + + // 检测库存 + if(redis_num == 0) { + wx.showToast({ + title: '超出活动库存', + icon: 'none', + }); + th.setData({[txt]: redis_num}); + await e.doCheckAll(); + 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 ? 0 : res.data.data.buy_limit; - }; - }); + // 限购数量 + 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 ? 0 : res.data.data.buy_limit; + }; + }); - //用户已经成功付款购买的数量 - var gd_buy_num = 0; - await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum?store_id="+t.store_id+"&user_id="+getApp().globalData.user_id+"&card_id="+t.card_id+"&prom_type="+t.prom_type+"&prom_id="+t.prom_id, { - }).then(tt => { - if (tt.data.code == 0) { - gd_buy_num = !tt.data.data.promcardbuynum ? 0 : tt.data.data.promcardbuynum; - th.setData({ - promcardbuynum: !tt.data.data.promcardbuynum ? 0 : tt.data.data.promcardbuynum, - cardbuynum: tt.data.data.cardbuynum, - }); - }; + //用户已经成功付款购买的数量 + var gd_buy_num = 0; + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum?store_id="+t.store_id+"&user_id="+getApp().globalData.user_id+"&card_id="+t.card_id+"&prom_type="+t.prom_type+"&prom_id="+t.prom_id, { + }).then(tt => { + if (tt.data.code == 0) { + gd_buy_num = !tt.data.data.promcardbuynum ? 0 : tt.data.data.promcardbuynum; + th.setData({ + promcardbuynum: !tt.data.data.promcardbuynum ? 0 : tt.data.data.promcardbuynum, + cardbuynum: tt.data.data.cardbuynum, }); + }; + }); - // 剩余购买数 - let num = buylimit - gd_buy_num; + // 剩余购买数 + let num = buylimit - gd_buy_num; - if(totalNum > redis_num) { - wx.showToast({ - title: '超出活动库存', - icon: 'none', - }); - // 开启限购 - if (buylimit > 0) { - if (num > redis_num) { - th.setData({[txt]: redis_num-cartGoodsNum}); - } else { - th.setData({[txt]: num - cartGoodsNum}); - } - } else { - th.setData({[txt]: redis_num - cartGoodsNum}); - } + if(totalNum > redis_num) { + wx.showToast({ + title: '超出活动库存', + icon: 'none', + }); + // 开启限购 + if (buylimit > 0) { + if (num > redis_num) { + th.setData({[txt]: redis_num-cartGoodsNum}); + } else { + th.setData({[txt]: num - cartGoodsNum}); + } + } else { + th.setData({[txt]: redis_num - cartGoodsNum}); + } - await e.doCheckAll(); - return false; - }; + await e.doCheckAll(); + return false; + }; + + //--秒杀:判断商品是否超出活动限购-- + if (buylimit > 0) { + + // 如果限购数量<=活动库存数量,增加数量时会先超过限购数量,此时应提示“超出活动限购数量” + if(totalNum > num) { + // 计算还可以购买的数量:库存量 - 已购数 + wx.showToast({ + title: '超出活动限购', + icon: 'none', + }); + if (num <= 0) num = 1; + th.setData({[txt]: num - cartGoodsNum}); + await e.doCheckAll(); + return false; + }; - //--秒杀:判断商品是否超出活动限购-- - if (buylimit > 0) { - - // 如果限购数量<=活动库存数量,增加数量时会先超过限购数量,此时应提示“超出活动限购数量” - if(totalNum > num) { - // 计算还可以购买的数量:库存量 - 已购数 - wx.showToast({ - title: '超出活动限购', - icon: 'none', - }); - if (num <= 0) num = 1; - th.setData({[txt]: num - cartGoodsNum}); - await e.doCheckAll(); - return false; - }; - - } - - - } - await e.doCheckAll(); - await e.update_cart_ser(t, pitem, item); + } + + + } + + + await e.doCheckAll(); + await e.update_cart_ser(t, pitem, item); },