From 9f48c2327f3b9d9dc0c5c58c35bb1717aaf24609 Mon Sep 17 00:00:00 2001 From: antploy Date: Tue, 23 Nov 2021 17:48:03 +0800 Subject: [PATCH] 待支付活动变更 --- pages/goods/goodsInfo/goodsInfo.js | 6 ++---- pages/user/order_list/order_list.js | 33 ++++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 8b41337..0bbe0f7 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1155,14 +1155,12 @@ Page({ //if(o.prom_type==4){ //newd.is_integral_normal=1; //} - //-----如果是秒杀，团购，积分购,拼团----- newd.prom_type = th.data.prom_type; newd.prom_id = th.data.prom_id; if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); - th.add_cart_next(e, t, a, o, newd); //立即购买下一步 }) @@ -1231,6 +1229,7 @@ Page({ prom_type:th.data.sele_g.prom_type, }; + //---是不是从收藏夹出来的--- if (th.data.c_guide_id) { newd['guide_id'] = th.data.c_guide_id; @@ -1441,6 +1440,7 @@ Page({ user_id: oo.user_id, goods_id: a, pick_id: e.data.sto_sele_id, + state:0 }, success: function (re) { @@ -1491,8 +1491,6 @@ Page({ } }); } else { - - i.post("/api/weshop/cart/save", { data: newd, success: function (t) { diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index b095238..9e486d4 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -661,9 +661,8 @@ Page({ } } else { - if ((gg.prom_type == 1 || good.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 5 || gg.prom_type == 6 || gg.prom_type == 4) + if ((gg.prom_type == 1 || gg.prom_type == 2 || gg.prom_type == 3 || gg.prom_type == 4 || gg.prom_type == 5 || gg.prom_type == 6|| gg.prom_type == 10) && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { - var prom = null; //---如果是活动的时候--- var prom = null, th = this; if (gg.prom_type == 1) { @@ -702,11 +701,18 @@ Page({ } }) } + if (gg.prom_type == 10) { + var url=`/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${gg.prom_id}`; + await getApp().request.promiseGet(url, {}).then(res => { + if (res.data.code == 0 && res.data.data && !res.data.data.isuse || res.data.data.is_end==1) { + prom = res.data.data; + } + }) + } if (prom) { var t_now = ut.gettimestamp(); if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) { - var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; th.toast(content); return false; @@ -723,6 +729,7 @@ Page({ if (r_data.promGoodsLists) { var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; th.toast(content); + console.log(3); t_ok = 0; } } @@ -751,6 +758,7 @@ Page({ var content = gg.goods_name + '商品的价格发生了变化,请取消订单重新购买1' th.toast(content); + console.log(4); return false; } } @@ -900,6 +908,7 @@ Page({ var content = good.goods_name + '商品的价格发生了变化,请取消订单重新购买'; th.toast(content); + console.log(5); return false; } } @@ -1085,6 +1094,7 @@ Page({ check_more_order:async function(item){ + console.log(item,100000); var pickup=null,th=this; var user_id=getApp().globalData.user_id; wx.showLoading(); @@ -1178,6 +1188,7 @@ Page({ await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ if(res.data.code==0){ var list = res.data.data; + console.log('list',list); for(let i in list){ let item=list[i]; if(item.prom_type==1){ good.prom_type=1; good.prom_id=item.act_id; } @@ -1195,7 +1206,7 @@ Page({ flash = res.data.data; } }) - //----已经结束----- + //----进行中----- if (flash && flash.is_end == 0 && flash.end_time > timestamp && flash.start_time < timestamp) { prom = flash; prom.price = prom.user_price; @@ -1210,7 +1221,7 @@ Page({ group = res.data.data; } }) - //----已经结束----- + //----进行中----- if (group && group.is_end == 0 && group.end_time > timestamp && group.start_time < timestamp) { prom = group; prom.price = prom.price; @@ -1234,11 +1245,19 @@ Page({ b_item.prom_id = res.data.data.id; good.prom_type = 7; good.prom_id = b_item.prom_id; - } } }) break; + case 10: + let user_id=getApp().globalData.userInfo.user_id; + var url=`/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; + await getApp().request.promiseGet(url,{}).then(res=>{ + if(res.data.code==0 && res.data.data && res.data.data.isuse && res.data.data.is_end==0){ + b_item.prom_type = 10; + b_item.prom_id = res.data.data.id; + } + }) } } @@ -1482,7 +1501,7 @@ Page({ // 如果没有获取用户信息 wx.showModal({ title:'确定', - content: err_text+',确定要买其他商品码？', + content: err_text+',确定要买其他商品吗？', success(res) { if (res.confirm) { //跳转到登录页 -- libgit2 0.21.4