|
|
@@ -24,6 +24,7 @@ export const useUserStore = defineStore('user', () => {
|
|
|
login(username.trim(), password)
|
|
|
.then(res => {
|
|
|
useId.value = res.returnParams.useId // 设置staffId
|
|
|
+ user.value = res.returnParams
|
|
|
// setToken(res.token)
|
|
|
resolve(res)
|
|
|
})
|
|
|
@@ -37,9 +38,15 @@ export const useUserStore = defineStore('user', () => {
|
|
|
const roleIndex = index || 0
|
|
|
return new Promise((resolve, reject) => {
|
|
|
getInfo(useId.value).then(res => {
|
|
|
+ const source = res.returnParams[roleIndex]
|
|
|
+ Object.keys(source).forEach(key => {
|
|
|
+ // 目标对象没有该属性或者该属性为 null,则赋值
|
|
|
+ if (!(key in user.value) || user.value[key] === null) {
|
|
|
+ user.value[key] = source[key] === undefined ? user.value[key] : source[key];
|
|
|
+ }
|
|
|
+ });
|
|
|
// 保存 用户信息
|
|
|
- uni.setStorageSync('userInfo', res.returnParams[roleIndex])
|
|
|
- user.value = res.returnParams[roleIndex]
|
|
|
+ uni.setStorageSync('userInfo', user.value)
|
|
|
resolve(res)
|
|
|
})
|
|
|
.catch(error => {
|