diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 72e295e..90e85f2 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -461,14 +461,18 @@ Page({ return false; } if(th.data.act.end_time { - if(res.data.code==0 && res.data.data){ - if(res.data.data.is_show!=1){ - isok=0; - } - //如果活动已经结束 - if(res.data.data.is_end==1){ - isok=0; - } - //已经结束 - if(ut.gettimestamp()>res.data.data.end_time){ - isok=0; - } - //还未开始 - if(ut.gettimestamp(){ + if (e.data.code == 0) { + promgoodsbuynum=e.data.data.sumgoodsnum; } + }) - var url1 = "/api/weshop/prom/zhbuyGoods/page"; - var req_data = { - page: 1, - pageSize: 1, - store_id: os.stoid, - zh_id: good.prom_id, - goods_id:good.goods_id + var presell_id =good.prom_id; + var presellList=null; + var url = "/api/weshop/marketing/marketingPresellList/list" + var rd = { + store_id: os.stoid, + presell_id: presell_id, + goods_id: good.goods_id + } + //------获取预售从表---------- + await getApp().request.promiseGet(url, { + data: rd + }).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { + var arr = res.data.data[0]; + presellList=arr } - await getApp().request.promiseGet(url1, { - data: req_data - }).then(res => { - if (ut.ajax_ok(res)) { - var gdlist = res.data.data.pageData[0]; - good.buyqty=gdlist.buyqty; - } - }) + }) - var num=good['buyqty']; - console.log(1111); - console.log(num); - //---- 要计算商品的限购 ----- - if(good['buyqty']>0){ - if(good.goods_num+promgoodsbuynum>good['buyqty']){ + if(presellList){ - var content= good['goods_name']+"超出活动限购\n"; - th.toast(content); - return false; - } + if(good.goods_num>presellList.presell_sumqty-presellList.buy_goodnum){ + var content = gg.goods_name + '购买数量超出商品库存,请取消订单'; + th.toast(content); + return false; + } + var buyed_mum3 = promgoodsbuynum + good.goods_num; + if (buyed_mum3 > presellList.vip_butyqty && presellList.vip_butyqty > 0) { + var content = gg.goods_name + '购买数量超出商品限购,请取消订单'; + th.toast(content); + return false; } + } + } + //如果优惠促销和搭配购的时候 if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){ diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 06f6ec2..8abe9a5 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -3989,7 +3989,11 @@ Page({ } }) if (!pre_arr) { - wx.showToast({title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000}) + wx.showToast({title: "当前会员身份不符，无法参与", icon: 'none', duration: 3000}); + setTimeout(function () { + ut.wx_back(); + }, 2000) + return false; } if (func) { func(); diff --git a/packageC/pages/presell/list/list.wxml b/packageC/pages/presell/list/list.wxml index ea6a007..51aabda 100644 --- a/packageC/pages/presell/list/list.wxml +++ b/packageC/pages/presell/list/list.wxml @@ -43,7 +43,7 @@ - + 已预售{{filters.toFix((item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)}}% diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index 1ba940e..d956d5e 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -434,6 +434,7 @@ display: flex; padding: 0 10rpx; box-sizing: content-box; + width: 750rpx !important; } .nav { diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 441f300..0261895 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -461,6 +461,7 @@ Page({ var th = this; var order = e; var order_goods = e.order_goods; + var user_id=getApp().globalData.userInfo.user_id; var wlist = ""; for (var i in order_goods) { @@ -482,7 +483,8 @@ Page({ return false; } //要每件每件的商品进行检查，看有么有超出库存，超出限购 - var good = order_goods[i], goodsbuynum = 0, promgoodsbuynum = 0, gg = null; + var good = order_goods[i], goodsbuynum = 0, promgoodsbuynum = 0, gg = null,presellList=null; + //获取单品的现在的活动状态 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, {}).then(res => { gg = res.data.data; @@ -512,7 +514,6 @@ Page({ th.toast(content); return false; } - //当是组合优惠的时候 if (good.prom_type == 7) { //如果有组合购 @@ -579,6 +580,52 @@ Page({ } } + //如果是预售的时候， + if(good.prom_type==8){ + await getApp().request.promiseGet("/api/weshop/order/orderPresell/countBuyGoodsSum",{ + data: {store_id: os.stoid, user_id: user_id, goods_id: good.goods_id, prom_id: good.prom_id}, + }).then(e=>{ + if (e.data.code == 0) { + promgoodsbuynum=e.data.data.sumgoodsnum; + } + }) + + var presell_id =good.prom_id; + var url = "/api/weshop/marketing/marketingPresellList/list" + var rd = { + store_id: os.stoid, + presell_id: presell_id, + goods_id: good.goods_id + } + //------获取预售从表---------- + await getApp().request.promiseGet(url, { + data: rd + }).then(res => { + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { + var arr = res.data.data[0]; + presellList=arr + } + }) + + if(presellList){ + + if(good.goods_num>presellList.presell_sumqty-presellList.buy_goodnum){ + var content = good.goods_name + '购买数量超出商品库存,请取消订单'; + th.toast(content); + return false; + } + var buyed_mum3 = promgoodsbuynum + good.goods_num; + if (buyed_mum3 > presellList.vip_butyqty && presellList.vip_butyqty > 0) { + var content = good.goods_name + '购买数量超出商品限购,请取消订单'; + th.toast(content); + return false; + } + + } + } + + + //如果优惠促销和搭配购的时候 if ((good.prom_type == 3 || good.prom_type == 5) && good.is_gift != 1 && good.is_collocation != 1) { var p_ok = 1;