Commit 47c9ca1bdd1372c3f173649300c2730092b589e9
1 parent
1160a1b5
1. 小程序商家后台提示报错的bug优化
Showing
9 changed files
with
25 additions
and
14 deletions
components/diy_goodsGroup/diy_goodsGroup.js
... | ... | @@ -278,7 +278,7 @@ Component({ |
278 | 278 | if (!user) return false; |
279 | 279 | clearInterval(ti); |
280 | 280 | |
281 | - if (user.card_field) { | |
281 | + if (user.card_field && user['card_expiredate']) { | |
282 | 282 | var str = user['card_expiredate'].replace(/-/g, '/'); |
283 | 283 | var end = new Date(str); |
284 | 284 | end = Date.parse(end) / 1000; | ... | ... |
components/goods_list/goods_list.js
... | ... | @@ -54,7 +54,7 @@ Component({ |
54 | 54 | var user = getApp().globalData.userInfo; |
55 | 55 | if (!user) return false; |
56 | 56 | clearInterval(ti); |
57 | - if (user.card_field) { | |
57 | + if (user.card_field && user['card_expiredate']) { | |
58 | 58 | var str = user['card_expiredate'].replace(/-/g, '/'); |
59 | 59 | var end = new Date(str); |
60 | 60 | end = Date.parse(end) / 1000; | ... | ... |
packageA/pages/activity_share/activity_share.js
... | ... | @@ -72,7 +72,7 @@ Page({ |
72 | 72 | getApp().request.promiseGet("/api/weshop/goods/poster/page",{ |
73 | 73 | data:{store_id:os.stoid, type:1, is_use:1 } |
74 | 74 | }).then(res=>{ |
75 | - if(res.data.code==0){ | |
75 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ | |
76 | 76 | |
77 | 77 | var poster_data=res.data.data.pageData[0]; |
78 | 78 | var json_str=poster_data.jsonStr; | ... | ... |
packageA/pages/goods_share/goods_share.js
... | ... | @@ -49,7 +49,7 @@ Page({ |
49 | 49 | getApp().request.promiseGet("/api/weshop/goods/poster/page",{ |
50 | 50 | data:{store_id:os.stoid, type:1, is_use:1 } |
51 | 51 | }).then(res=>{ |
52 | - if(res.data.code==0){ | |
52 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ | |
53 | 53 | |
54 | 54 | var poster_data=res.data.data.pageData[0]; |
55 | 55 | var json_str=poster_data.jsonStr; |
... | ... | @@ -112,7 +112,7 @@ Page({ |
112 | 112 | if(!user) return false; |
113 | 113 | clearInterval(ti); |
114 | 114 | |
115 | - if(user.card_field ){ | |
115 | + if(user.card_field && user['card_expiredate']){ | |
116 | 116 | var str = user['card_expiredate'].replace(/-/g, '/'); |
117 | 117 | var end = new Date(str); |
118 | 118 | end = Date.parse(end) / 1000; | ... | ... |
packageA/pages/prom_list/prom_list.js
... | ... | @@ -221,7 +221,7 @@ Page({ |
221 | 221 | th.getPlusCardType(function(ob){ |
222 | 222 | var user = getApp().globalData.userInfo; |
223 | 223 | if(user){ |
224 | - if(user.card_field ){ | |
224 | + if(user.card_field && user['card_expiredate']){ | |
225 | 225 | var str = user['card_expiredate'].replace(/-/g, '/'); |
226 | 226 | var end = new Date(str); |
227 | 227 | end = Date.parse(end) / 1000; | ... | ... |
pages/goods/categoryList/categoryList.js
... | ... | @@ -155,7 +155,7 @@ Page({ |
155 | 155 | //---回调卡的列表--- |
156 | 156 | th.getPlusCardType(function (ob) { |
157 | 157 | th.setData({ card_list: ob.card_list }); |
158 | - if (user.card_field) { | |
158 | + if (user.card_field && user['card_expiredate']) { | |
159 | 159 | var str = user['card_expiredate'].replace(/-/g, '/'); |
160 | 160 | var end = new Date(str); |
161 | 161 | end = Date.parse(end) / 1000; | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
... | ... | @@ -264,7 +264,7 @@ Page({ |
264 | 264 | getApp().request.promiseGet("/api/weshop/goods/poster/page",{ |
265 | 265 | data:{store_id:os.stoid, type:1, is_use:1 } |
266 | 266 | }).then(res=>{ |
267 | - if(res.data.code==0){ | |
267 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ | |
268 | 268 | |
269 | 269 | var poster_data=res.data.data.pageData[0]; |
270 | 270 | var json_str=poster_data.jsonStr; |
... | ... | @@ -386,7 +386,7 @@ Page({ |
386 | 386 | if (!user) return false; |
387 | 387 | clearInterval(ti); |
388 | 388 | |
389 | - if(user.card_field ){ | |
389 | + if(user.card_field && user['card_expiredate']){ | |
390 | 390 | var str = user['card_expiredate'].replace(/-/g, '/'); |
391 | 391 | var end = new Date(str); |
392 | 392 | end = Date.parse(end) / 1000; |
... | ... | @@ -980,6 +980,10 @@ Page({ |
980 | 980 | if (oo.user_id == null) { |
981 | 981 | return s.my_warnning("还未登录!", 0, this); |
982 | 982 | } |
983 | + if(!getApp().globalData.userInfo){ | |
984 | + return s.my_warnning("还未登录!", 0, this); | |
985 | + } | |
986 | + | |
983 | 987 | var e = this, |
984 | 988 | th = e, |
985 | 989 | a = 0, |
... | ... | @@ -1076,6 +1080,11 @@ Page({ |
1076 | 1080 | if (oo.user_id == null) { |
1077 | 1081 | return s.my_warnning("还未登录!", 0, this); |
1078 | 1082 | } |
1083 | + | |
1084 | + if(!getApp().globalData.userInfo){ | |
1085 | + return s.my_warnning("还未登录!", 0, this); | |
1086 | + } | |
1087 | + | |
1079 | 1088 | var e = this, |
1080 | 1089 | th = e, |
1081 | 1090 | a = 0, |
... | ... | @@ -1226,9 +1235,11 @@ Page({ |
1226 | 1235 | //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ |
1227 | 1236 | if(o.prom_type!=1 && ((o.prom_type!=6 && o.prom_type!=4) || th.data.is_normal)){ |
1228 | 1237 | var conf=th.data.bconfig; |
1229 | - if (conf.switch_list && getApp().globalData.userInfo['card_field']){ | |
1238 | + if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']){ | |
1230 | 1239 | var s_list=JSON.parse(conf.switch_list); |
1231 | 1240 | var now=ut.gettimestamp(); |
1241 | + | |
1242 | + | |
1232 | 1243 | var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/'); |
1233 | 1244 | var end = new Date(str); |
1234 | 1245 | end = Date.parse(end) / 1000; | ... | ... |
pages/team/team_success/team_success.js
... | ... | @@ -63,8 +63,8 @@ Page({ |
63 | 63 | getApp().request.promiseGet("/api/weshop/goods/poster/page",{ |
64 | 64 | data:{store_id:os.stoid, type:1, is_use:1 } |
65 | 65 | }).then(res=>{ |
66 | - if(res.data.code==0){ | |
67 | - | |
66 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ | |
67 | + | |
68 | 68 | var poster_data=res.data.data.pageData[0]; |
69 | 69 | var json_str=poster_data.jsonStr; |
70 | 70 | if(json_str){ | ... | ... |
pages/user/userinfo/userinfo.js
... | ... | @@ -565,9 +565,9 @@ Page({ |
565 | 565 | //------初始化加载---------- |
566 | 566 | onLoad: function(t) { |
567 | 567 | var user = getApp().globalData.userInfo; |
568 | - if (user.card_field != '' && user.card_field != null && user.card_field != undefined) { | |
568 | + if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) { | |
569 | 569 | var now = ut.gettimestamp(); |
570 | - var str = user.card_expiredate; | |
570 | + var str = user.card_expiredate.replace(/-/g, '/');; | |
571 | 571 | var end = new Date(str); |
572 | 572 | end = Date.parse(end) / 1000; |
573 | 573 | if (now < end) { | ... | ... |