From 395b295bb71e0aa3c9383f8f17516ee556ec276f Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Mon, 22 Mar 2021 11:34:18 +0800 Subject: [PATCH] 1、测试返回的bug 4条修复 --- components/diy_advertising/diy_advertising.wxml | 4 ++-- components/diy_advertising/diy_advertising.wxss | 4 ++-- components/diy_searchbox/diy_searchbox.wxml | 10 +++++----- components/diy_store_select/diy_store_select.wxss | 2 +- pages/cart/cart/cart.js | 13 +++++++------ pages/goods/goodsInfo/goodsInfo.js | 12 +++++++----- pages/index/index/index.wxss | 2 +- pages/user/order_detail/order_detail.js | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------- pages/user/order_list/order_list.js | 27 ++++++++++++++++++--------- utils/util.js | 2 +- 10 files changed, 119 insertions(+), 82 deletions(-) diff --git a/components/diy_advertising/diy_advertising.wxml b/components/diy_advertising/diy_advertising.wxml index a8e1a3b..8a0396c 100644 --- a/components/diy_advertising/diy_advertising.wxml +++ b/components/diy_advertising/diy_advertising.wxml @@ -409,14 +409,14 @@ style="height:{{max_sw_height}}rpx" > - + {{item.title}} - + {{item.title}} diff --git a/components/diy_advertising/diy_advertising.wxss b/components/diy_advertising/diy_advertising.wxss index 5ca3b76..294d632 100644 --- a/components/diy_advertising/diy_advertising.wxss +++ b/components/diy_advertising/diy_advertising.wxss @@ -315,8 +315,6 @@ .swiper { height: auto; width: 100%; - padding-bottom: 7rpx; - padding-top: 7rpx; /* background-color: palevioletred; */ } @@ -324,6 +322,8 @@ height: auto; width: 100%; margin: 0; + padding: 0; + vertical-align: top; } .sw_con{ position: relative; diff --git a/components/diy_searchbox/diy_searchbox.wxml b/components/diy_searchbox/diy_searchbox.wxml index f7feb1e..b0ddc1e 100644 --- a/components/diy_searchbox/diy_searchbox.wxml +++ b/components/diy_searchbox/diy_searchbox.wxml @@ -19,10 +19,10 @@ - + - - + + @@ -37,8 +37,8 @@ - - + + diff --git a/components/diy_store_select/diy_store_select.wxss b/components/diy_store_select/diy_store_select.wxss index 171a95c..105ad22 100644 --- a/components/diy_store_select/diy_store_select.wxss +++ b/components/diy_store_select/diy_store_select.wxss @@ -1,7 +1,7 @@ .store_sele{width: 100%;z-index: 8; height: 88rpx; padding: 0 15rpx;position: fixed; color: white; top: 0; left: 0; background-color: #ff7295; font-size: 30rpx; } - .store_sele1{ height: 88rpx; padding: 0 15rpx; color: #666;background-color: #fff; font-size: 32rpx;} + .store_sele1{ height: 100rpx; padding: 0 15rpx; color: #666;background-color: #fff; font-size: 32rpx;} .logo_box{ width: 64rpx; height:64rpx;margin-right: 15rpx; } diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 57707e7..a47fa75 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -77,12 +77,13 @@ Page({ //未购买 if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){ is_open_offline=0; - } - //已经过期 - var item=res.data.data.pageData[0]; - if(item.end_time { }).then(res=>{ if(res.data.code==0){ @@ -383,21 +386,24 @@ Page({ title: '提示', content: good.goods_name+'未找到活动' }); + p_ok=0; } if(!r_data.promGoodsLists && good.prom_type==3){ wx.showModal({ title: '提示', content: good.goods_name+'未找到活动' }); + p_ok=0; } }else{ wx.showModal({ title: '提示', content: good.goods_name+'未找到活动' }); - return false; + p_ok=0; } - }) + }) + if(!p_ok) return false; } //商品的普通购买 ，不要进行判断 @@ -410,49 +416,67 @@ Page({ return false; } }else{ - - if((gg.prom_type==1 || gg.prom_type==6 || gg.prom_type==4) && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { - var prom=null; - //---如果是活动的时候--- - var prom=null,th=this; - if(gg.prom_type==1){ - await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+gg.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - } - }) - } - if(gg.prom_type==6){ - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{ - }).then(res=>{ - if(res.data.code==0){ - prom=res.data.data; - } - }) - } - - if(gg.prom_type==4){ - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ - data:{store_id:os.stoid,goods_id:gg.goods_id} - }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ - prom=res.data.data.pageData[0]; - } - }) - } - - if(prom){ - var t_now=ut.gettimestamp(); - if(prom.is_end==0 && prom.start_timet_now){ - wx.showModal({ - title: '提示', - content: gg.goods_name+'商品的活动发生了变化' - }); - return false; - } - } + if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { + var prom=null; + //---如果是活动的时候--- + var prom=null,th=this; + if(gg.prom_type==1){ + await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+gg.prom_id,{ + }).then(res=>{ + if(res.data.code==0){ + prom=res.data.data; + } + }) + } + if(gg.prom_type==6){ + await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{ + }).then(res=>{ + if(res.data.code==0){ + prom=res.data.data; + } + }) + } + + if(gg.prom_type==4){ + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ + data:{store_id:os.stoid,goods_id:gg.goods_id} + }).then(res=>{ + if(res.data.code==0 && res.data.data && res.data.data.pageData){ + prom=res.data.data.pageData[0]; + } + }) + } + + if(prom){ + var t_now=ut.gettimestamp(); + if(prom.is_end==0 && prom.start_timet_now){ + wx.showModal({ + title: '提示', + content: gg.goods_name+'商品的活动发生了变化' + }); + return false; + } + } } + else{ + var t_ok=1; + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { + if(res.data.code==0){ + var r_data=res.data.data; + //-- 参加了全局的优惠活动 -- + if(r_data.promGoodsLists){ + wx.showModal({ + title: '提示', + content: gg.goods_name+'商品的活动发生了变化' + }); + t_ok=0; + } + } + }) + if(!t_ok) return false; + //-- 如果有参加线下取价 -- + if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+","; + } //赠品和搭配购不判断商品金额 var isok=1; var card_field=th.data.card_field; @@ -614,6 +638,7 @@ Page({ title: '提示', content: good.goods_name + '商品的价格发生了变化' }); + return false; } } diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 487b715..cdccdff 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -109,12 +109,14 @@ Page({ //未购买 if(res.data.code!=0 || !res.data.data || !res.data.data.pageData || !res.data.data.pageData.length){ is_open_offline=0; - } - //已经过期 - var item=res.data.data.pageData[0]; - if(item.end_time { - }).then(res=>{ if(res.data.code==0){ var r_data=res.data.data; if(!r_data.collocationPromList && good.prom_type==5){ @@ -503,21 +505,24 @@ Page({ title: '提示', content: good.goods_name+'未找到活动' }); + p_ok=0; } if(!r_data.promGoodsLists && good.prom_type==3){ wx.showModal({ title: '提示', content: good.goods_name+'未找到活动' }); + p_ok=0; } }else{ wx.showModal({ title: '提示', content: good.goods_name+'未找到活动' }); - return false; + p_ok=0; } - }) + }) + if(!p_ok) return false; } //商品的普通购买 ，不要进行判断 @@ -575,6 +580,7 @@ Page({ } } else{ + var t_ok=1; await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { if(res.data.code==0){ var r_data=res.data.data; @@ -584,9 +590,11 @@ Page({ title: '提示', content: gg.goods_name+'商品的活动发生了变化' }); + t_ok=0; } } }) + if(!t_ok) return false; //-- 如果有参加线下取价 -- if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+","; } @@ -751,6 +759,7 @@ Page({ title: '提示', content: good.goods_name + '商品的价格发生了变化' }); + return false; } } diff --git a/utils/util.js b/utils/util.js index db116ab..5ea96e6 100644 --- a/utils/util.js +++ b/utils/util.js @@ -463,7 +463,7 @@ function sha1(s) { function convert_arr_key(list,key){ let keyObs = {} list.forEach(item => { - keyObs[item.key] = item + keyObs[item[key]] = item }) return keyObs; } -- libgit2 0.21.4