diff --git a/pages/login/login.js b/pages/login/login.js index d4e9cb6..c39acd5 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -96,8 +96,6 @@ Page({ }) return } - //var和const的区别,一个可变,一个不可变, - // const 声明一个不可变的对象parm,并创建了对象 const parm = { // wxCode对象的初始化 wxCode :'', @@ -108,36 +106,53 @@ Page({ wx.showLoading({ title: '登录中', }) - //微信的api,获取登录凭证 - // 在这一步骤中,用户获取凭证 + //微信的api,获取登录凭证,用户获取凭证 + wx.getUserProfile({ + desc: '用于获取用户个人信息', + success: function (res) { + var userInfo = res.userInfo; + var avatarUrl = userInfo.avatarUrl; + wx.setStorageSync('avatarUrl', avatarUrl) + console.log("User's Avatar URL:", avatarUrl); wx.login({ success: (res) => { - parm.wxCode = res.code - console.log(parm.wxCode); - // 调用登录的接口 - userLoginlog(parm).then((res)=>{ - console.log(res); - // 不明白这里判断的是什么 - if(res.code == 0){ + parm.wxCode = res.code + console.log(parm.wxCode); + // 调用登录的接口 + userLoginlog(parm).then((res)=>{ + console.log(res); + // 判断登录是否成功 + if(res.code == 0){ // 用于跳转的api,跳转到某某某 wx.switchTab({ url: '/pages/index/index', }) //加入本地内存的api wx.setStorageSync('token', res.data.token) - } - }).catch(err=>{ - wx.showToast({ - title: res.msg, - icon:'none', - duration:3000 - }) - console.log(err); - }) - wx.hideLoading() - + + } + }).catch(err=>{ + wx.showToast({ + title: res.msg, + icon:'none', + duration:3000 + }) + console.log(err); + }) + wx.hideLoading() }, }) + } + }) + + + + + + + + + }, /** * 用户点击右上角分享 diff --git a/pages/login/login.wxml b/pages/login/login.wxml index bc897ee..942cf53 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -21,3 +21,5 @@ + + diff --git a/pages/mine/mine.js b/pages/mine/mine.js index 51da7b5..9c7535c 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -10,19 +10,21 @@ Page({ statusHeight:'', navigationHeight:'', agencyName:'', - userName:'' + userName:'', + avatar:'' }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + // 获取存储在本地缓存中的用户信息 + +const avatarU = wx.getStorageSync('avatarUrl'); +// 输出用户信息 +console.log('12312',avatarU); this.setData({ - statusHeight: app.globalData.deviceInfo.statusHeight, - navigationHeight: app.globalData.deviceInfo.navigationHeight, - share:app.globalData.share, - agencyName:app.globalData.user.agencyName, - userName:app.globalData.user.realName + 'avatar': avatarU }) }, toChangePassword(){ diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index 96c85d5..24b8f8f 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -1,15 +1,13 @@ - 我的 + 我的 - + {{userName}} {{agencyName}} - - 网格长 @@ -20,7 +18,9 @@ + +