From ac8a775b98441a775c65ddeedcf170f0c16aed79 Mon Sep 17 00:00:00 2001
From: dekun <dekun@local>
Date: Tue, 13 Oct 2026 19:49:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=E6=9D=A1=E4=BB=B6=E5=8D=95=E5=88=92?=
 =?UTF-8?q?=E8=BD=AC=E5=B8=B8=E6=98=BE=EF=BC=8C=E6=A0=87=E7=9A=84=E4=B8=8E?=
 =?UTF-8?q?=E6=96=B9=E5=90=91=E5=90=8C=E4=B8=80=E8=A1=8C=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>
---
 static/cond_orders.js      | 12 +---------
 static/hub.css             | 14 ++++++++----
 templates/base.html        |  2 +-
 templates/cond_orders.html | 47 ++++++++++++++++++++------------------
 4 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/static/cond_orders.js b/static/cond_orders.js
index b3787d7..59cba3a 100644
--- a/static/cond_orders.js
+++ b/static/cond_orders.js
@@ -379,7 +379,7 @@
       '<span class="cond-inst-name">' +
       escapeHtml(it.name || "") +
       "</span>" +
-      '<span class="cond-inst-fund-line" data-xfer-toggle="1">' +
+      '<span class="cond-inst-fund-line">' +
       '<span class="cond-inst-funds cond-inst-funds--trading" title="交易账户可用">交易 ' +
       escapeHtml(fmtTradingU(it.trading_usdt)) +
       "</span>" +
@@ -494,22 +494,12 @@
         );
       });
     });
