diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index 6e0c207..9e8818a 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -278,7 +278,7 @@ Component({ if (!user) return false; clearInterval(ti); - if (user.card_field) { + if (user.card_field && user['card_expiredate']) { var str = user['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); end = Date.parse(end) / 1000; diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index 98c3fbf..fd484ac 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -54,7 +54,7 @@ Component({ var user = getApp().globalData.userInfo; if (!user) return false; clearInterval(ti); - if (user.card_field) { + if (user.card_field && user['card_expiredate']) { var str = user['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); end = Date.parse(end) / 1000; diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index d6c092e..2da0ab9 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -72,7 +72,7 @@ Page({ getApp().request.promiseGet("/api/weshop/goods/poster/page",{ data:{store_id:os.stoid, type:1, is_use:1 } }).then(res=>{ - if(res.data.code==0){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ var poster_data=res.data.data.pageData[0]; var json_str=poster_data.jsonStr; diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js index 13fbcbe..ce389da 100644 --- a/packageA/pages/goods_share/goods_share.js +++ b/packageA/pages/goods_share/goods_share.js @@ -49,7 +49,7 @@ Page({ getApp().request.promiseGet("/api/weshop/goods/poster/page",{ data:{store_id:os.stoid, type:1, is_use:1 } }).then(res=>{ - if(res.data.code==0){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ var poster_data=res.data.data.pageData[0]; var json_str=poster_data.jsonStr; @@ -112,7 +112,7 @@ Page({ if(!user) return false; clearInterval(ti); - if(user.card_field ){ + if(user.card_field && user['card_expiredate']){ var str = user['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); end = Date.parse(end) / 1000; diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 6fc346f..1b57580 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -221,7 +221,7 @@ Page({ th.getPlusCardType(function(ob){ var user = getApp().globalData.userInfo; if(user){ - if(user.card_field ){ + if(user.card_field && user['card_expiredate']){ var str = user['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); end = Date.parse(end) / 1000; diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js index d38a490..5923ff0 100644 --- a/pages/goods/categoryList/categoryList.js +++ b/pages/goods/categoryList/categoryList.js @@ -155,7 +155,7 @@ Page({ //---回调卡的列表--- th.getPlusCardType(function (ob) { th.setData({ card_list: ob.card_list }); - if (user.card_field) { + if (user.card_field && user['card_expiredate']) { var str = user['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); end = Date.parse(end) / 1000; diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 07b293d..319e058 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -264,7 +264,7 @@ Page({ getApp().request.promiseGet("/api/weshop/goods/poster/page",{ data:{store_id:os.stoid, type:1, is_use:1 } }).then(res=>{ - if(res.data.code==0){ + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ var poster_data=res.data.data.pageData[0]; var json_str=poster_data.jsonStr; @@ -386,7 +386,7 @@ Page({ if (!user) return false; clearInterval(ti); - if(user.card_field ){ + if(user.card_field && user['card_expiredate']){ var str = user['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); end = Date.parse(end) / 1000; @@ -980,6 +980,10 @@ Page({ if (oo.user_id == null) { return s.my_warnning("还未登录!", 0, this); } + if(!getApp().globalData.userInfo){ + return s.my_warnning("还未登录!", 0, this); + } + var e = this, th = e, a = 0, @@ -1076,6 +1080,11 @@ Page({ if (oo.user_id == null) { return s.my_warnning("还未登录!", 0, this); } + + if(!getApp().globalData.userInfo){ + return s.my_warnning("还未登录!", 0, this); + } + var e = this, th = e, a = 0, @@ -1226,9 +1235,11 @@ Page({ //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------ if(o.prom_type!=1 && ((o.prom_type!=6 && o.prom_type!=4) || th.data.is_normal)){ var conf=th.data.bconfig; - if (conf.switch_list && getApp().globalData.userInfo['card_field']){ + if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']){ var s_list=JSON.parse(conf.switch_list); var now=ut.gettimestamp(); + + var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); end = Date.parse(end) / 1000; diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index e63c19d..7fdc137 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -63,8 +63,8 @@ Page({ getApp().request.promiseGet("/api/weshop/goods/poster/page",{ data:{store_id:os.stoid, type:1, is_use:1 } }).then(res=>{ - if(res.data.code==0){ - + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0] ){ + var poster_data=res.data.data.pageData[0]; var json_str=poster_data.jsonStr; if(json_str){ diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index 69f9790..0cbafa1 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -565,9 +565,9 @@ Page({ //------初始化加载---------- onLoad: function(t) { var user = getApp().globalData.userInfo; - if (user.card_field != '' && user.card_field != null && user.card_field != undefined) { + if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) { var now = ut.gettimestamp(); - var str = user.card_expiredate; + var str = user.card_expiredate.replace(/-/g, '/');; var end = new Date(str); end = Date.parse(end) / 1000; if (now < end) {