diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js index f7d0b05..82a5f74 100644 --- a/pages/togoin/togoin.js +++ b/pages/togoin/togoin.js @@ -41,52 +41,67 @@ Page({ //-- 会员授权 -- bindGetUserInfo: function(ee) { var that = this; - var user=ee.detail.userInfo; - //此处授权得到userInfo - getApp().globalData.getu = user; - - //--拿下code-- - wx.login({ - success: function (o) { - var dd = { - js_code:o.code, - store_id: os.stoid, - nickname: app.clear_word(app.globalData.getu.nickName), - head_pic: app.clear_word(app.globalData.getu.avatarUrl) - }; - - //-- 导购会员ID -- - if(getApp().globalData.guide_id){ - dd.guide_id=getApp().globalData.guide_id; - } - - getApp().request.get("/api/weshop/users/openidandkey", { - data: dd, - success: function (e) { - if(e.data.code==0){ - that.setData({user:user}) - //如果有会员的话,没有sessionKey - if(!e.data.data.sessionKey){ - getApp().showWarning("登录成功"); - getApp().globalData.userInfo=e.data.data; - getApp().globalData.user_id=e.data.data.user_id; - getApp().globalData.openid = e.data.data.weapp_openid; - - setTimeout(function () { - wx.navigateBack({ delta: 1}) //返回上一页 - },1000) - }else{ - getApp().globalData.sessionKey=e.data.data.sessionKey; - getApp().globalData.openid=e.data.data.openid;; - that.setData({show_bind:1}) - } - }else{ - getApp().confirmBox(e.data.msg); - } - } - }); - } - }) + //-- 点击授权 -- + that.getUserProfile(function(res){ + var user=res; + //--拿下code-- + wx.login({ + success: function (o) { + var dd = { + js_code:o.code, + store_id: os.stoid, + nickname: app.clear_word(app.globalData.getu.nickName), + head_pic: app.clear_word(app.globalData.getu.avatarUrl) + }; + //-- 导购会员ID -- + if(getApp().globalData.guide_id){ + dd.guide_id=getApp().globalData.guide_id; + } + + getApp().request.get("/api/weshop/users/openidandkey", { + data: dd, + success: function (e) { + if(e.data.code==0){ + that.setData({user:user}) + //如果有会员的话,没有sessionKey + if(!e.data.data.sessionKey){ + getApp().showWarning("登录成功"); + getApp().globalData.userInfo=e.data.data; + getApp().globalData.user_id=e.data.data.user_id; + getApp().globalData.openid = e.data.data.weapp_openid; + //把会员的信息存在内存 + wx.setStorageSync("userinfo",e.data.data); + + setTimeout(function () { + wx.navigateBack({ delta: 1}) //返回上一页 + },1000) + }else{ + getApp().globalData.sessionKey=e.data.data.sessionKey; + getApp().globalData.openid=e.data.data.openid; + that.setData({show_bind:1}); + } + }else{ + getApp().confirmBox(e.data.msg); + } + } + }); + } + }) + }) + }, + + //-- 调整后的获取会员信息 -- + getUserProfile:function(func){ + var that=this; + wx.getUserProfile({ + desc:'获取用户相关信息', + success:res=>{ + console.log("getUserProfile",res); + //此处授权得到userInfo + getApp().globalData.getu = res.userInfo; + func(res.userInfo); + } + }); }, //暂不登录,返回上一页 diff --git a/pages/togoin/togoin.wxml b/pages/togoin/togoin.wxml index f9e3e25..f02df3e 100644 --- a/pages/togoin/togoin.wxml +++ b/pages/togoin/togoin.wxml @@ -15,7 +15,7 @@ -