From 13b03ed750157f9c55c67417c04f9ba8182aadbd Mon Sep 17 00:00:00 2001
From: dekun <dekun@local>
Date: Wed, 12 Aug 2026 19:44:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E7=9B=98/=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E4=BD=8D=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80=EF=BC=9A?=
 =?UTF-8?q?=E5=BC=80=E4=BB=93=E6=8C=89=E9=92=AE=E8=B7=9F=E7=9B=88=E4=BA=8F?=
 =?UTF-8?q?=E6=AF=94=E3=80=81=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E5=90=8C?=
 =?UTF-8?q?=E8=A1=8C=EF=BC=9B=E6=88=90=E4=BA=A4=E4=BB=B7=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E7=A7=BB=E5=85=A5=E5=BC=80=E4=BB=93=E8=A7=84=E5=88=99=EF=BC=9B?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E5=91=A8=E6=9C=9FK=E7=BA=BF?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 lib/common/static/instance_page.css           | 10 +++++++++-
 lib/instance/templates/embed_shell.html       |  4 ++--
 lib/instance/templates/index.html             |  4 ++--
 .../templates/order_monitor_open_form.html    | 20 ++++++-------------
 lib/strategy/templates/key_monitor_panel.html |  4 ++--
 .../order_monitor_rule_tips_binance.html      |  2 +-
 .../order_monitor_rule_tips_gate.html         |  2 +-
 .../order_monitor_rule_tips_gate_bot.html     |  2 +-
 .../order_monitor_rule_tips_okx.html          |  2 +-
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/lib/common/static/instance_page.css b/lib/common/static/instance_page.css
index c0db29f..476d4da 100644
--- a/lib/common/static/instance_page.css
+++ b/lib/common/static/instance_page.css
@@ -32,12 +32,20 @@
         .order-monitor-form .om-field-lab{font-size:.72rem;color:#9aa3c7;line-height:1;letter-spacing:.02em}
         .order-monitor-form .om-field input{width:9.5rem;max-width:160px;box-sizing:border-box}
         .order-monitor-form .om-live-meta{display:flex;flex-wrap:wrap;align-items:center;gap:8px;padding-bottom:2px;margin-left:auto}
+        .order-monitor-form .om-row-levels .om-submit{align-self:flex-end;min-width:11rem;padding:10px 18px;font-weight:600;flex:0 0 auto}
+        .order-monitor-form .om-row-levels .om-open-block-note{align-self:center;padding-bottom:2px}
         .order-monitor-form .om-row-opts{align-items:center;gap:12px;padding-top:2px}
         .order-monitor-form .om-check{display:inline-flex;align-items:center;gap:5px;font-size:.82rem;color:#cfd3ef;cursor:pointer;user-select:none}
         .order-monitor-form .om-time-close{display:inline-flex;align-items:center;gap:6px;font-size:.82rem;color:#cfd3ef}
         .order-monitor-form .om-time-close select{width:auto;min-width:4.2rem;max-width:5.5rem;padding:6px 8px}
-        .order-monitor-form .om-row-action{padding-top:2px;display:flex;flex-wrap:wrap;align-items:center;gap:10px 14px}
         .order-monitor-form .om-submit{min-width:11rem;padding:10px 18px;font-weight:600}
+        /* 关键位监控:主字段与添加按钮尽量同一行 */
+        #key-form.key-form-inline{flex-wrap:nowrap;overflow-x:auto;align-items:center;gap:8px}
+        #key-form.key-form-inline > input:not([type=checkbox]):not([type=radio]),
+        #key-form.key-form-inline > select{flex:0 0 auto;width:8.5rem;min-width:6.5rem;max-width:10rem}
+        #key-form.key-form-inline .trade-policy-symbol-select,
+        #key-form.key-form-inline #key-type-select{width:9rem;max-width:11rem}
+        #key-form.key-form-inline .key-form-add-btn{flex:0 0 auto;white-space:nowrap;padding:8px 14px}
         .order-monitor-form .om-submit.is-blocked,
         .order-monitor-form .om-submit:disabled{
             opacity:.45;
diff --git a/lib/instance/templates/embed_shell.html b/lib/instance/templates/embed_shell.html
index da4955d..9c6ff2b 100644
--- a/lib/instance/templates/embed_shell.html
+++ b/lib/instance/templates/embed_shell.html
@@ -7,8 +7,8 @@
     <script src="/static/autofill_guard.js?v=1"></script>
     <link rel="stylesheet" href="/static/instance_theme_early.css?v=4">
     <link rel="stylesheet" href="/static/account_risk_badge.css?v=4">
-    <link rel="stylesheet" href="/static/instance_page.css?v=13">
-    <link rel="stylesheet" href="/static/instance_theme.css?v=117">
+    <link rel="stylesheet" href="/static/instance_page.css?v=14">
+    <link rel="stylesheet" href="/static/instance_theme.css?v=118">
     <script src="/static/account_risk_badge.js?v=4"></script>
     <script src="/static/open_submit_gate.js?v=1"></script>
     <meta name="theme-color" content="#0b0d14">
diff --git a/lib/instance/templates/index.html b/lib/instance/templates/index.html
index 3354750..88d3d94 100644
--- a/lib/instance/templates/index.html
+++ b/lib/instance/templates/index.html
@@ -18,8 +18,8 @@
     <link rel="apple-touch-icon" href="/static/icons/apple-touch-icon.png">
     <link rel="manifest" href="/static/icons/manifest.webmanifest">
     <title>{{ pwa_app_name }}</title>
-    <link rel="stylesheet" href="/static/instance_page.css?v=13">
-    <link rel="stylesheet" href="/static/instance_theme.css?v=117">
+    <link rel="stylesheet" href="/static/instance_page.css?v=14">
+    <link rel="stylesheet" href="/static/instance_theme.css?v=118">
 
 </head>
 <body
diff --git a/lib/instance/templates/order_monitor_open_form.html b/lib/instance/templates/order_monitor_open_form.html
index 20fd3b3..42894c9 100644
--- a/lib/instance/templates/order_monitor_open_form.html
+++ b/lib/instance/templates/order_monitor_open_form.html
@@ -24,6 +24,8 @@
             <span class="om-field-lab">盈亏比</span>
             <input id="order-fixed-rr" name="fixed_rr" type="number" min="0.01" step="0.01" placeholder="默认1.5" value="1.5" title="止盈距离=止损距离×盈亏比">
         </label>
+        <button type="submit" class="om-submit{% if not can_trade %} is-blocked{% endif %}" id="om-submit-btn"{% if not can_trade %} disabled aria-disabled="true"{% endif %}>{{ open_position_button_label }}</button>
+        <span id="om-open-block-note" class="om-open-block-note"{% if can_trade or not (open_block_note|default('')) %} hidden{% endif %}>{% if not can_trade and (open_block_note|default('')) %}{{ open_block_note }}{% endif %}</span>
         <label class="om-field" id="om-field-tp" style="display:none">
             <span class="om-field-lab">止盈价格</span>
             <input id="order-tp" name="tgt" step="any" placeholder="止盈价格">
@@ -39,12 +41,11 @@
         <div class="om-live-meta">
             {% from 'symbol_live_price_snippet.html' import symbol_live_price_hint %}
             {{ symbol_live_price_hint('order-symbol-live-price', 'order-symbol', 'order-direction') }}
-            <span class="symbol-live-price-note">成交价以交易所回报为准</span>
         </div>
     </div>
 
+    {% if not intraday_discipline %}
     <div class="om-row om-row-opts">
-        {% if not intraday_discipline %}
         <label class="om-check">
             <input type="checkbox" name="breakeven_enabled" value="1" checked>
             <span>移动保本</span>
@@ -60,18 +61,9 @@
                 <option value="4" selected>4h</option>
             </select>
         </span>
-        {% else %}
-        <input type="hidden" name="breakeven_enabled" value="0">
-        {% endif %}
-        <label class="om-check" title="开仓后生成多周期K线图(各周期100根,含开平仓标记)">
-            <input type="checkbox" name="order_chart" value="true">
-            <span>开仓后生成多周期K线</span>
-        </label>
-    </div>
-
-    <div class="om-row om-row-action">
-        <button type="submit" class="om-submit{% if not can_trade %} is-blocked{% endif %}" id="om-submit-btn"{% if not can_trade %} disabled aria-disabled="true"{% endif %}>{{ open_position_button_label }}</button>
-        <span id="om-open-block-note" class="om-open-block-note"{% if can_trade or not (open_block_note|default('')) %} hidden{% endif %}>{% if not can_trade and (open_block_note|default('')) %}{{ open_block_note }}{% endif %}</span>
     </div>
+    {% else %}
+    <input type="hidden" name="breakeven_enabled" value="0">
+    {% endif %}
 </form>
 {% include 'order_plan_preview_bar.html' %}
diff --git a/lib/strategy/templates/key_monitor_panel.html b/lib/strategy/templates/key_monitor_panel.html
index 9e8be2f..2efba5e 100644
--- a/lib/strategy/templates/key_monitor_panel.html
+++ b/lib/strategy/templates/key_monitor_panel.html
@@ -141,7 +141,7 @@
         <a href="/key_focus" class="btn-del" style="text-decoration:none;background:#1f3a5a;color:#8fc8ff">输入币种查看K线</a>
         {% endif %}
     </div>
-    <form id="key-form" action="/add_key" method="post" class="form-row">
+    <form id="key-form" action="/add_key" method="post" class="form-row key-form-inline">
         {% from 'trade_policy_fields.html' import trade_policy_symbol, trade_policy_direction with context %}
         {{ trade_policy_symbol('symbol', 'key-symbol') }}
         <select name="type" id="key-type-select" required>
@@ -167,6 +167,7 @@
         <input name="trigger_tp" id="key-trigger-tp" step="0.0001" placeholder="止盈价" style="display:none">
         <input name="upper" id="key-upper" step="0.0001" placeholder="上沿/阻力" required>
         <input name="lower" id="key-lower" step="0.0001" placeholder="下沿/支撑" required>
+        <button type="submit" class="key-form-add-btn">添加</button>
         <select name="sl_tp_mode" id="key-sl-tp-mode" title="止盈止损方案">
             <option value="standard">标准突破</option>
             <option value="box_1p5">箱体1R·止盈1.5H</option>
@@ -186,7 +187,6 @@
                 <option value="4" selected>4h</option>
             </select>
         </span>
-        <button type="submit">添加</button>
     </form>
     <details class="tip-collapse key-rule-collapse">
         <summary class="tip-collapse-summary">关键位监控规则说明</summary>
diff --git a/lib/strategy/templates/order_monitor_rule_tips_binance.html b/lib/strategy/templates/order_monitor_rule_tips_binance.html
index ec63b41..94ea1ee 100644
--- a/lib/strategy/templates/order_monitor_rule_tips_binance.html
+++ b/lib/strategy/templates/order_monitor_rule_tips_binance.html
@@ -4,7 +4,7 @@
         规则:最多 {{ max_active_positions }} 仓;BTC {{ btc_leverage }}x / 山寨 {{ alt_leverage }}x;
         本交易日开仓 {{ opens_today }}{% if daily_open_hard_limit > 0 %} / 硬上限 {{ daily_open_hard_limit }}{% endif %}(AI 提醒 {{ daily_open_alert_threshold }});
         {% if can_trade %}可开仓{% else %}不可开仓(持仓已满,单日开仓达上限,或未到北京时间 {{ reset_hour }}:00){% endif %};
-        人工开仓盈亏比不得低于 {{ manual_min_planned_rr }}:1
+        人工开仓盈亏比不得低于 {{ manual_min_planned_rr }}:1；成交价以交易所回报为准
     </div>
 </details>
 <details class="tip-collapse order-exit-collapse">
diff --git a/lib/strategy/templates/order_monitor_rule_tips_gate.html b/lib/strategy/templates/order_monitor_rule_tips_gate.html
index 7719874..d0c0a1a 100644
--- a/lib/strategy/templates/order_monitor_rule_tips_gate.html
+++ b/lib/strategy/templates/order_monitor_rule_tips_gate.html
@@ -4,7 +4,7 @@
         规则:最多 {{ max_active_positions }} 仓;BTC {{ btc_leverage }}x / 山寨 {{ alt_leverage }}x;
         本交易日开仓 {{ opens_today }}{% if daily_open_hard_limit > 0 %} / 硬上限 {{ daily_open_hard_limit }}{% endif %}(AI 提醒 {{ daily_open_alert_threshold }});
         {% if can_trade %}可开仓{% else %}不可开仓(持仓已满,单日开仓达上限,或未到北京时间 {{ reset_hour }}:00){% endif %};
-        人工开仓盈亏比不得低于 {{ manual_min_planned_rr }}:1
+        人工开仓盈亏比不得低于 {{ manual_min_planned_rr }}:1；成交价以交易所回报为准
     </div>
 </details>
 <details class="tip-collapse order-exit-collapse">
diff --git a/lib/strategy/templates/order_monitor_rule_tips_gate_bot.html b/lib/strategy/templates/order_monitor_rule_tips_gate_bot.html
index ec88a25..02a4440 100644
--- a/lib/strategy/templates/order_monitor_rule_tips_gate_bot.html
+++ b/lib/strategy/templates/order_monitor_rule_tips_gate_bot.html
@@ -4,7 +4,7 @@
         规则:最大同时持仓 {{ max_active_positions }}(当前 active {{ active_count }});与「趋势回调」计划互斥;BTC {{ btc_leverage }}x / 山寨 {{ alt_leverage }}x;
         本交易日开仓 {{ opens_today }}{% if daily_open_hard_limit > 0 %} / 硬上限 {{ daily_open_hard_limit }}{% endif %}(AI 提醒 {{ daily_open_alert_threshold }});
         {% if can_trade %}可开仓{% else %}不可开仓(持仓达上限,单日开仓达上限,有趋势回调计划,或未到北京时间 {{ reset_hour }}:00){% endif %};
-        人工开仓盈亏比不得低于 {{ manual_min_planned_rr }}:1
+        人工开仓盈亏比不得低于 {{ manual_min_planned_rr }}:1；成交价以交易所回报为准
     </div>
 </details>
 <details class="tip-collapse order-sizing-collapse">
diff --git a/lib/strategy/templates/order_monitor_rule_tips_okx.html b/lib/strategy/templates/order_monitor_rule_tips_okx.html
index 737327a..38505d0 100644
--- a/lib/strategy/templates/order_monitor_rule_tips_okx.html
+++ b/lib/strategy/templates/order_monitor_rule_tips_okx.html
@@ -4,7 +4,7 @@
         规则:最多 {{ max_active_positions }} 仓;BTC {{ btc_leverage }}x / 山寨 {{ alt_leverage }}x;
         本交易日开仓 {{ opens_today }}{% if daily_open_hard_limit > 0 %} / 硬上限 {{ daily_open_hard_limit }}{% endif %}(AI 提醒 {{ daily_open_alert_threshold }});
         {% if can_trade %}可开仓{% else %}不可开仓{% if active_count >= max_active_positions %}(持仓 {{ active_count }}/{{ max_active_positions }}){% endif %}{% if daily_open_hard_limit > 0 and opens_today >= daily_open_hard_limit %}(单日开仓达上限){% endif %}{% if open_guard_blocks_now %}(未到北京时间 {{ reset_hour }}:00){% endif %}{% endif %};
-        人工开仓盈亏比不得低于 {{ manual_min_planned_rr }}:1
+        人工开仓盈亏比不得低于 {{ manual_min_planned_rr }}:1；成交价以交易所回报为准
     </div>
 </details>
 <details class="tip-collapse order-exit-collapse">