-    box.querySelectorAll("[data-xfer-toggle]").forEach(function (el) {
-      el.addEventListener("click", function (ev) {
-        ev.preventDefault();
-        ev.stopPropagation();
-        const card = el.closest(".cond-inst");
-        if (!card || card.classList.contains("is-off")) return;
-        card.classList.toggle("is-xfer-open");
-      });
-    });
     box.querySelectorAll(".cond-inst-name").forEach(function (el) {
       el.addEventListener("click", function (ev) {
         const card = el.closest(".cond-inst");
         if (!card || card.classList.contains("is-off")) return;
         const cb = card.querySelector('input[name="cf-inst"]');
         if (!cb || cb.disabled) return;
-        // 点名称切换勾选(避免点余额误勾)
         if (ev.target === el) {
           cb.checked = !cb.checked;
         }
diff --git a/static/hub.css b/static/hub.css
index 025575b..9a3ce6c 100644
--- a/static/hub.css
+++ b/static/hub.css
@@ -1496,6 +1496,13 @@ input.readonly {
   color: #b6c7da;
   margin-bottom: 6px;
 }
+.cond-uly-side-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px 16px;
+  align-items: end;
+}
+.cond-uly-side-item { min-width: 0; }
 .cond-native-select[hidden] { display: none !important; }
 .cond-seg {
   display: inline-flex;
@@ -1621,7 +1628,7 @@ input.readonly {
   margin: 2px 0 0;
   flex-shrink: 0;
   grid-column: 1;
-  grid-row: 1;
+  grid-row: 1 / span 2;
   align-self: start;
 }
 .cond-inst-main {
@@ -1655,9 +1662,7 @@ input.readonly {
   flex-wrap: wrap;
   gap: 6px 12px;
   margin-top: 3px;
-  cursor: pointer;
 }
-.cond-inst.is-off .cond-inst-fund-line { cursor: default; }
 .cond-inst-funds {
   color: var(--accent-2, #38bdf8);
   font-size: 0.76rem;
@@ -1670,7 +1675,7 @@ input.readonly {
   font-weight: 500;
 }
 .cond-inst-actions {
-  display: none;
+  display: flex;
   align-items: center;
   flex-wrap: wrap;
   gap: 6px;
@@ -1678,7 +1683,6 @@ input.readonly {
   grid-row: 2;
   padding-top: 2px;
 }
-.cond-inst.is-xfer-open .cond-inst-actions { display: flex; }
 .cond-inst-xfer {
   flex-shrink: 0;
   white-space: nowrap;
diff --git a/templates/base.html b/templates/base.html
index 5ad024c..b5c7be4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -11,7 +11,7 @@
   <link rel="icon" href="{{ url_for('static', filename='icons/favicon.ico') }}?v=2" sizes="any">
   <link rel="apple-touch-icon" href="{{ url_for('static', filename='icons/apple-touch-icon.png') }}?v=2">
   <link rel="manifest" href="/manifest.webmanifest">
-  <link rel="stylesheet" href="{{ url_for('static', filename='hub.css') }}?v=53">
+  <link rel="stylesheet" href="{{ url_for('static', filename='hub.css') }}?v=54">
   <script>
   (function () {
     try {
diff --git a/templates/cond_orders.html b/templates/cond_orders.html
index b9f8fa2..9cf1ae5 100644
--- a/templates/cond_orders.html
+++ b/templates/cond_orders.html
@@ -27,27 +27,30 @@
         <div class="cond-col-title">策略</div>
 
         <div class="cond-block">
-          <span class="cond-mini-label">标的</span>
-          <div class="cond-seg" id="cf-uly-seg" role="group" aria-label="标的">
-            <button type="button" class="cond-seg-btn on" data-uly="ETH">ETH</button>
-            <button type="button" class="cond-seg-btn" data-uly="BTC">BTC</button>
+          <div class="cond-uly-side-row">
+            <div class="cond-uly-side-item">
+              <span class="cond-mini-label">标的</span>
+              <div class="cond-seg" id="cf-uly-seg" role="group" aria-label="标的">
+                <button type="button" class="cond-seg-btn on" data-uly="ETH">ETH</button>
+                <button type="button" class="cond-seg-btn" data-uly="BTC">BTC</button>
+              </div>
+              <select id="cf-underlying" class="cond-native-select" hidden>
+                <option value="ETH" selected>ETH</option>
+                <option value="BTC">BTC</option>
+              </select>
+            </div>
+            <div class="cond-uly-side-item">
+              <span class="cond-mini-label">方向</span>
+              <div class="cond-seg" id="cf-side-seg" role="group" aria-label="方向">
+                <button type="button" class="cond-seg-btn on" data-side="P">看跌 Put</button>
+                <button type="button" class="cond-seg-btn" data-side="C">看涨 Call</button>
+              </div>
+              <select id="cf-opt-type" class="cond-native-select" hidden>
+                <option value="P" selected>看跌 Put</option>
+                <option value="C">看涨 Call</option>
+              </select>
+            </div>
           </div>
-          <select id="cf-underlying" class="cond-native-select" hidden>
-            <option value="ETH" selected>ETH</option>
-            <option value="BTC">BTC</option>
-          </select>
-        </div>
-
-        <div class="cond-block">
-          <span class="cond-mini-label">方向</span>
-          <div class="cond-seg" id="cf-side-seg" role="group" aria-label="方向">
-            <button type="button" class="cond-seg-btn on" data-side="P">看跌 Put</button>
-            <button type="button" class="cond-seg-btn" data-side="C">看涨 Call</button>
-          </div>
-          <select id="cf-opt-type" class="cond-native-select" hidden>
-            <option value="P" selected>看跌 Put</option>
-            <option value="C">看涨 Call</option>
-          </select>
         </div>
 
         <div class="cond-block">
@@ -87,7 +90,7 @@
           <div class="cond-col-title">下发到客户端</div>
           <div class="muted cond-right-meta" id="cf-inst-meta">按标的过滤</div>
         </div>
-        <p class="muted cond-right-lead">按标的白名单过滤；点余额行可展开本页划转。</p>
+        <p class="muted cond-right-lead">按标的白名单过滤；余额旁可本页划转。</p>
         <div id="cf-instances"></div>
       </div>
     </div>
@@ -115,6 +118,6 @@
 </div>
 {% endblock %}
 {% block scripts %}
-<script src="{{ url_for('static', filename='cond_orders.js') }}?v=15"></script>
+<script src="{{ url_for('static', filename='cond_orders.js') }}?v=16"></script>
 <script>HubCondOrders.boot();</script>
 {% endblock %}