diff --git a/manual_trading_hub/static/app.css b/manual_trading_hub/static/app.css
index efefe74..f2b6bd8 100644
--- a/manual_trading_hub/static/app.css
+++ b/manual_trading_hub/static/app.css
@@ -9963,12 +9963,11 @@ html[data-theme="light"] .hub-logs-card-hint {
 /* ── 一屏适配:桌面;手机端 .hub-phone 另走 ── */
 @media (min-width: 721px) and (min-height: 650px) {
   /*
-   * app-shell 必须固定 100dvh(行情/资金 flex 图表依赖父级高度)。
-   * 壳子拉满视口宽度,滚动条才能贴窗口右缘;内容用左右 padding 居中限宽。
+   * 监控/行情:壳子拉满视口宽 + 固定 100dvh,滚动条贴窗口右缘。
+   * 资金概况单独走 body 滚动(见下),避免内层滚动条缩进。
    */
   body.hub-page-monitor:not(.hub-phone) .app-shell,
-  body.hub-page-market:not(.hub-phone) .app-shell,
-  body.hub-page-funds:not(.hub-phone) .app-shell {
+  body.hub-page-market:not(.hub-phone) .app-shell {
     max-width: none;
     width: 100%;
     margin-left: 0;
@@ -9984,6 +9983,31 @@ html[data-theme="light"] .hub-logs-card-hint {
     overflow-x: hidden;
     overflow-y: auto;
   }
+
+  /* 资金概况:由 body 滚动,滚动条贴窗口最右边 */
+  body.hub-page-funds:not(.hub-phone) {
+    height: 100dvh;
+    max-height: 100dvh;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  body.hub-page-funds:not(.hub-phone) .app-shell {
+    max-width: none;
+    width: 100%;
+    margin-left: 0;
+    margin-right: 0;
+    height: auto;
+    min-height: 100%;
+    max-height: none;
+    padding-top: 0;
+    padding-bottom: 16px;
+    padding-left: max(48px, env(safe-area-inset-left), calc((100vw - 1680px) / 2));
+    padding-right: max(48px, env(safe-area-inset-right), calc((100vw - 1680px) / 2));
+    display: flex;
+    flex-direction: column;
+    overflow: visible;
+  }
 }
 
 @media (min-width: 2001px) and (min-height: 650px) {
@@ -9995,6 +10019,18 @@ html[data-theme="light"] .hub-logs-card-hint {
   }
 }
 
+/* 其它桌面页(计算器/设置/内照明心等):壳子同样拉满宽度,页面滚动条贴右缘 */
+@media (min-width: 721px) {
+  body:not(.hub-phone):not(.hub-page-monitor):not(.hub-page-market):not(.hub-page-funds):not(.hub-page-ai) .app-shell {
+    max-width: none;
+    width: 100%;
+    margin-left: 0;
+    margin-right: 0;
+    padding-left: max(24px, env(safe-area-inset-left), calc((100vw - 1680px) / 2));
+    padding-right: max(24px, env(safe-area-inset-right), calc((100vw - 1680px) / 2));
+  }
+}
+
 @media (min-width: 721px) and (min-height: 650px) {
   body.hub-page-monitor:not(.hub-phone) .app-header,
   body.hub-page-market:not(.hub-phone) .app-header,
@@ -10211,31 +10247,32 @@ html[data-theme="light"] .hub-logs-card-hint {
 
   /* —— 资金概况 —— */
   body.hub-page-funds:not(.hub-phone) #page-funds {
-    flex: 1 1 auto;
+    flex: 0 0 auto;
     min-height: 0;
+    height: auto;
     display: flex;
     flex-direction: column;
-    overflow: hidden;
+    overflow: visible;
   }
 
   body.hub-page-funds:not(.hub-phone) .funds-stage {
-    flex: 1 1 auto;
+    flex: 0 0 auto;
     min-height: 0;
+    height: auto;
     display: flex;
     flex-direction: column;
-    overflow: hidden;
+    overflow: visible;
   }
 
-  /* 内容超出时在此滚动,避免 1080 裁切曲线日期/分户卡片且无滚动条 */
+  /* 不在内层滚动,改由 body 贴边滚动 */
   body.hub-page-funds:not(.hub-phone) .funds-stage-inner {
-    flex: 1 1 auto;
+    flex: 0 0 auto;
     min-height: 0;
+    height: auto;
     display: flex;
     flex-direction: column;
     padding: 8px 12px 16px;
-    overflow-x: hidden;
-    overflow-y: auto;
-    overscroll-behavior: contain;
+    overflow: visible;
   }
 
   body.hub-page-funds:not(.hub-phone) .funds-head {
diff --git a/manual_trading_hub/static/app.js b/manual_trading_hub/static/app.js
index 7ecce39..ce87c16 100644
--- a/manual_trading_hub/static/app.js
+++ b/manual_trading_hub/static/app.js
@@ -1313,6 +1313,13 @@
     document.body.classList.toggle("hub-page-dashboard", page === "dashboard");
     document.body.classList.toggle("hub-page-monitor", page === "monitor");
     document.body.classList.toggle("hub-page-market", page === "market");
+    document.body.classList.toggle("hub-page-calculator", page === "calculator");
+    document.body.classList.toggle("hub-page-settings", page === "settings");
+    document.body.classList.toggle("hub-page-archive", page === "archive");
+    document.body.classList.toggle("hub-page-plan", page === "plan");
+    document.body.classList.toggle("hub-page-strategy", page === "strategy");
+    document.body.classList.toggle("hub-page-logs", page === "logs");
+    document.body.classList.toggle("hub-page-help", page === "help");
     syncHubPhoneShellClass();
     if (HUB_PHONE_PRIMARY[page]) closeHubMobileMore();
     syncHubMobileTabActive(page);
diff --git a/manual_trading_hub/static/index.html b/manual_trading_hub/static/index.html
index 074ba85..47fa7f2 100644
--- a/manual_trading_hub/static/index.html
+++ b/manual_trading_hub/static/index.html
@@ -15,7 +15,7 @@
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
   <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600&family=Orbitron:wght@500;600;700&display=swap" rel="stylesheet" media="print" onload="this.media='all'" />
   <noscript><link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600&family=Orbitron:wght@500;600;700&display=swap" rel="stylesheet" /></noscript>
-      <link rel="stylesheet" href="/assets/app.css?v=20260717-funds-scroll-fix" />
+      <link rel="stylesheet" href="/assets/app.css?v=20260717-scrollbar-right-all" />
   <link rel="stylesheet" href="/assets/trade_stats_calendar.css?v=4" />
   <link rel="stylesheet" href="/assets/account_risk_badge.css?v=4" />
   <script src="/assets/account_risk_badge.js?v=4"></script>
@@ -1322,6 +1322,6 @@
   <script src="/assets/options_expiry_countdown.js?v=1"></script>
   <script src="/assets/options_position_cards.js?v=1"></script>
   <script src="/assets/backup.js?v=1"></script>
-  <script src="/assets/app.js?v=20260716-hub-stats-fold"></script>
+  <script src="/assets/app.js?v=20260717-scrollbar-right-all"></script>
 </body>
 </html>