From 6984e5ef4c2eb97f7debc1d65999346697922d56 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Thu, 14 Mar 2024 11:25:22 +0800 Subject: [PATCH] 1、自定义模板的点击跳转 2、服务卡项购买显示已售，限购 3、订单列表显示异常的优化 --- components/diy_groupbuy/diy_groupbuy.js | 28 +++++++++++++++++++--------- components/diy_groupbuy/diy_groupbuy.wxml | 8 ++++++-- components/diy_pingd_buy/diy_pingd_buy.js | 10 ++++------ components/diy_pregoods/diy_pregoods.js | 9 ++++----- components/diy_public/diy_public.js | 15 +++++++-------- components/diy_seckill/diy_seckill.js | 9 +++------ packageA/pages/goodsInfo/goodsInfo.js | 36 +++++++++++++++++------------------- packageA/pages/goodsInfo/goodsInfo.wxml | 5 +++-- packageG/pages/group_buy/goodsInfo/goodsInfo.js | 58 ++++++++++++++++++++++------------------------------------ packageG/pages/group_buy/goodsInfo/goodsInfo.wxml | 22 +++++++++++++++++++--- pages/user/order_list/order_list.js | 17 +++++++++++++---- 11 files changed, 117 insertions(+), 100 deletions(-) diff --git a/components/diy_groupbuy/diy_groupbuy.js b/components/diy_groupbuy/diy_groupbuy.js index 28466b5..67c4269 100644 --- a/components/diy_groupbuy/diy_groupbuy.js +++ b/components/diy_groupbuy/diy_groupbuy.js @@ -84,7 +84,7 @@ Component({ if(!user_id){ user_id=0;} //--调用接口,读取团购-- - app.request.promiseGet("/api/weshop/goods/groupBuy/getGoodsList?store_id=" + app.request.promiseGet("/api/weshop/goods/groupBuy/getGoodsList?isnew=1&store_id=" + os.stoid + "&aidlist=" + goodsidlist+"&user_id="+user_id, {}).then(res => { console.log(res,100); //如果秒杀的数组为空的时候 @@ -106,7 +106,7 @@ Component({ if(!user_id){ user_id=0;} var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id}; - getApp().request.promiseGet("/api/weshop/goods/groupBuy/page?page=1&pageSize=9", + getApp().request.promiseGet("/api/weshop/goods/groupBuy/page?isnew=1&page=1&pageSize=9", { isShowLoading: 1, data:req } ).then(res => { if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) { @@ -122,15 +122,11 @@ Component({ var newTime = ut.gettimestamp(), all_array = [], th = this; th.setData({ newTime: newTime }); if (g_id) { - /*--商品队列按照添加的顺序排列--*/ - g_id.forEach(function (val, ind) { + goodslist.forEach(function (vy, indy) { - if (val.goodsid == vy.goods_id) { - if(!vy.id) vy.id=vy.prom_id; all_array.push(vy); - } }) - }) + } else { all_array = goodslist; } @@ -221,11 +217,25 @@ Component({ //跳转到团购列表 go_to_group: function () { - var url="/packageC/pages/group_list/group_list"; getApp().goto(url); + }, + + + //跳转到商品详情，要区别商品和服务卡项 + go_group_buy(e){ + let index=e.currentTarget.dataset.index; + let idx=e.currentTarget.dataset.idx; + let aitem=this.data.goods_array[index][idx]; + var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+aitem.goods_id+"&prom_type=2&prom_id="+aitem.prom_id; + //如果是服务卡项的时候 + if(aitem.goods_type==1){ + url="/packageG/pages/group_buy/goodsInfo/goodsInfo?goods_id="+aitem.goods_id+"&prom_id="+aitem.prom_id; + } + getApp().goto(url); } + diff --git a/components/diy_groupbuy/diy_groupbuy.wxml b/components/diy_groupbuy/diy_groupbuy.wxml index 6701dd3..60aae0b 100644 --- a/components/diy_groupbuy/diy_groupbuy.wxml +++ b/components/diy_groupbuy/diy_groupbuy.wxml @@ -17,7 +17,9 @@ @@ -64,7 +66,9 @@ diff --git a/components/diy_pingd_buy/diy_pingd_buy.js b/components/diy_pingd_buy/diy_pingd_buy.js index 6957bd9..ad2c1be 100644 --- a/components/diy_pingd_buy/diy_pingd_buy.js +++ b/components/diy_pingd_buy/diy_pingd_buy.js @@ -135,14 +135,12 @@ Component({ var th=this,all_array=[]; if(g_id){ /*--商品队列按照添加的顺序排列--*/ - g_id.forEach(function(val, ind) { + goodslist.forEach(function (vy,indy) { - if(val.goodsid==vy.goods_id){ - all_array.push(vy); - //th.setData({goods_array:arr}); - } + all_array.push(vy); + //th.setData({goods_array:arr}); }) - }) + }else{ all_array=goodslist; } diff --git a/components/diy_pregoods/diy_pregoods.js b/components/diy_pregoods/diy_pregoods.js index 69a55f8..adb00cb 100644 --- a/components/diy_pregoods/diy_pregoods.js +++ b/components/diy_pregoods/diy_pregoods.js @@ -112,12 +112,11 @@ Component({ var newTime = ut.gettimestamp(),all_array = [],th=this; th.setData({newTime:newTime}); if(g_id){ - /*--商品队列按照添加的顺序排列--*/ - g_id.forEach(function(val, ind) { - goodslist.forEach(function (vy,indy) { - if(val.goodsid==vy.goods_id){ all_array.push(vy); } + /*--商品队列按照添加的顺序排列--*/ + goodslist.forEach(function (vy,indy) { + all_array.push(vy); }) - }) + }else{ all_array=goodslist; } diff --git a/components/diy_public/diy_public.js b/components/diy_public/diy_public.js index 286c635..40aa366 100644 --- a/components/diy_public/diy_public.js +++ b/components/diy_public/diy_public.js @@ -99,7 +99,7 @@ Component({ if (this.data.prom_type==2) { //团购 this.setData({ prom_text:'已团', - nav1:'/pages/goods/goodsInfo/goodsInfo?', + nav1:'/packageG/pages/group_buy/goodsInfo/goodsInfo?', nav2:'/pages/goods/goodsInfo/goodsInfo?' }) } @@ -168,7 +168,7 @@ Component({ } if (th.data.prom_type==2) { //团购 - gUrl="/api/weshop/goods/groupBuy/getGoodsList?store_id=" + gUrl="/api/weshop/goods/groupBuy/getGoodsList?isnew=1&store_id=" +os.stoid+"&aidlist="+goodsidlist + "&user_id="+user_id; } @@ -278,14 +278,13 @@ Component({ var newTime = ut.gettimestamp(), all_array = [], th = this; th.setData({ newTime: newTime }); if (g_id) { - /*--商品队列按照添加的顺序排列--*/ - g_id.forEach(function (val, ind) { + goodslist.forEach(function (vy, indy) { - if (val.goodsid == vy.goods_id) { - all_array.push(vy); - } + + all_array.push(vy); + }) - }) + } else { all_array = goodslist; } diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js index 62fe10b..d3f6c95 100644 --- a/components/diy_seckill/diy_seckill.js +++ b/components/diy_seckill/diy_seckill.js @@ -157,14 +157,11 @@ Component({ var newTime = ut.gettimestamp(), all_array = [], th = this; th.setData({ newTime: newTime }); if (g_id) { - /*--商品队列按照添加的顺序排列--*/ - g_id.forEach(function (val, ind) { - goodslist.forEach(function (vy, indy) { - if (val.goodsid == vy.goods_id) { + /*--商品队列按照添加的顺序排列--*/ + goodslist.forEach(function (vy, indy) { all_array.push(vy); - } }) - }) + } else { all_array = goodslist; } diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index c394c6a..3b81b91 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -998,6 +998,19 @@ Page({ await this.getactLen().then(async function(res) { redisNums = res; let curNum = th.data.goodsInputNum; + + if(curNum > res) { // t当前增减的数量 + // wx.showModal({ + // title: '超出活动库存', + // }); + getApp().my_warnning('超出活动库存', 0, self); + th.setData({ + goodsInputNum: res || 1 + }); + is_ok=0; + return false; + } + // res: redis可购买数量 console.log('当前可以购买的数量:', res); if(res <= 0) { @@ -1028,24 +1041,9 @@ Page({ if(canBuyNum <= 0) { canBuyNum = 0; - }; - - if(canBuyNum > res) { - if(curNum > res) { // t当前增减的数量 - // wx.showModal({ - // title: '超出活动库存', - // }); - getApp().my_warnning('超出活动库存', 0, self); - th.setData({ - goodsInputNum: res || 1 - }); - is_ok=0; - return false; - }; - }; - - if(canBuyNum <= res) { - if(curNum > canBuyNum) { + } + + if(curNum > canBuyNum) { // wx.showModal({ // title: '超出限购数量', // }); @@ -1055,8 +1053,8 @@ Page({ }); is_ok=0; return false; - } } + }) } diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index 9a2d0e9..04a8a51 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -136,8 +136,9 @@ 限购:{{prom_act.buy_limit}}件 限购:不限 - 已售:{{prom_act.buy_num+prom_act.virtual}}件 - + 已售:{{prom_act.buy_num+prom_act.virtual}}件 + 已售:{{prom_act.buy_num}}件 + diff --git a/packageG/pages/group_buy/goodsInfo/goodsInfo.js b/packageG/pages/group_buy/goodsInfo/goodsInfo.js index 50ffe5f..b18b097 100644 --- a/packageG/pages/group_buy/goodsInfo/goodsInfo.js +++ b/packageG/pages/group_buy/goodsInfo/goodsInfo.js @@ -911,14 +911,6 @@ Page({ if (canBuyNum <= 0) { canBuyNum = 0; } - if (canBuyNum > res) { - getApp().my_warnning('超出活动库存', 0, self); - th.setData({ - goodsInputNum: res || 1 - }); - is_ok = 0; - return false; - } if (curNum > canBuyNum) { getApp().my_warnning('超出限购数量', 0, self); @@ -1100,6 +1092,19 @@ Page({ // 如果数量为0，设置和显示已抢光 // 否则，进一步判断是否超出限购或超出库存 await this.getactLen().then(async function (res) { + + if (t > res) { // t当前增减的数量 + // wx.showModal({ + // title: '超出活动库存', + // }); + getApp().my_warnning('超出活动库存', 0, self); + th.setData({ + goodsInputNum: res || 1, + }); + return false; + } + + // res: redis可购买数量 // console.log('当前可以购买的数量:', res); if (res <= 0) { @@ -1123,35 +1128,16 @@ Page({ if (canBuyNum <= 0) { canBuyNum = 0; } - ; - - if (limited > res) { - if (t > res) { // t当前增减的数量 - // wx.showModal({ - // title: '超出活动库存', - // }); - getApp().my_warnning('超出活动库存', 0, self); - th.setData({ - goodsInputNum: res || 1, - }); - return false; - } - - } - - - if (limited <= res) { - if (t > canBuyNum) { - // wx.showModal({ - // title: '超出限购数量', - // }); - getApp().my_warnning('超出限购数量', 0, self); - th.setData({ - goodsInputNum: canBuyNum || 1, - }); - return false; - } + if (t > canBuyNum) { + // wx.showModal({ + // title: '超出限购数量', + // }); + getApp().my_warnning('超出限购数量', 0, self); + th.setData({ + goodsInputNum: canBuyNum || 1, + }); + return false; } diff --git a/packageG/pages/group_buy/goodsInfo/goodsInfo.wxml b/packageG/pages/group_buy/goodsInfo/goodsInfo.wxml index c7507a5..f1f0047 100644 --- a/packageG/pages/group_buy/goodsInfo/goodsInfo.wxml +++ b/packageG/pages/group_buy/goodsInfo/goodsInfo.wxml @@ -83,8 +83,8 @@ ￥{{prom_price}} - 零售价：￥{{filters.toFix(front_g.market_price,2)}} - ￥{{filters.toFix(front_g.shop_price,2)}} + 零售价：￥{{filters.toFix(data.show_price,2)}} + ￥{{filters.toFix(data.shop_price,2)}} @@ -133,12 +133,28 @@ 限购:{{prom_act.buy_limit}}件 限购:不限 - 已售:{{prom_act.buy_num+prom_act.virtual}}件 + 已售:{{prom_act.buy_num+prom_act.virtual}}件 + 已售:{{prom_act.buy_num}}件 + + + + 总数量：{{ prom_act.goods_num+prom_act.virtualNum}}件 + + 限购:{{prom_act.buy_limit}}件 + 限购:不限 + 已售:{{prom_act.buy_num+prom_act.virtualNum}}件 + 已售:{{prom_act.buy_num}}件 + + + + + + 销量：{{data.sales_sum}} 有效天数：{{data.validDays?data.validDays:'不限'}} diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 310c841..b574524 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -91,14 +91,17 @@ Page({ var startDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(); - if (t.index && t.tabindex) { + if (t.index) { + if(t.tabindex) t.tabindex=0; this.setData({ currentIndex: t.index, tabIndex: t.tabindex, }); - this.clickTab(); + //this.clickTab(); }; + + this.setData({ currentDate: this.currentDate(), startDate: startDate, @@ -185,8 +188,13 @@ Page({ } }, 1) - th.resetData(), th.requestOrderList(th.data.activeCategoryId); - th.clickTab(); + th.resetData(); + if(th.data.currentIndex>0){ + th.clickTab(); + }else{ + th.requestOrderList(th.data.activeCategoryId); + } + },1500); }, @@ -2735,6 +2743,7 @@ Page({ app.request.promiseGet(url, { data: data }).then(async res => { + wx.hideLoading(); // 关闭加载状态 th.data.is_load2 = 0; // 请求成功 -- libgit2 0.21.4