@@ -809,6 +845,24 @@
>{{ noLabel }} {{ noPriceCents }}¢
+
+
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 0c850c5..5ea16fe 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -96,14 +96,15 @@ export const useUserStore = defineStore('user', () => {
try {
const res = await getUserInfo(headers)
console.log('[fetchUserInfo] 接口响应:', JSON.stringify(res, null, 2))
- if ((res.code === 0 || res.code === 200) && res.data) {
- const u = res.data
+ const data = res.data as Record | undefined
+ const u = (data?.user ?? data) as Record
+ if ((res.code === 0 || res.code === 200) && u) {
user.value = {
- id: u.ID,
- ID: u.ID,
- userName: u.userName,
- nickName: u.nickName,
- headerImg: u.headerImg,
+ id: u.ID as number | string | undefined,
+ ID: u.ID as number | undefined,
+ userName: (u.userName ?? u.username) as string | undefined,
+ nickName: (u.nickName ?? u.nickname) as string | undefined,
+ headerImg: (u.headerImg ?? u.avatar ?? u.avatarUrl) as string | undefined,
...u,
}
if (token.value && user.value) saveToStorage(token.value, user.value)
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 9dc214f..d6752ce 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -184,7 +184,8 @@ const connectWithWallet = async () => {
const { token, user } = loginData.data
console.log('[walletLogin] 存入 store 的 user:', JSON.stringify(user, null, 2))
userStore.setUser({ token, user })
- userStore.fetchUsdcBalance()
+ await userStore.fetchUserInfo()
+ await userStore.fetchUsdcBalance()
}
router.push('/')