1 participants
-
Status changed to merged
-
mentioned in commit 5a8cde3b6d77a3f065341c170b11d8a995d4e67c
Showing
3 changed files
pages/getphone/getphone.js
| ... | ... | @@ -21,8 +21,9 @@ Page({ |
| 21 | 21 | if (getApp().globalData.userInfo) |
| 22 | 22 | openid = getApp().globalData.userInfo.weapp_openid; |
| 23 | 23 | } |
| 24 | + var r = getApp().globalData.getu; | |
| 24 | 25 | |
| 25 | - if(openid=="" || openid==null ){ | |
| 26 | + if (openid == "" || openid == null || r==null ){ | |
| 26 | 27 | getApp().globalData.user_id=null; |
| 27 | 28 | getApp().globalData.userInfo=null; |
| 28 | 29 | console.log("openid"); |
| ... | ... | @@ -102,7 +103,7 @@ Page({ |
| 102 | 103 | } |
| 103 | 104 | |
| 104 | 105 | wx.setStorageSync("userinfo",e.data.data); |
| 105 | - wx.setStorageSync("isAuth", !0), a.globalData.userInfo = e.data.data, a.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); | |
| 106 | + wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); | |
| 106 | 107 | wx.navigateBack({ delta: 1}) |
| 107 | 108 | |
| 108 | 109 | }, | ... | ... |
pages/team/team_show/team_show.js
| ... | ... | @@ -77,8 +77,13 @@ Page({ |
| 77 | 77 | |
| 78 | 78 | //显示加载 |
| 79 | 79 | onShow:function(){ |
| 80 | - var tg_id = this.data.tg_id; | |
| 81 | - this.init(tg_id) | |
| 80 | + var tg_id = this.data.tg_id,th=this; | |
| 81 | + this.init(tg_id); | |
| 82 | + | |
| 83 | + getApp().get_user_store(function (e) { | |
| 84 | + if(e) | |
| 85 | + th.setData({ pick_id: e.pickup_id, end_name: e.pickup_name,ii:1 }) | |
| 86 | + }) | |
| 82 | 87 | }, |
| 83 | 88 | |
| 84 | 89 | //c点击打开拼团弹窗 | ... | ... |
pages/user/assistance/friend_assistance.js
| ... | ... | @@ -55,9 +55,9 @@ Page({ |
| 55 | 55 | */ |
| 56 | 56 | onShow: function() { |
| 57 | 57 | var th=this; |
| 58 | + if (!th.data.user) th.setData({ user: getApp().globalData.userInfo}); | |
| 58 | 59 | if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking != |
| 59 | 60 | 0) { |
| 60 | - | |
| 61 | 61 | getApp().request.promiseGet("/api/weshop/marketing/help/help/tasking/get", { |
| 62 | 62 | data: { |
| 63 | 63 | taskingId: th.data.tasking, | ... | ... |