From cdbc9478381a041235be413b30d832e1ab3f5d6a Mon Sep 17 00:00:00 2001 From: dekun Date: Sun, 16 Aug 2026 16:09:10 +0800 Subject: [PATCH] Move options convert/transfer into the positions card as a collapsed fold. Co-authored-by: Cursor --- lib/common/static/instance_theme.css | 39 ++++----- lib/instance/templates/embed_shell.html | 2 +- lib/instance/templates/index.html | 2 +- lib/options/templates/options_page_funds.html | 84 ++++++++++--------- lib/options/templates/options_panel.html | 5 +- 5 files changed, 62 insertions(+), 70 deletions(-) diff --git a/lib/common/static/instance_theme.css b/lib/common/static/instance_theme.css index e4c165e..2458268 100644 --- a/lib/common/static/instance_theme.css +++ b/lib/common/static/instance_theme.css @@ -4577,35 +4577,28 @@ html[data-theme="light"] .opt-order-chip { gap: 16px; align-items: stretch; } -.options-order-col { - display: flex; - flex-direction: column; - gap: 12px; - min-width: 0; -} -.options-funds-card { - flex: 0 0 auto; -} -.options-funds-card h2 { - margin: 0 0 8px; - font-size: 0.9rem; - font-weight: 600; -} -.options-funds-card .options-settings-section + .options-settings-section { - margin-top: 12px; - padding-top: 10px; - border-top: 1px solid var(--border-soft, #2a3150); -} -.options-funds-card .options-settings-hint { - margin: 0 0 6px; - font-size: 0.72rem; -} .options-order-card, .options-pos-card-wrap { display: flex; flex-direction: column; min-height: 0; } +.options-funds-fold { + flex-shrink: 0; + margin-top: 10px; +} +.options-funds-fold-body { + padding-top: 8px; +} +.options-funds-fold .options-settings-section + .options-settings-section { + margin-top: 10px; + padding-top: 8px; + border-top: 1px solid var(--border-soft, #2a3150); +} +.options-funds-fold .options-settings-hint { + margin: 0 0 6px; + font-size: 0.72rem; +} .options-pos-stack, .options-pos-tab-body { flex: 1; diff --git a/lib/instance/templates/embed_shell.html b/lib/instance/templates/embed_shell.html index 3afa06e..d96cef7 100644 --- a/lib/instance/templates/embed_shell.html +++ b/lib/instance/templates/embed_shell.html @@ -8,7 +8,7 @@ - + diff --git a/lib/instance/templates/index.html b/lib/instance/templates/index.html index 99b7b35..663e9a9 100644 --- a/lib/instance/templates/index.html +++ b/lib/instance/templates/index.html @@ -19,7 +19,7 @@ {{ pwa_app_name }} - + -

兑换 / 划转

-
-

账户资金账户:USDT ↔ USDC 现货市价单.

-
- - - - - +{# 期权页·持仓卡内:兑换 + 划转(默认折叠;独立 ID 避免与系统设置冲突) #} +
+ 兑换 / 划转 +
+
+

账户资金账户:USDT ↔ USDC 现货市价单.

+
+ + + + + +
+
-
-
-
-
账户内划转
-
- - - - - - - +
+
账户内划转
+
+ + + + + + + +
+
-
-
+
diff --git a/lib/options/templates/options_panel.html b/lib/options/templates/options_panel.html index e49614d..a7e62af 100644 --- a/lib/options/templates/options_panel.html +++ b/lib/options/templates/options_panel.html @@ -15,7 +15,6 @@ {% endif %}
-

期权下单{% if options_open_allowed is defined and not options_open_allowed %} (对冲模式已禁用开仓){% endif %}

@@ -182,9 +181,6 @@
- {% include 'options_page_funds.html' %} -
-

持仓

@@ -350,6 +346,7 @@
+ {% include 'options_page_funds.html' %}