From deec2f5a67711b6c9244b81ef354938825abbf87 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Mon, 19 Jul 2021 14:52:54 +0800 Subject: [PATCH] 测试报警。5分钟多少次的 --- packageA/pages/goodsInfo/goodsInfo.js | 26 +++++++++++++++++--------- packageA/pages/profile/profile.js | 4 +++- packageA/pages/prom_list/prom_list.js | 4 +++- pages/cart/cart2/c_filter.wxs | 1 + pages/cart/cart2/cart2.js | 2 ++ pages/cart/cart2_inte/cart2_inte.js | 9 ++++++--- pages/cart/cart2_pt/cart2_pt.js | 9 ++++++--- pages/cart/cart_wk/cart_wk.js | 8 +++++--- pages/goods/goodsInfo/goodsInfo.js | 7 ++++--- pages/team/team_show/team_show.js | 5 ++++- pages/user/userinfo/userinfo.js | 1 + 11 files changed, 52 insertions(+), 24 deletions(-) diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index ef62e6d..3580f61 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -320,7 +320,7 @@ Page({ //如果有开启近距离的话,同时距离优不一样了 if (that.data.lat != null) { //如果经纬度有变化的话 - if( appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ + if(e && appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ that.data.fir_def_store=e; that.setData({ def_pick_store: e, @@ -884,7 +884,7 @@ Page({ data: dd, }).then(res => { var e = res; - if (e.data.code == 0) { + if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { //--普通门店排版-- setTimeout(function(){ var sto_list=th.data.data.storageId; @@ -1078,12 +1078,16 @@ Page({ }); //-----如果没有默认门店，要取第一个门店作为默认店------ if (!th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage) { - th.setData({ - def_pick_store:e.data.data.pageData[0], - sto_sele_name: e.data.data.pageData[0].pickup_name, - sto_sele_id: e.data.data.pageData[0].pickup_id, - sto_sele_distr: e.data.data.pageData[0].distr_type - }) + + if(e.data.data && e.data.data.pageData && e.data.data.pageData.length>0){ + th.setData({ + def_pick_store:e.data.data.pageData[0], + sto_sele_name: e.data.data.pageData[0].pickup_name, + sto_sele_id: e.data.data.pageData[0].pickup_id, + sto_sele_distr: e.data.data.pageData[0].distr_type + }) + } + } } }, @@ -1857,7 +1861,8 @@ Page({ }); return false; } - + + if(!item) return false; th.setData({ def_pick_store: item, @@ -1961,6 +1966,9 @@ Page({ } }); + + if(!item) return false; + th.setData({ def_pick_store: item, sto_sele_name: item.pickup_name, diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 164645f..8d346f3 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -169,6 +169,8 @@ Page({ var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + + if(!item) return false; th.setData({ def_pick_store: item, stoname: item.pickup_name, @@ -255,7 +257,7 @@ Page({ data: dd, success:function(res){ var e = res; - if (e.data.code == 0) { + if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { //-- 如果有默认选择门店的时候，要把默认门店放在第一位 -- if (th.data.def_pick_store) { for (var k = 0; k < e.data.data.pageData.length; k++) { diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index ddfd0af..cb2b603 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -722,7 +722,9 @@ Page({ get_sto(e) { var th = this,that=this; var timer_get = setInterval(function() { - if (th.data.is_get_local_ok == 0) return false; + if (th.data.is_get_local_ok == 0) return false; + if(!th.data.data) return false; + var dd = null, c_list=th.data.collocationList, i = getApp().request; diff --git a/pages/cart/cart2/c_filter.wxs b/pages/cart/cart2/c_filter.wxs index 7216131..e8eda3e 100644 --- a/pages/cart/cart2/c_filter.wxs +++ b/pages/cart/cart2/c_filter.wxs @@ -1,5 +1,6 @@ var filters = { toFix:function(val,count){ + if(!val) return parseFloat(0).toFixed(count); return val.toFixed(count) }, format_time:function(ts,isFull) { diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 648ea4c..8768ba3 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -583,6 +583,8 @@ Page({ a.get("/api/weshop/goods/get/" + oo.stoid+"/"+e, { success:async function (t) { var gd = t.data.data; + if(!gd) return false; + t.data.data.original_img = oo.imghost + t.data.data.original_img; t.data.data['buynum'] = gg.goods_num; var distr_t=0,et=0 diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index 3722eba..6bbe117 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -301,6 +301,8 @@ Page({ a.get("/api/weshop/goods/get/" + oo.stoid+"/"+e, { success:async function (t) { var gd = t.data.data; + if(!gd) return false; + t.data.data.original_img = oo.imghost + t.data.data.original_img; t.data.data['buynum'] = gg.goods_num; var distr_t=0,et=0 @@ -1037,9 +1039,10 @@ Page({ if (rse.data.code==0){ getApp().globalData.userInfo.def_exp_code=is_shipping_code; th.setData({ open_express: 0 }); - //----计算此时购物车的价格---- - if(th.data.is_b_now==1) th.calculatePrice2(); - else th.calculatePrice(); + //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19-------- + //if(th.data.is_b_now==1) th.calculatePrice2(); + //else th.calculatePrice(); + th.calculatePrice2(); } } }) diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 716bc87..9104849 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -169,6 +169,8 @@ Page({ a.get("/api/weshop/goods/get/" + oo.stoid+"/"+gg.goods_id, { success: function (t) { var gd = t.data.data; + if(!gd) return false; + t.data.data.original_img = oo.imghost + t.data.data.original_img; t.data.data['buynum'] = gg.goods_num; console.log(t.data.data); @@ -900,9 +902,10 @@ Page({ if (rse.data.code==0){ getApp().globalData.userInfo.def_exp_code=is_shipping_code; th.setData({ open_express: 0 }); - //----计算此时购物车的价格---- - if(th.data.is_b_now==1) th.calculatePrice2(); - else th.calculatePrice(); + //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19---- + //if(th.data.is_b_now==1) th.calculatePrice2(); + //else th.calculatePrice(); + th.calculatePrice2(); } } }) diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index d6e7cdd..4af50b5 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -243,6 +243,7 @@ Page({ tail_money = parseFloat(tail_money); order.tail_money = tail_money; + if(!goods) return false; //--判断物流-- if (goods.distr_type) distr_type = goods.distr_type; @@ -619,9 +620,10 @@ Page({ if (rse.data.code == 0) { getApp().globalData.userInfo.def_exp_code = is_shipping_code; th.setData({ open_express: 0 }); - //----计算此时购物车的价格---- - if (th.data.is_b_now == 1) th.calculatePrice2(); - else th.calculatePrice(); + //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19---- + //if (th.data.is_b_now == 1) th.calculatePrice2(); + //else th.calculatePrice(); + th.calculatePrice2(); } } }) diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index a76ca71..20a6f85 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -449,7 +449,7 @@ Page({ //如果有开启近距离的话,同时距离优不一样了 if (that.data.lat != null) { //如果经纬度有变化的话 - if( appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ + if(e && appd.lat==that.data.lat && appd.lon==that.data.lon && e.distance>0 ){ //that.data.fir_def_store=e; // that.setData({ // def_pick_store: e, @@ -2385,7 +2385,7 @@ Page({ }).then(res => { var e = res; - if (e.data.code == 0) { + if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 if(dd.lat && (!th.data.def_pick_store || JSON.stringify(th.data.def_pick_store)=='{}') && th.data.bconfig && th.data.bconfig.is_sort_storage){ @@ -4831,7 +4831,8 @@ Page({ var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } - + + if(!th.data.sele_g) return false; //判断门店的配送方式是不是匹配 var g_distr_type = th.data.sele_g.distr_type; if(item.distr_type!=0 && g_distr_type!=0 && item.distr_type!=g_distr_type){ diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index c8af4a1..afa018d 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -575,6 +575,7 @@ Page({ } //--定时器推迟一下-- setTimeout(function () { + if(!th.data.goods) return false; var g_distr_type=th.data.goods.distr_type; //--如果默认门店的配送方式不对，就不能被选择-- if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){ @@ -1086,6 +1087,7 @@ Page({ var th = this,that=this; var timer_get = setInterval(function() { if (th.data.is_get_local_ok == 0) return false; + if (th.data.goods) return false; var dd = null, i = getApp().request; var g_distr_type = th.data.goods.distr_type; @@ -1120,7 +1122,7 @@ Page({ data: dd, }).then(res => { var e = res; - if (e.data.code == 0) { + if (e.data.code == 0 && e.data.data && e.data.data.pageData && e.data.data.pageData.length>0) { //如果有开启距离的功能，没有设置默认门店，要用最近的门店作为默认门店 if(dd.lat && !th.data.def_pick_store && th.data.bconfig && th.data.bconfig.is_sort_storage){ @@ -1366,6 +1368,7 @@ Page({ var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; th.setData({ diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index 3aa5dea..0b6f43e 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -215,6 +215,7 @@ Page({ var index = th.data.sec_pick_index; item = th.data.sec_sto.s_arr[index]; } + if(!item) return false; th.setData({ def_pick_store: item, stoname: item.pickup_name, -- libgit2 0.21.4