From 9b43128bf530fa08bdba8bfb773340525e7daae5 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Sat, 9 Oct 2021 10:12:39 +0800 Subject: [PATCH] 预售的 --- packageC/pages/presell/cart/cart.js | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- packageC/pages/presell/goodsInfo/goodsInfo.js | 73 ++++++++++++++++++++++++++----------------------------------------------- packageC/pages/presell/goodsInfo/goodsInfo.wxml | 55 +++++++++++++++++++++++++++++-------------------------- 3 files changed, 116 insertions(+), 101 deletions(-) diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 3382dc6..96c9768 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -369,6 +369,7 @@ Page({ exp_type = 0, presell=null, //订单从表 pre_arr=null, //订单内容 + act=null, //订单内容 th = this; @@ -402,27 +403,6 @@ Page({ presell = res.data.data; }); - var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, goods_id: order_goods.goods_id }; - if(presell.deposit_pay_time>0){ - pre_data.timetype=12; - } - - pre_data.user_id = order.user_id; - var isok=1; - await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", { - data: pre_data, - }).then(e => { - if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) { - pre_arr = e.data.data.pageData[0]; - }else{ - isok=0; - } - }) - if(!isok){ - getApp().confirmBox("活动已经结束，或者会员身份不符合"); - return false; - } - //等待定金 if(order.order_status<2 && presell.deposit_pay_time<=0 ){ th.setData({wait_dj:1}) @@ -440,8 +420,6 @@ Page({ if(order.pay_status==1 && order.shipping_status==1 && order.order_status<2){ th.setData({wait_sh:1}) } - - //------获取预售主表---------- await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellForm/get/"+os.stoid+"/"+presell.prom_id, {}).then(res => { if (res.data.code == 0 && res.data.data) { @@ -452,6 +430,62 @@ Page({ } }) + //-- 判断一下会员的身份 -- + if(order.pay_status==0){ + var pre_data = { store_id: os.stoid, presell_id: presell.prom_id,timetype: 12, goods_id: order_goods.goods_id }; + pre_data.user_id = order.user_id; + var isok=1; + await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", { + data: pre_data, + }).then(e => { + if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) { + pre_arr = e.data.data.pageData[0]; + }else{ + isok=0; + } + }) + + if(!isok){ + getApp().confirmBox("会员身份不符合"); + return false; + } + + if(th.data.wait_dj){ + if(act.is_end) { + getApp().confirmBox("活动已经结束"); + return false; + } + if(!act.isuse) { + getApp().confirmBox("活动未启用"); + return false; + } + if(th.data.act.end_time{ + if (re.data.code == 0 && re.data.data && re.data.data.length > 0) { + pre_arr = re.data.data[0]; + } + }) + + if(!pre_arr){ + getApp().confirmBox("未找到商品"); + return false; + } + } //---获取商品--- await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + order_goods.goods_id, {}).then(res => { @@ -527,14 +561,13 @@ Page({ //等待发货的时候 if(th.data.wait_fh){ - var send_time=pre_arr.delivery_date; - if(pre_arr.delivery_type==2){ - send_time=pre_arr.delivery_daynum*3600; + var send_time=th.data.act.delivery_date; + if(th.data.act.delivery_type==2){ + send_time=th.data.act.delivery_daynum*3600; } } - order.order_goods = order_goods; var tail_pay=pre_arr.presell_price*order_goods.goods_num-presell.presell_deposit; this.setData({ @@ -557,7 +590,7 @@ Page({ //统一进行计算金额 th.calculatePrice2(); //如果可以 - if(pre_arr.is_usecoupon){ + if(th.data.act.is_usecoupon){ th.get_buy_now_quan(); } }, diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 1fbfc2e..7633cee 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1067,16 +1067,12 @@ Page({ if (re.data.data.total > 0) { var item = re.data.data.pageData[0]; + if (item.goods_num + th.data.goodsInputNum > o.store_count) { + return s.my_warnning("库存不足！", 0, th); + } - //判断数量，要看下购物车中有没有该商品 - if (CanOutQty) { - if (item.goods_num + th.data.goodsInputNum > CanOutQty) { - return s.my_warnning("库存不足！", 0, th); - } - } else { - if (item.goods_num + th.data.goodsInputNum > o.store_count) { - return s.my_warnning("库存不足！", 0, th); - } + if (item.goods_num + th.data.goodsInputNum >th.data.pre_arr.presell_sumqty-th.data.pre_arr.buy_goodnum) { + return s.my_warnning("库存不足！", 0, th); } var updata = { @@ -1200,6 +1196,9 @@ Page({ } var e = th.data.sele_g.store_count; + var e2=th.data.pre_arr.presell_sumqty-th.data.pre_arr.buy_goodnum; + if(e2 0) { th.data.all_pre_goods = e.data.data.pageData; - var idx = e.data.data.pageData.findIndex(function (ele) { return ele.id == th.data.presellList.id; }) + pre_arr = e.data.data.pageData[idx]; th.setData({pre_arr: pre_arr}) th.data.prom_buy_limit = pre_arr.vip_butyqty; diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml index 227784c..eeaef15 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml @@ -64,31 +64,34 @@ 零售价￥{{filters.toFix(data.market_price,2)}} - - 距活动结束还有 - - - - - {{djs.day}} + + + + + 距活动结束还有 + + + + {{djs.day}} + + + 天 + + + + {{djs.hou}} - - 天 + 时 + + {{djs.min}} - - - {{djs.hou}} - - 时 - - {{djs.min}} - - 分 - - {{djs.sec}} + 分 + + {{djs.sec}} + + 秒 - 秒 - + @@ -545,9 +548,9 @@ - 已售：{{pre_arr.buy_goodnum+pre_arr.virtual_qty}} + 已售：{{presellList.buy_goodnum+presellList.virtual_qty}} - 可售：{{pre_arr.presell_sumqty-pre_arr.buy_goodnum}} + 可售：{{presellList.presell_sumqty-presellList.buy_goodnum}} @@ -647,8 +650,8 @@ - 支付定金（￥{{pre_arr.presell_money}}） - 支付金额（￥{{pre_arr.presell_price}}） + 支付定金（￥{{presellList.presell_money}}） + 支付金额（￥{{presellList.presell_price}}） -- libgit2 0.21.4