From 2bfd171e11b1294553edd62c303fb667bbc8b614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=81?= <martin@qq.com>
Date: Tue, 7 Jul 2026 22:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=92=8C=E5=8F=AF=E7=94=A8=E8=B5=84=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue            | 49 +++++++++++++++++++++++++++++++++++++++---
 src/locales/en.json    |  1 +
 src/locales/ja.json    |  1 +
 src/locales/ko.json    |  1 +
 src/locales/zh-CN.json |  1 +
 src/locales/zh-TW.json |  1 +
 src/main.ts            |  4 ++--
 src/stores/user.ts     | 31 +++++++++++++++++++++-----
 8 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index feee74d..20cf8f9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -192,7 +192,16 @@ async function onMenuClick(id: string) {
           </template>
           <template v-else>
             <v-btn class="balance-btn" variant="text" min-width="auto" padding="4 12" @click="$router.push('/wallet')">
-              <span class="balance-text">${{ userStore.totalAssetValue }}</span>
+              <div class="balance-group">
+                <div class="balance-item">
+                  <span class="balance-label">{{ t('wallet.portfolio') }}</span>
+                  <span class="balance-value">${{ userStore.totalAssetValue }}</span>
+                </div>
+                <div class="balance-item">
+                  <span class="balance-label">{{ t('wallet.cash') }}</span>
+                  <span class="balance-value">${{ userStore.availableAssetValue }}</span>
+                </div>
+              </div>
             </v-btn>
             <v-btn icon variant="text" class="avatar-btn" :aria-label="t('common.user')"
               @click="$router.push('/profile')">
@@ -399,9 +408,31 @@ async function onMenuClick(id: string) {
   text-transform: none;
 }
 
-.balance-text {
+.balance-group {
+  display: flex;
+  align-items: stretch;
+  gap: 16px;
+  white-space: nowrap;
+  line-height: 1.1;
+}
+
+.balance-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 2px;
+}
+
+.balance-label {
+  font-size: 0.7rem;
+  color: rgba(0, 0, 0, 0.5);
   font-weight: 500;
-  font-size: 0.95rem;
+}
+
+.balance-value {
+  font-size: 1rem;
+  font-weight: 700;
+  color: #3a9b5d;
 }
 
 .back-btn {
@@ -435,6 +466,18 @@ async function onMenuClick(id: string) {
   .brand-name {
     font-size: 0.96rem;
   }
+
+  .balance-group {
+    gap: 12px;
+  }
+
+  .balance-label {
+    font-size: 0.64rem;
+  }
+
+  .balance-value {
+    font-size: 0.9rem;
+  }
 }
 
 /* 底部导航：整条栏上方淡投影；z-index 确保覆盖滚动条，显示在滚动条上层 */
diff --git a/src/locales/en.json b/src/locales/en.json
index 5d569d5..af6cab8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -235,6 +235,7 @@
   "wallet": {
     "availableAssets": "Available Assets",
     "portfolio": "Portfolio",
+    "cash": "Cash",
     "today": "Today",
     "deposit": "Deposit",
     "withdraw": "Withdraw",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 288c877..8a960cf 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -235,6 +235,7 @@
   "wallet": {
     "availableAssets": "利用可能資産",
     "portfolio": "ポートフォリオ",
+    "cash": "現金",
     "today": "今日",
     "deposit": "入金",
     "withdraw": "出金",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 1a960d3..0b9c12f 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -235,6 +235,7 @@
   "wallet": {
     "availableAssets": "사용 가능 자산",
     "portfolio": "포트폴리오",
+    "cash": "현금",
     "today": "오늘",
     "deposit": "입금",
     "withdraw": "출금",
diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json
index 5554f4d..c7b6cb8 100644
--- a/src/locales/zh-CN.json
+++ b/src/locales/zh-CN.json
@@ -235,6 +235,7 @@
   "wallet": {
     "availableAssets": "可用资产",
     "portfolio": "资产组合",
+    "cash": "现金",
     "today": "今日",
     "deposit": "入金",
     "withdraw": "提现",
diff --git a/src/locales/zh-TW.json b/src/locales/zh-TW.json
index e3169a7..bb21fa1 100644
--- a/src/locales/zh-TW.json
+++ b/src/locales/zh-TW.json
@@ -235,6 +235,7 @@
     "wallet": {
         "availableAssets": "可用資產",
         "portfolio": "資產組合",
+        "cash": "現金",
         "today": "今日",
         "deposit": "入金",
         "withdraw": "提現",
diff --git a/src/main.ts b/src/main.ts
index 9207e34..5c57a02 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -21,8 +21,8 @@ app.use(router)
 setHttpUnauthorizedHandler(() => {
   const userStore = useUserStore(pinia)
   userStore.clearLocalSession()
-  if (router.currentRoute.value.name !== 'login') {
-    router.replace({ name: 'login' })
+  if (router.currentRoute.value.name !== 'home') {
+    router.replace({ name: 'home' })
   }
 })
 
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 5263e1c..4b7dd26 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -85,12 +85,19 @@ export const useUserStore = defineStore('user', () => {
   /** 钱包余额显示，如 "0.00"，可从接口或 UserSocket 推送更新 */
   const balance = ref<string>('0.00')
 
+  /** 锁定余额显示，如 "0.00"，可从接口或 UserSocket 推送更新 */
+  const lockedBalance = ref<string>('0.00')
+
   const positionsValue = ref<number>(0)
 
-  /** 总资产：余额 + 仓位当前价值 */
+  /** 可用资产：仅可用余额 */
+  const availableAssetValue = computed(() => balance.value)
+
+  /** 组合资产：可用 + 锁定 + 持仓价值 */
   const totalAssetValue = computed(() => {
     const bal = parseFloat(balance.value) || 0
-    return (bal + positionsValue.value).toFixed(2)
+    const locked = parseFloat(lockedBalance.value) || 0
+    return (bal + locked + positionsValue.value).toFixed(2)
   })
 
   let userSdkRef: UserSdk | null = null
@@ -117,6 +124,10 @@ export const useUserStore = defineStore('user', () => {
       if (avail != null) {
         balance.value = formatUsdcBalance(String(avail))
       }
+      const locked = (data as BalanceData & { locked?: string }).locked ?? data.frozen
+      if (locked != null) {
+        lockedBalance.value = formatUsdcBalance(String(locked))
+      }
     })
     sdk.onPositionUpdate((data) => {
       positionUpdateCallbacks.forEach((cb) => cb(data as PositionData & Record<string, unknown>))
@@ -205,7 +216,12 @@ export const useUserStore = defineStore('user', () => {
     try {
       const res = await getUsdcBalance(headers)
       if (res.code === 0 && res.data) {
-        balance.value = formatUsdcBalance(res.data.available)
+        if (res.data.available != null) {
+          balance.value = formatUsdcBalance(res.data.available)
+        }
+        if (res.data.locked != null) {
+          lockedBalance.value = formatUsdcBalance(res.data.locked)
+        }
       }
     } catch (e) {
       console.error('[fetchUsdcBalance] 请求失败:', e)
@@ -220,11 +236,14 @@ export const useUserStore = defineStore('user', () => {
       const res = await getUserInfo(headers)
       const data = res.data as Record<string, unknown> | undefined
       if (res.code !== 0 && res.code !== 200) return
-      // 更新余额：data.balance.available
-      const bal = data?.balance as { available?: string } | undefined
+      // 更新余额：data.balance.available / data.balance.locked
+      const bal = data?.balance as { available?: string; locked?: string } | undefined
       if (bal?.available != null) {
         balance.value = formatUsdcBalance(String(bal.available))
       }
+      if (bal?.locked != null) {
+        lockedBalance.value = formatUsdcBalance(String(bal.locked))
+      }
       // 更新用户信息：data.userInfo
       const u = (data?.userInfo ?? data?.user ?? data) as Record<string, unknown> | undefined
       if (!u) return
@@ -277,7 +296,9 @@ export const useUserStore = defineStore('user', () => {
     displayName,
     avatarUrl,
     balance,
+    lockedBalance,
     positionsValue,
+    availableAssetValue,
     totalAssetValue,
     setUser,
     logout,