From 4b823f571591521ddb49031420e00cfcc6abc0ce Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Wed, 15 Dec 2021 15:06:58 +0800 Subject: [PATCH] pageData没有判断空，报警优化 --- packageA/pages/goodsInfo/goodsInfo.js | 2 +- packageA/pages/profile/profile.js | 16 +++++++++------- packageA/pages/prom_list/prom_list.js | 4 ++-- pages/activity/pind_list/pind_list.js | 5 +++-- pages/activity/seckill_list/seckill_list.js | 4 ++-- pages/cart/cart/cart.js | 2 +- pages/cart/cart2_inte/cart2_inte.js | 2 +- pages/goods/goodsInfo/goodsInfo.js | 10 ++++++---- pages/goods/goodsList/goodsList.js | 2 +- pages/payment/pay_success/pay_success.js | 28 ++++++++++++++++++---------- pages/team/team_show/team_show.js | 6 ++++-- pages/user/cardinfo/cardinfo.js | 4 ++-- pages/user/index/index.js | 4 ++-- pages/user/my_service/appment_main.js | 2 +- pages/user/order_detail/order_detail.js | 4 ++-- pages/user/userqy/userqy.js | 8 ++++---- 16 files changed, 59 insertions(+), 44 deletions(-) diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index d92a8ec..379e3f8 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -333,7 +333,7 @@ Page({ getApp().request.promiseGet("/api/weshop/pickup/list",{ data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon, is_pos: 1}, }).then(res=>{ - if(res.data.code==0){ + if(ut.ajax_ok(res)){ e=res.data.data.pageData[0]; if (e){ e.is_no_dis=ee.is_no_dis; diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 19609b7..3878500 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -1246,13 +1246,15 @@ Page({ getApp().request.promiseGet("/api/weshop/pickup/list", { data: dd, }).then(res => { - var top_store=res.data.data.pageData[0]; - th.setData({ - stoname: top_store.pickup_name, - sto_sele_name: top_store.pickup_name, - sto_sele_id: top_store.pickup_id, - sto_sele_distr: top_store.distr_type, - }) + if(ut.ajax_ok(res)){ + var top_store=res.data.data.pageData[0]; + th.setData({ + stoname: top_store.pickup_name, + sto_sele_name: top_store.pickup_name, + sto_sele_id: top_store.pickup_id, + sto_sele_distr: top_store.distr_type, + }) + } }) }else{ diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index f4349c0..546becc 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -120,7 +120,7 @@ Page({ getApp().request.promiseGet("/api/weshop/pickup/list",{ data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1}, }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ e=res.data.data.pageData[0]; if (e){ appd.pk_store=e; @@ -1030,7 +1030,7 @@ Page({ }) }).then(res=>{ if(res.data.code==0){ - if(res.data.data.pageData){ + if(res.data.data.pageData && res.data.data.pageData.length){ var plist=res.data.data.pageData; var def_pick_store=th.data.def_pick_store; //以原来的数组为外循环，保证距离的顺序 diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js index c12e46f..254970d 100644 --- a/pages/activity/pind_list/pind_list.js +++ b/pages/activity/pind_list/pind_list.js @@ -129,12 +129,13 @@ Page({ await getApp().request.promiseGet(i, {isShowLoading:1,data:{store_id:os.stoid,is_end:0,is_show:1}} ).then(res=>{ - plist=res.data.data.pageData; + if(ut.ajax_ok(res)) plist=res.data.data.pageData; }); - if(plist.length<=0){ + if(!plist || plist.length<=0){ getApp().showWarning("没有更多数据"); th.data.ismore=0; + return false; } //--循环读取接口--- for(var i=0;i{ - plist=res.data.data.pageData; - console.log("是什么即将开始",plist); + if(ut.ajax_ok(res)) plist=res.data.data.pageData; + }); if(plist.length<=0){ diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index c8695bf..38dc02a 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -1778,7 +1778,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} }).then(res=>{ - if(res.data.code==0){ + if(ut.ajax_ok(res)){ plist=res.data.data.pageData[0]; } }) diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index 6bbe117..0f2a7f6 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -839,7 +839,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{ data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid} }).then(res=>{ - if(res.data.code==0){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ plist=res.data.data.pageData[0]; } }) diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 9331966..bae9519 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2256,10 +2256,12 @@ Page({ switch (goodsinfo.prom_type) { case 1: - await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + goodsinfo.prom_id, { - }).then(res => { - if (res.data.code == 0) prom = res.data.data; - }) + + if(goodsinfo.prom_id) { + await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + goodsinfo.prom_id, {}).then(res => { + if (res.data.code == 0) prom = res.data.data; + }) + } break; case 6: diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 0268b85..9c6a6e5 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -152,7 +152,7 @@ Page({ //-- 获取 -- await getApp().request.promiseGet("/api/weshop/prom/gift/page?id="+content.gift+"&store_id="+oo.stoid, { }).then(res => { - if(res.data.code==0) + if(ut.ajax_ok(res)) arr[i].content.gift_name=res.data.data.pageData[0].goods_name; }) } diff --git a/pages/payment/pay_success/pay_success.js b/pages/payment/pay_success/pay_success.js index a48406b..9b415c8 100644 --- a/pages/payment/pay_success/pay_success.js +++ b/pages/payment/pay_success/pay_success.js @@ -1,5 +1,6 @@ var e = getApp(); var regeneratorRuntime = require('../../../utils/runtime.js'); +var ut = require("../../../utils/util.js"); Page({ /** * 页面的初始数据 @@ -30,21 +31,28 @@ Page({ if(type==1){ await getApp().request.promiseGet("/api/weshop/order/page", {data:{store_id:e.globalData.setting.stoid,order_sn:order_sn}}).then(res=>{ - order=res.data.data.pageData[0]; - th.setData({order:order,order_sn:order_sn}) + if(ut.ajax_ok(res)){ + order=res.data.data.pageData[0]; + th.setData({order:order,order_sn:order_sn}) + } + }) }else{ await getApp().request.promiseGet("/api/weshop/order/page", {data:{store_id:e.globalData.setting.stoid,parent_sn:order_sn}}).then(res=>{ - var allmoney=0,user_money=0; - for(var i in res.data.data.pageData){ - var item=res.data.data.pageData[i]; - allmoney+=item.order_amount; - user_money += item.user_money?item.user_money:0; - } - order=res.data.data.pageData[0]; - th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money}) + if(ut.ajax_ok(res)){ + var allmoney=0,user_money=0; + for(var i in res.data.data.pageData){ + var item=res.data.data.pageData[i]; + allmoney+=item.order_amount; + user_money += item.user_money?item.user_money:0; + } + order=res.data.data.pageData[0]; + th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money}) + } + + }) } //--获取门店-- diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 83ba2f1..4e3f654 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -561,7 +561,9 @@ Page({ is_show: 1 } }).then(res => { - pageteam = res.data.data.pageData; + if(ut.ajax_ok(res)){ + pageteam = res.data.data.pageData; + } }); //-- 获取用户的默认门店 -- @@ -604,7 +606,7 @@ Page({ getApp().request.promiseGet("/api/weshop/pickup/list",{ data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon,is_pos: 1}, }).then(res=>{ - if(res.data.code==0){ + if(ut.ajax_ok(res)){ e=res.data.data.pageData[0]; if (e){ appd.pk_store=e; diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index 34da177..7c9780e 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -765,7 +765,7 @@ Page({ var th = this,is_card = 0,end_time=0; await getApp().request.promiseGet("/store/storemoduleendtime/page?store_id="+os.stoid+"&type=3", {1:1}).then(res => { - if (res.data.code == 0) { + if (ut.ajax_ok(res)) { end_time=res.data.data.pageData[0].end_time; } }) @@ -828,7 +828,7 @@ Page({ var th = this,card_id =e.currentTarget.dataset.cid ,end_time=0; await getApp().request.promiseGet("/store/storemoduleendtime/page?store_id="+os.stoid+"&type=3", {1:1}).then(res => { - if (res.data.code == 0) { + if (ut.ajax_ok(res)) { end_time=res.data.data.pageData[0].end_time; } }) diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 935d344..0f68d0e 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -63,7 +63,7 @@ Page({ //-- 读取会员中心按钮列表 -- getApp().request.get("/api/weshop/userTool/page?pageSize=100", { success:function(res){ - if(res.data.code==0 ){ + if(ut.ajax_ok(res)) { var d_list=res.data.data.pageData; getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ var dis=rs.data.data; @@ -79,7 +79,7 @@ Page({ enabled: 1 }, success:function(res){ - if(res.data.code==0 && res.data.data){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ var item=res.data.data.pageData[0]; if (item && item.ad_code) th.setData({ad_img:item.ad_code}) } diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js index 7f47914..25c05eb 100644 --- a/pages/user/my_service/appment_main.js +++ b/pages/user/my_service/appment_main.js @@ -657,7 +657,7 @@ Page({ } }).then(res => { //-- 如果是门店的话 -- - if (res.data.code == 0 && res.data.data && res.data.data.pageData) { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { var store_data=null; for(var i in res.data.data.pageData){ var it=res.data.data.pageData[i]; diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 06114b2..24db66f 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -553,7 +553,7 @@ Page({ 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){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ prom=res.data.data.pageData[0]; } }) @@ -672,7 +672,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} }).then(res=>{ - if(res.data.code==0 && res.data.data && res.data.data.pageData){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ prom=res.data.data.pageData[0]; } }) diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js index 2343904..574c301 100644 --- a/pages/user/userqy/userqy.js +++ b/pages/user/userqy/userqy.js @@ -81,7 +81,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page",{ data:{ storeId:os.stoid} }).then(res=>{ - if (res.data.data) + if (res.data.data && res.data.data.pageData && res.data.data.pageData.length) backClass=res.data.data.pageData; }) @@ -100,7 +100,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/users/grade/vipprivilegeinfo/page",{ data:{storeId:os.stoid,pageSize:100} }).then(res=>{ - if (res.data.data) + if (res.data.data && res.data.data.pageData && res.data.data.pageData.length) qy_list=res.data.data.pageData; }) @@ -108,7 +108,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page",{ data: { storeId: os.stoid, GradeId: gradeId, userId: gl_data.user_id, pageSize: 100 } }).then(res=>{ - if (res.data.data) + if (res.data.data && res.data.data.pageData && res.data.data.pageData.length) g_qy_list=res.data.data.pageData; }); @@ -227,7 +227,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page",{ data: { storeId: os.stoid, GradeId: gr_id, userId: gl_data.user_id, pageSize: 100} }).then(res=>{ - g_qy_list=res.data.data.pageData; + if(ut.ajax_ok(res)) g_qy_list=res.data.data.pageData; }) for(var i in qy_list){ -- libgit2 0.21.4