|
@@ -1,5 +1,6 @@
|
|
|
const uploadJS = require('../../mixin/upload.js')
|
|
|
const { updateUserInfo, userLoginOut } = require('../../api/common')
|
|
|
+const { sessionStorageKey } = require('../../api/request')
|
|
|
const app = getApp()
|
|
|
|
|
|
Page({
|
|
@@ -18,7 +19,8 @@ Page({
|
|
|
isAutoFocus: false,
|
|
|
booNickname: false,
|
|
|
booLogout: false,
|
|
|
- booLock: false
|
|
|
+ booLock: false,
|
|
|
+ sessionId: ''
|
|
|
},
|
|
|
|
|
|
/**
|
|
@@ -43,6 +45,10 @@ Page({
|
|
|
*/
|
|
|
onShow() {
|
|
|
this.getTabBar().init()
|
|
|
+
|
|
|
+ this.setData({
|
|
|
+ sessionId: wx.getStorageSync(sessionStorageKey)
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
/**
|
|
@@ -61,22 +67,33 @@ Page({
|
|
|
async init() {
|
|
|
// 更新用户信息
|
|
|
app.fetchUserDataCallback = () => {
|
|
|
+ const userInfo = app.globalData.userInfo
|
|
|
const { user_head_img_url, user_nickname, user_phone } = app.globalData.userInfo
|
|
|
+ let temp = {}
|
|
|
|
|
|
- this.setData({
|
|
|
- form: {
|
|
|
- user_head_img_url,
|
|
|
- user_nickname,
|
|
|
- user_phone
|
|
|
- },
|
|
|
- user_head_img_url: [
|
|
|
- {
|
|
|
- url: user_head_img_url,
|
|
|
- formkey: 'user_head_img_url'
|
|
|
+ for (let key in userInfo) {
|
|
|
+ let value = userInfo[key]
|
|
|
+
|
|
|
+ if ((Array.isArray(value) && value.length >= 1) || (Object.prototype.toString.call(value) === '[object Object]') || (typeof value === 'string' && value) || typeof value === 'number') {
|
|
|
+ if (this.data.hasOwnProperty(key)) {
|
|
|
+ if (key === 'user_head_img_url') {
|
|
|
+ value = [
|
|
|
+ {
|
|
|
+ url: value,
|
|
|
+ formkey: key
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ temp[`${key}`] = value
|
|
|
}
|
|
|
- ],
|
|
|
- user_nickname: user_nickname
|
|
|
- })
|
|
|
+
|
|
|
+ if (this.data.form.hasOwnProperty(key)) {
|
|
|
+ temp[`form.${key}`] = value
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ this.setData(temp)
|
|
|
}
|
|
|
await app.fetchUserData()
|
|
|
},
|