From 251a46db141f2a0f6cf0e6a041144a82ffa0d593 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Fri, 24 Dec 2021 17:44:49 +0800 Subject: [PATCH] 优化bug --- components/diy_goodsGroup/diy_goodsGroup.js | 6 ++++-- packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js | 3 ++- pages/cart/cart/cart.js | 29 ++++++++++++++++++++++------- pages/goods/goodsList/goodsList.js | 9 ++++++--- pages/goods/search/search.js | 56 +++++++++++++++++++++++--------------------------------- pages/user/order_detail/order_detail.js | 21 ++++++++++++++++++--- pages/user/order_list/order_list.js | 2 +- 7 files changed, 76 insertions(+), 50 deletions(-) diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index ebfd0dd..4bee7f0 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -432,7 +432,9 @@ Component({ set_good:async function(goods){ var now=ut.gettimestamp(); var th=this; - if(!goods || goods.length==0) return false; + if(!goods || goods.length==0) return false; + var user_id=getApp().globalData.userInfo.user_id; + if(!user_id) user_id=0; for(var i in goods){ var val=goods[i]; var item = {}; @@ -441,7 +443,7 @@ Component({ var url="/api/weshop/activitylist/getGoodActInfo"; var req_data={ - store_id:os.stoid,goodsidlist:val.goods_id,is_detail:1 + store_id:os.stoid,goodsidlist:val.goods_id,is_detail:1,user_id:user_id }; //获取商品的实际活动 diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js index d6c761b..84762b1 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js @@ -531,6 +531,7 @@ Page({ check_more_order:async function(item){ var pickup=null,th=this; var user_id=getApp().globalData.userInfo.user_id; + if(!user_id) user_id=0; wx.showLoading(); //--------获取门店----------- await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { @@ -617,7 +618,7 @@ Page({ var url="/api/weshop/activitylist/getGoodActInfo"; var req_data={ - store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1 + store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1,user_id:user_id }; await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ if(res.data.code==0){ diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 2d496ce..bcc71ec 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -607,6 +607,12 @@ Page({ //如果是阶梯购的时候 if(item.prom_type==10){ + + var url = '/api/weshop/cart/update'; + getApp().request.put(url, { + data:{id:item.id,store_id:oo.stoid,prom_type:10,prom_id:act.id} + }); + if(!th.data.ladder_map[item.prom_id]){ //如果有阶梯购，要判断身份 var isok = 1; @@ -642,10 +648,6 @@ Page({ item.prom_type=0; item.prom_id=0; }else{ - var url = '/api/weshop/cart/update'; - getApp().request.put(url, { - data:{id:item.id,store_id:oo.stoid,prom_type:10,prom_id:act.id} - }); th.data.ladder_map[item.prom_id]=act; //-- 获取阶梯规则 -- @@ -2242,7 +2244,7 @@ Page({ //如果会员是等级会员,商品有等级价,且不是活动商品 if (card_field && val[card_field] > 0 && - ((val.prom_type == 0 && g_arr[i].prom_type==0) || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || val.prom_type == 7 || normal_arr[val.goods_id])) { + ((val.prom_type == 0 && g_arr[i].prom_type==0) || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || val.prom_type == 7 || val.prom_type == 10 || normal_arr[val.goods_id])) { if (g_arr[i].goods_price != val[card_field]) { isok = 0; gname = val.goods_name; @@ -2681,17 +2683,30 @@ Page({ //跳转到商品 go_gd:function (e) { + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; var gd= e.currentTarget.dataset.gd; var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; var url="/api/weshop/activitylist/getGoodActInfo"; var req_data={ - store_id:os.stoid,goodsidlist:gd,is_detail:1 + store_id:os.stoid,goodsidlist:gd,is_detail:1,user_id:user_id }; //获取秒杀的多规格 getApp().request.promiseGet(url, {data:req_data}).then(res=>{ if(res.data.code==0 && res.data.data){ if(res.data.data.length==1){ - good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; + var item=res.data.data[0]; + switch (item.prom_type){ + case 9: + good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.prom_id; + break; + case 8: + good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id + break; + default: + good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id+"&prom_type=1"; + break + } } getApp().goto(good_url); diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 66f2cc5..287403a 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -238,6 +238,9 @@ Page({ var e = this,th=e; this.data.requestUrl = t; + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; //不是商品分组的，不是默认排序的 if(t.indexOf("group_id")==-1 || e.data.tabname!="sort" ){ t += "&orderField=" + e.data.tabname; @@ -254,10 +257,10 @@ Page({ for(let i in res.data.data.pageData){ let item=res.data.data.pageData[i]; item.original_img = th.data.url + item.original_img; - + /*-- var url="/api/weshop/activitylist/getGoodActInfo"; var req_data={ - store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1 + store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1,user_id:user_id }; //获取商品的实际活动 await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ @@ -265,7 +268,7 @@ Page({ item.prom_type=res.data.data[0].prom_type; item.prom_id=res.data.data[0].act_id; } - }) + })--*/ var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 var prom_id=item.prom_id; diff --git a/pages/goods/search/search.js b/pages/goods/search/search.js index 951734c..51a6ddb 100644 --- a/pages/goods/search/search.js +++ b/pages/goods/search/search.js @@ -145,6 +145,10 @@ Page({ t += "&user_id=" + getApp().globalData.userInfo.user_id; } this.data.requestUrl = t; + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid,orderField: e.data.tabname, orderType: e.data.adname, page: e.data.currentPage}}).then(async res=>{ th.data.loading=0; if(ut.ajax_ok(res)){ @@ -152,9 +156,11 @@ Page({ for(let i in res.data.data.pageData){ let item=res.data.data.pageData[i]; item.original_img = th.data.url + item.original_img; + + /*-- var url="/api/weshop/activitylist/getGoodActInfo"; var req_data={ - store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1 + store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1,user_id:user_id }; //获取商品的实际活动 await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ @@ -162,7 +168,7 @@ Page({ item.prom_type=res.data.data[0].prom_type; item.prom_id=res.data.data[0].act_id; } - }) + })--*/ var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 var prom_id=item.prom_id; @@ -170,8 +176,6 @@ Page({ var url = ""; switch (prom_type){ case 1: - var user_id=getApp().globalData.user_id; - if(!user_id) user_id=0; url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id; break; case 2: @@ -211,34 +215,21 @@ Page({ var flag=null; if(res.data.code==0 && res.data.data){ prom=res.data.data; - await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1",{ - data:{ - store_id: oo.stoid, - is_end: 0, - is_show: 1, - user_id: getApp().globalData.user_id, - pageSize:1000 - } - }).then(pd=>{ - let pd_list=pd.data.data.pageData; - if(res.data.code==0 && pd_list.length>0){ - flag =pd_list.some(pd=>{ - return pd.goods_id==item.goods_id - }) - } - if (prom != null && prom.is_end==0 && prom.end_time>now && flag && (prom.start_timenow && (prom.start_time{ if(res.data.code==0){ @@ -1604,17 +1604,32 @@ Page({ //跳转到商品 go_gd:function (e) { + + var user_id=getApp().globalData.user_id; + if(!user_id) user_id=0; + var gd= e.currentTarget.dataset.gd; var good_url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; var url="/api/weshop/activitylist/getGoodActInfo"; var req_data={ - store_id:os.stoid,goodsidlist:gd,is_detail:1 + store_id:os.stoid,goodsidlist:gd,is_detail:1,user_id:user_id }; //获取秒杀的多规格 getApp().request.promiseGet(url, {data:req_data}).then(res=>{ if(res.data.code==0 && res.data.data){ if(res.data.data.length==1){ - good_url+="&prom_type="+res.data.data[0].prom_type+"&prom_id="+res.data.data[0].act_id; + var item=res.data.data[0]; + switch (item.prom_type){ + case 9: + good_url= '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + gd + '&group_id=' + item.prom_id; + break; + case 8: + good_url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id + break; + default: + good_url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gd+"&prom_id="+item.prom_id+"&prom_type=1"; + break + } } getApp().goto(good_url); diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 3623e3c..33661b6 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -1291,7 +1291,7 @@ Page({ var url="/api/weshop/activitylist/getGoodActInfo"; var req_data={ - store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1 + store_id:g_item.store_id,goodsidlist:g_item.goods_id,is_detail:1,user_id:user_id }; await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ if(res.data.code==0){ -- libgit2 0.21.4