feats

src/components/MainPage/index.vue

@@ -76,10 +76,12 @@ export default {
     ...mapUserActions([
       'WxGetPhoneAuth',
       'WxLogin',
-      'PutUserInfo'
+      'PutUserInfo',
+      'WxAuthUserInfo',
     ]),
     ...mapUserMutations([
-      'EditUserInfo'
+      'EditUserInfo',
+      'UpdateUserInfo',
     ]),
     toIndexPage () {
       Taro.reLaunch({
@@ -126,9 +128,17 @@ export default {
       }
     },
     GetUserIcon (e) {
-      if (e.detail.userInfo.avatarUrl) {
-        this.PutUserInfo({ data: { data: { avatar: e.detail.userInfo.avatarUrl, personId: this.UserInfo.personId } } }).then(() => {
-          this.EditUserInfo({ name: 'avatar', value: e.detail.userInfo.avatarUrl })
+      if (e.detail.errMsg === 'getUserInfo:ok') {
+        const data = {
+          signature: e.detail.signature,
+          rawData: e.detail.rawData,
+          encryptedData: e.detail.encryptedData,
+          iv: e.detail.iv,
+          sessionKey: this.UserInfo.sessionKey,
+        }
+
+        this.WxAuthUserInfo({ data: { data }}).then(res => {
+          this.UpdateUserInfo(res.data.data)
           this.ShowUserIconAuthPopup = false
           if (!this.UserInfo.phone) {
             this.ShowPhoneAuthPopup = true

src/store/user/index.js

@@ -24,6 +24,11 @@ export default {
         ToolClass.ToolRequest({ url: Api.WxGetPhoneAuth.url, method: Api.WxGetPhoneAuth.method, ...payload, success (res) { resolve(res) }, error (res) { reject(res) } })
       })
     },
+    WxAuthUserInfo (context, payload) { // 授权头像，昵称
+      return new Promise((resolve, reject) => {
+        ToolClass.ToolRequest({ url: Api.WxGetUserIconAuth.url, method: Api.WxGetUserIconAuth.method, ...payload, success (res) { resolve(res) }, error (res) { reject(res) } })
+      })
+    },
     WxLogin (context, payload) { // 微信登录
       return new Promise((resolve, reject) => {
         ToolClass.ToolRequest({ url: Api.WxLogin.url, method: Api.WxLogin.method, ...payload, success (res) { context.commit('UpdateUserInfo', { ...res.data.data.person, sessionKey: res.data.data.sessionKey }); resolve(res) }, error (res) { reject(res) } })

src/util/Api/index.js

@@ -7,7 +7,7 @@ const Api = {
     url: `${prefix}/ma/auth-phone`
   },
   WxGetUserIconAuth: { // 微信获取用户头像
-    method: 'post',
+    method: 'put',
     url: `${prefix}/ma/auth-user`
   },
   WxLogin: { // 微信登录

src/util/PublicMethod/index.js

@@ -50,7 +50,7 @@ const ToolClass = {
     if (queryData) {
       config.url += '?' + queryData
     }
-    let Header = {}
+    let Header = { 'Access-Control-Expose-Headers': 'X-Authorization-JWT' }
     if (wx.getStorageSync('token') !== '' && wx.getStorageSync('tokentime') !== '' && wx.getStorageSync('tokentime') - 0 + 24 * 60 * 60 * 1000 >= Date.now()) { // 本地获取token
       Header['X-Authorization-JWT'] = wx.getStorageSync('token')
     }
@@ -60,7 +60,7 @@ const ToolClass = {
       ...(config.data || {}),
       header: { ...Header },
       success: (res) => {
-        const token = res.header['X-Authorization-JWT'] || res.header['X-Authorization-Jwt']
+        const token = res.data?.token
         if (token) { // 更新本地存储token
           wx.setStorageSync('token', token)
           wx.setStorageSync('tokentime', Date.now())
@@ -95,9 +95,12 @@ const ToolClass = {
         }
       },
       fail: (res) => {
-        if (res.header['X-Authorization-JWT'] !== undefined) { // 更新本地存储token
-          wx.setStorageSync('token', res.header['X-Authorization-JWT'])
+        const token = res.data?.token
+        if (token) { // 更新本地存储token
+          wx.setStorageSync('token', token)
+          wx.setStorageSync('tokentime', Date.now())
         }
+
         if (res.data.code - 0 === 1001) { // token失效
           // wx.navigateTo({ url: '../../pages/SignIn/index' })
           config.error('登录失效')