diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 19006ac..5d65ea5 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -221,6 +221,7 @@ Page({ state:0 }, success:async function(su) { + console.log(su,10000); //按门店分类的数组 var arr = new Array(), carr = su.data.data.pageData; @@ -387,9 +388,11 @@ Page({ if(!th.data.zuhe_map[item.prom_id]){ //如果有组合购 var isok = 1; + var is_flag=1; var act=null; var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+item.prom_id+"/"+getApp().globalData.userInfo.user_id; await getApp().request.promiseGet(url, {}).then(res => { + console.log(res,1000); if(res.data.code==0 && res.data.data){ if(res.data.data.is_show!=1){ isok=0; @@ -407,12 +410,11 @@ Page({ isok=0; } act=res.data.data; - - } - // else{ - // //未找到商品的活动 - // isok = 0; - // } + + }else{ + //未找到商品的活动 + is_flag = 0; + } }) if (!isok){ var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; @@ -421,7 +423,6 @@ Page({ continue; } th.data.zuhe_map[item.prom_id]=act; - var url1 = "/api/weshop/prom/zhbuyGoods/page"; var req_data = { page: 1, @@ -432,8 +433,17 @@ Page({ await getApp().request.promiseGet(url1, { data: req_data }).then(res => { + console.log(res,2000); if (ut.ajax_ok(res)) { var gdlist = res.data.data.pageData; + gdlist.forEach(i=>{ + if(item.goods_id==i.goods_id&&!is_flag){ + item.prom_type=0; + item.prom_type1=0; + item.prom_id=0; + item.prom_id1=0 + } + }) th.data.zuhe_map_good[item.prom_id]=gdlist; } }) diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 23a705c..57a9112 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -124,6 +124,7 @@ Page({ in_zhact_gdmap:{}, //不同门店参与同一活动的限购 hid_inp:1, user_note:{}, + zuhe_map_good:{}, }, onLoad: function (t) { wx.setNavigationBarTitle({title: "填写订单",}) @@ -453,6 +454,7 @@ Page({ //要把组合购的东西拿出来算一下 if (item1.prom_type == 7) { var isok = 1; + var is_flag=1; //如果有组合购 var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id+'/'+getApp().globalData.userInfo.user_id; await getApp().request.promiseGet(url, {}).then(res => { @@ -464,25 +466,45 @@ Page({ if (ut.gettimestamp() > res.data.data.end_time) { isok = 0; } + item1.act = res.data.data; } else { //未找到商品的活动 - isok = 0; + is_flag = 0; } - item1.act = res.data.data; }) - if (!isok) { getApp().my_warnning("组合购的活动已经过期", 0, th); return false; } - + var url1 = "/api/weshop/prom/zhbuyGoods/page"; + var req_data = { + page: 1, + pageSize: 2000, + store_id: os.stoid, + zh_id: item1.prom_id, + } + await getApp().request.promiseGet(url1, { + data: req_data + }).then(res => { + if (ut.ajax_ok(res)) { + var gdlist = res.data.data.pageData; + gdlist.forEach(i=>{ + if(item1.goods_id==i.goods_id&&!is_flag){ + item1.prom_type=0; + item1.prom_type1=0; + item1.prom_id=0; + item1.prom_id1=0 + } + }) + th.data.zuhe_map_good[item1.prom_id]=gdlist; + } + }) } } //在分组的时候，就不要再调用接口，await for (var i = 0; i < carr.length; i++) { var item = carr[i]; - //-- 如果是等级会员注册返回 -- if (is_card_back) { th.data.card_name = th.data.userinfo.card_field; @@ -666,22 +688,26 @@ Page({ //存储不同活动的商品列表 u_item.zh_prom_goods = {}; for (let var1 in obj) { - var h_item = obj[var1]; - var gdlist = null; - var url1 = "/api/weshop/prom/zhbuyGoods/page"; - var req_data = { - page: 1, - pageSize: 2000, - store_id: os.stoid, - zh_id: h_item.prom_id, - } - await getApp().request.promiseGet(url1, { - data: req_data - }).then(res => { - if (ut.ajax_ok(res)) { - gdlist = res.data.data.pageData; - } - }) + var h_item=obj[var1]; + var gdlist= th.data.zuhe_map_good[h_item.prom_id]; + //获取活动需要的商品列表 + // u_item.zh_prom_goods[h_item.prom_id]=gdlist; + // var h_item = obj[var1]; + // var gdlist = null; + // var url1 = "/api/weshop/prom/zhbuyGoods/page"; + // var req_data = { + // page: 1, + // pageSize: 2000, + // store_id: os.stoid, + // zh_id: h_item.prom_id, + // } + // await getApp().request.promiseGet(url1, { + // data: req_data + // }).then(res => { + // if (ut.ajax_ok(res)) { + // gdlist = res.data.data.pageData; + // } + // }) //获取活动需要的商品列表 u_item.zh_prom_goods[h_item.prom_id] = {gdlist: gdlist, act: h_item.act}; } @@ -779,10 +805,10 @@ Page({ } } - if(gg.prom_type){ + gd.prom_type=gg.prom_type; gd.prom_id=gg.prom_id; - } + switch (gd.prom_type) { case 0: case 2: diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index c93d58c..04b9dfd 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1399,7 +1399,7 @@ Page({ add_cart_next(e, t, a, o, newd, CanOutQty) { var th = this, i = getApp().request; //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ - if (o.prom_type != 1 && ((o.prom_type != 6 && o.prom_type != 4) || th.data.is_normal)) { + if ((o.prom_type != 1 || o.prom_id<=0) && ((o.prom_type != 6 && o.prom_type != 4) || th.data.is_normal)) { var conf = th.data.bconfig; if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) { var s_list = JSON.parse(conf.switch_list); @@ -3529,6 +3529,12 @@ Page({ success: function (t) { if (t.data.code == 0) { var g_buy_num = t.data.data.goodsbuynum; + + //如果是秒杀的时候 + if(th.data.prom_type==0 && gd.prom_type == 1 ){ + gd.prom_type= 0; + } + if (gd.prom_type == 1 || gd.prom_type == 2 || gd.prom_type == 4 || gd.prom_type == 6) { //----获取活动购买数---- getApp().request.get("/api/weshop/ordergoods/getUserBuyGoodsNum", { diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 73e6d66..7b79d40 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -67,7 +67,7 @@ Page({ getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ var dis=rs.data.data; for(var i in d_list){ - if(d_list[i].name=='我的分销' && dis && dis.switch==0){ + if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){ d_list.splice(i,1); } }