diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 5d65ea5..ebe83f1 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -1423,9 +1423,32 @@ Page({ //----------------------更新购物数量，加减,调用接口--------------------- postCardList: function(t, item, pitem) { + var e = this,th=e,user_id = getApp().globalData.user_id; + function normal_check() { + //--- 看一下是不是线下库存 --- + if(th.data.sales_rules==2 && goodsinfo.prom_type!=7){ + th.check_down_line(t, pitem, item,wareIds); + }else{ + if (t.goods_num > store_count) { + wx.showModal({ + title: '提示', + content: '购买数量超出商品库存' + }); + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: store_count + }); + e.doCheckAll(); + t.goods_num=store_count; + } + e.update_cart(t, pitem, item); + } + } + + + + - var e = this,th=e; - var user_id = getApp().globalData.user_id; // console.log('update'); // console.log('9995959595959',t); rq.get("/api/weshop/goods/get/" + oo.stoid + "/" + t.goods_id, { @@ -1456,12 +1479,8 @@ Page({ th.setData({[txt]:promgoodsbuynum}); } goodsbuynum = buy_num_data.goodsbuynum; - - - // console.log('goodsbuynum===========', goodsbuynum); - }) - + }) var buyed_mum2 = t.goods_num + goodsbuynum; if (buyed_mum2 > limit && limit > 0) { @@ -1482,129 +1501,174 @@ Page({ } - if (goodsinfo.prom_type == 1) { - //读取秒杀 - rq.get("/api/ms/flash_sale/getFlashSaleOne/" + oo.stoid + "/" + goodsinfo.prom_id, { - isShowLoading: 0, - success: function(res_d) { - - if(res_d.data.code==0 && res_d.data.data){ - if (t.goods_num > store_count) { - wx.showModal({ - title: '提示', - content: '购买数量超出商品库存' - }); - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; - e.setData({ - [txt]: store_count - }); - e.doCheckAll(); - - t.goods_num=store_count; - e.update_cart(t, pitem, item); + switch (goodsinfo.prom_type){ + case 1: + //读取秒杀 + rq.get("/api/ms/flash_sale/getFlashSaleOne/" + oo.stoid + "/" + goodsinfo.prom_id, { + isShowLoading: 0, + success: function(res_d) { + if(res_d.data.code==0 && res_d.data.data){ + if (t.goods_num > store_count) { + wx.showModal({ + title: '提示', + content: '购买数量超出商品库存' + }); + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: store_count + }); + e.doCheckAll(); - return false; - } + t.goods_num=store_count; + e.update_cart(t, pitem, item); - var false_data = res_d.data.data; - //--判断库存-- - if (t.goods_num > false_data.goods_num - false_data.buy_num) { - wx.showModal({ - title: '提示', - content: '购买数量超出活动库存' - }); - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; - e.setData({ - [txt]: false_data.goods_num - false_data.buy_num - }); - e.doCheckAll(); - - t.goods_num=false_data.goods_num - false_data.buy_num; - e.update_cart(t, pitem, item); + return false; + } - return false; - } + var false_data = res_d.data.data; + //--判断库存-- + if (t.goods_num > false_data.goods_num - false_data.buy_num) { + wx.showModal({ + title: '提示', + content: '购买数量超出活动库存' + }); + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: false_data.goods_num - false_data.buy_num + }); + e.doCheckAll(); - //--判断redis数量是否已经超出-- - if (t.goods_num > false_data.redisnum) { - wx.showModal({ - title: '提示', - content: '购买数量超出商品库存' - }); - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; - e.setData({ - [txt]: false_data.redisnum - }); - e.doCheckAll(); - - t.goods_num=false_data.redisnum; - e.update_cart(t, pitem, item); + t.goods_num=false_data.goods_num - false_data.buy_num; + e.update_cart(t, pitem, item); + return false; + } - return false; - } + //--判断redis数量是否已经超出-- + if (t.goods_num > false_data.redisnum) { + wx.showModal({ + title: '提示', + content: '购买数量超出商品库存' + }); + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: false_data.redisnum + }); + e.doCheckAll(); - //--活动的限购是不是要判断-- - if (t.goods_num + promgoodsbuynum > false_data.buy_limit && false_data.buy_limit > 0) { - wx.showModal({ - title: '提示', - content: '购买数量超出秒杀限购' - }); - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; - e.setData({ - [txt]: false_data.false_data.buy_limit - }); - e.doCheckAll(); - - t.goods_num=false_data.false_data.buy_limit; - e.update_cart(t, pitem, item); - return false; - } - e.update_cart(t, pitem, item); + t.goods_num=false_data.redisnum; + e.update_cart(t, pitem, item); + return false; + } - }else{ - //--- 看一下是不是线下库存 --- - if(th.data.sales_rules==2){ - th.check_down_line(t, pitem, item,wareIds); - }else{ - if (t.goods_num > store_count) { + //--活动的限购是不是要判断-- + if (t.goods_num + promgoodsbuynum > false_data.buy_limit && false_data.buy_limit > 0) { wx.showModal({ title: '提示', - content: '购买数量超出商品库存' + content: '购买数量超出秒杀限购' }); var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; e.setData({ - [txt]: store_count + [txt]: false_data.buy_limit }); e.doCheckAll(); + t.goods_num=(false_data.buy_limit-promgoodsbuynum)?false_data.buy_limit-promgoodsbuynum:0; + e.update_cart(t, pitem, item); return false; } e.update_cart(t, pitem, item); + + }else{ + normal_check(); } } + }) + break; + case 2: + getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, { + }).then(res => { + if(res.data.code==0 && res.data.data){ + if (t.goods_num > store_count) { + wx.showModal({ + title: '提示', + content: '购买数量超出商品库存' + }); + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: store_count + }); + e.doCheckAll(); + + t.goods_num=store_count; + e.update_cart(t, pitem, item); + + return false; + } + + var gr_data = res.data.data; + //--判断库存-- + if (t.goods_num > gr_data.goods_num - gr_data.buy_num) { + wx.showModal({ + title: '提示', + content: '购买数量超出活动库存' + }); + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: gr_data.goods_num - gr_data.buy_num + }); + e.doCheckAll(); + + t.goods_num=gr_data.goods_num - gr_data.buy_num; + e.update_cart(t, pitem, item); + + return false; + } + + //--判断redis数量是否已经超出-- + if (t.goods_num > gr_data.redisnum) { + wx.showModal({ + title: '提示', + content: '购买数量超出商品库存' + }); + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: gr_data.redisnum + }); + e.doCheckAll(); + + t.goods_num=gr_data.redisnum; + e.update_cart(t, pitem, item); + return false; + } + + //--活动的限购是不是要判断-- + if (t.goods_num + promgoodsbuynum > gr_data.buy_limit && gr_data.buy_limit > 0) { + wx.showModal({ + title: '提示', + content: '购买数量超出秒杀限购' + }); + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: gr_data.buy_limit + }); + e.doCheckAll(); + + t.goods_num=(gr_data.buy_limit-promgoodsbuynum)?gr_data.buy_limit-promgoodsbuynum:0; + e.update_cart(t, pitem, item); + return false; + } + e.update_cart(t, pitem, item); + + }else{ + normal_check(); + } + }) - } - }) - } else { - //--- 看一下是不是线下库存 --- - if(th.data.sales_rules==2 && goodsinfo.prom_type!=7){ - th.check_down_line(t, pitem, item,wareIds); - }else{ - if (t.goods_num > store_count) { - wx.showModal({ - title: '提示', - content: '购买数量超出商品库存' - }); - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; - e.setData({ - [txt]: store_count - }); - e.doCheckAll(); - t.goods_num=store_count; - } - e.update_cart(t, pitem, item); - } - } + break; + default: + normal_check() + break + } } }); }, diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 1fca06c..7e52d05 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -983,6 +983,7 @@ Page({ //t.data.data.shop_price = tt.data.data.prom_price; t.data.data.shop_price = tt.data.data.prom_user_price; th.data.ckeck_quan_price=0; + gd.is_xz_yh=1; } else { t.data.data.prom_id = 0; t.data.data.prom_type = 0; diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 79994b5..99b8d55 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -469,7 +469,7 @@ Page({ } else { //要用接口是获取距离，js的计算不准 getApp().request.promiseGet("/api/weshop/pickup/list", { - data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon }, + data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,isstop:0,is_pos:1 }, }).then(res => { if (res.data.code == 0) { e = res.data.data.pageData[0]; @@ -2497,12 +2497,14 @@ Page({ store_id: o.stoid, distr_type: g_distr_type, isstop: 0, + is_pos:1, pageSize: 2000 } } else { dd = { store_id: o.stoid, isstop: 0, + is_pos:1, pageSize: 2000 } } @@ -3022,44 +3024,24 @@ Page({ getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +gid+"/"+ prom_id, { success: function (t) { if (t.data.code != 0) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); + ee.get_normal(gid); return false; } //----已经结束----- if (t.data.data.is_end == 1) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); + ee.get_normal(gid); return false; } //----已经过期----- var now = ut.gettimestamp(); if (t.data.data.end_time < now || t.data.data.start_time>now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); + ee.get_normal(gid); return false; } /*-- 还没有开始预热的也不显示 --*/ if (t.data.data.show_time > now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); + ee.get_normal(gid); return false; } @@ -3134,43 +3116,23 @@ Page({ getApp().request.get("/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id, { success: function (t) { if (t.data.code != 0) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); + ee.get_normal(gid); return false; } //----已经结束----- if (t.data.data.is_end == 1) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); + ee.get_normal(gid); return false; } //----已经过期----- var now = ut.gettimestamp(); if (t.data.data.end_time < now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); + ee.get_normal(gid); return false; } /*-- 还没有开始预热的也不显示 --*/ if (t.data.data.show_time > now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); + ee.get_normal(gid); return false; } @@ -3303,9 +3265,7 @@ Page({ ee.get_sto(); } else { - ee.setData({ prom_type: 0, isshow: 1, }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); + ee.get_normal(gid); return false; } }) @@ -3330,44 +3290,25 @@ Page({ success: function (t) { console.log(t,3124); if (t.data.code != 0) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); - return false; + ee.get_normal(gid); + return false; } //----已经结束----- if (t.data.data.is_end == 1) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - return false; + ee.get_normal(gid); + return false; } //----已经过期----- var now = ut.gettimestamp(); if (t.data.data.end_time < now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); - return false; + ee.get_normal(gid); + return false; } /*-- 还没有开始预热的也不显示 --*/ if (t.data.data.show_time > now) { - ee.setData({ - prom_type: 0, - isshow: 1, - }); - ee.get_sku(os.stoid, ee.data.data, gid); - ee.get_sto(); - return false; + ee.get_normal(gid); + return false; } /*-- 判断拼单是否启用 --*/ @@ -6054,9 +5995,21 @@ Page({ corpId: id, success(res) {} }) + }, + + get_normal(gid){ + this.setData({ + prom_type: 0, + isshow: 1, + }); + this.get_sku(os.stoid, this.data.data, gid); + this.get_sto(); + this.check_is_youhui(gid,1); + this.data.is_normal=1; } + });