|
@@ -1,5 +1,4 @@
|
|
import { defineStore } from 'pinia';
|
|
import { defineStore } from 'pinia';
|
|
-import { clone, cloneDeep } from 'lodash-es';
|
|
|
|
import { getBaseInfo, getUserInfo } from '@/api/user';
|
|
import { getBaseInfo, getUserInfo } from '@/api/user';
|
|
import { smsLogin, passwordLogin, logout, userRegister } from '@/api/common'
|
|
import { smsLogin, passwordLogin, logout, userRegister } from '@/api/common'
|
|
import { closeAuthModal } from '@/hooks/useModal'
|
|
import { closeAuthModal } from '@/hooks/useModal'
|
|
@@ -29,18 +28,18 @@ const tabUrl = [
|
|
'pages/index/communicate',
|
|
'pages/index/communicate',
|
|
'pages/index/my'
|
|
'pages/index/my'
|
|
]
|
|
]
|
|
-export const userStore = defineStore({
|
|
|
|
- id: 'user',
|
|
|
|
|
|
+export const userStore = defineStore('user', {
|
|
state: () => {
|
|
state: () => {
|
|
- const userInfo = JSON.parse(uni.getStorageSync('user') ?? '{}')
|
|
|
|
- console.log('userInfo====',userInfo)
|
|
|
|
|
|
+ const userLocal = uni.getStorageSync('user')
|
|
|
|
+
|
|
|
|
+ const userInfo = userLocal ? JSON.parse(userLocal) : {}
|
|
return {
|
|
return {
|
|
- baseInfo: userInfo ? userInfo.baseInfo : {}, // 用户信息
|
|
|
|
- userInfo: userInfo ? userInfo.userInfo : {},
|
|
|
|
|
|
+ baseInfo: userInfo.baseInfo ?? {}, // 用户信息
|
|
|
|
+ userInfo: userInfo.userInfo ?? {},
|
|
isLogin: !!uni.getStorageSync('token'), // 登录状态
|
|
isLogin: !!uni.getStorageSync('token'), // 登录状态
|
|
refreshToken: uni.getStorageSync('refresh-token'), // 用户切换
|
|
refreshToken: uni.getStorageSync('refresh-token'), // 用户切换
|
|
lastUpdateTime: 0, // 上次更新时间
|
|
lastUpdateTime: 0, // 上次更新时间
|
|
- accountInfo: cloneDeep(defaultAccountInfo), // 账号信息
|
|
|
|
|
|
+ accountInfo: { ...defaultAccountInfo }, // 账号信息
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
@@ -147,9 +146,9 @@ export const userStore = defineStore({
|
|
// 清空 token
|
|
// 清空 token
|
|
this.setToken();
|
|
this.setToken();
|
|
// 清空用户相关的缓存
|
|
// 清空用户相关的缓存
|
|
- this.baseInfo = clone(defaultBaseInfo);
|
|
|
|
|
|
+ this.baseInfo = { ...defaultBaseInfo };
|
|
this.userInfo = {}
|
|
this.userInfo = {}
|
|
- this.accountInfo = cloneDeep(defaultAccountInfo);
|
|
|
|
|
|
+ this.accountInfo = { ...defaultAccountInfo };
|
|
},
|
|
},
|
|
|
|
|
|
// 登录后,加载各种信息
|
|
// 登录后,加载各种信息
|