diff --git a/pages/getphone/getphone.js b/pages/getphone/getphone.js index ddf27f8..d000bf6 100644 --- a/pages/getphone/getphone.js +++ b/pages/getphone/getphone.js @@ -21,8 +21,9 @@ Page({ if (getApp().globalData.userInfo) openid = getApp().globalData.userInfo.weapp_openid; } + var r = getApp().globalData.getu; - if(openid=="" || openid==null ){ + if (openid == "" || openid == null || r==null ){ getApp().globalData.user_id=null; getApp().globalData.userInfo=null; console.log("openid"); @@ -102,7 +103,7 @@ Page({ } wx.setStorageSync("userinfo",e.data.data); - wx.setStorageSync("isAuth", !0), a.globalData.userInfo = e.data.data, a.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); + wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); wx.navigateBack({ delta: 1}) }, diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js index 92484ed..4198bae 100644 --- a/pages/user/assistance/friend_assistance.js +++ b/pages/user/assistance/friend_assistance.js @@ -55,9 +55,9 @@ Page({ */ onShow: function() { var th=this; + if (!th.data.user) th.setData({ user: getApp().globalData.userInfo}); if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking != 0) { - getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", { data: { taskingId: th.data.tasking,