diff --git a/static/cond_orders.js b/static/cond_orders.js
index 71f710f..dce048c 100644
--- a/static/cond_orders.js
+++ b/static/cond_orders.js
@@ -152,6 +152,17 @@
});
}
+ function isActiveOrder(o) {
+ const st = String((o && o.status) || "");
+ return st === "armed" || st === "triggering" || st === "open";
+ }
+
+ function formatOpenTime(o) {
+ const raw = String((o && o.opened_at) || "").trim();
+ if (!raw) return "—";
+ return raw.replace("T", " ").slice(0, 19);
+ }
+
function renderPhoneOrderCard(o) {
const exit = orderExitText(o);
const meta = [];
@@ -176,6 +187,9 @@
escapeHtml(orderTriggerText(o)) +
"" +
(meta.length ? '' + escapeHtml(meta.join(" · ")) + "
" : "") +
+ '开仓 ' +
+ escapeHtml(formatOpenTime(o)) +
+ "
" +
(o.message ? '' + escapeHtml(o.message) + "
" : "") +
(actions ? '' + actions + "
" : "") +
""
@@ -274,67 +288,90 @@
renderCandidateGroup("", other, checkedIds);
}
- async function loadOrders() {
- const box = document.getElementById("cond-list");
+ function renderDesktopRows(list) {
+ return list
+ .map(function (o) {
+ return (
+ "" +
+ "| " +
+ escapeHtml(o.instance_name || "") +
+ " | " +
+ '' +
+ escapeHtml(statusLabel(o)) +
+ " | " +
+ "" +
+ escapeHtml((o.underlying || "") + " " + (o.opt_type || "")) +
+ " | " +
+ "" +
+ escapeHtml(orderTriggerText(o).replace("≤", " ≤ ").replace("≥", " ≥ ")) +
+ " | " +
+ "" +
+ escapeHtml(o.deviation_pct != null ? o.deviation_pct + "%" : "—") +
+ " | " +
+ "" +
+ escapeHtml(o.min_expiry_hours != null ? String(o.min_expiry_hours) : "—") +
+ " | " +
+ "" +
+ escapeHtml(orderExitText(o) || "—") +
+ " | " +
+ '' +
+ escapeHtml(formatOpenTime(o)) +
+ " | " +
+ '' +
+ escapeHtml(o.message || "") +
+ " | " +
+ '' +
+ orderActionHtml(o) +
+ " | " +
+ "
"
+ );
+ })
+ .join("");
+ }
+
+ function renderDesktopTable(list, emptyText) {
+ if (!list.length) {
+ return '' + escapeHtml(emptyText) + "
";
+ }
+ return (
+ '' +
+ "| 客户端 | 状态 | 标的 | 触发 | 偏离 | 到期h | 出场 | 开仓时间 | 说明 | 操作 | " +
+ "
" +
+ renderDesktopRows(list) +
+ "
' + escapeHtml(emptyText) + "
";
+ }
+ return '' + list.map(renderPhoneOrderCard).join("") + "
";
+ }
+
+ function fillOrderBox(box, list, emptyText) {
if (!box) return;
+ box.innerHTML = isHubPhone() ? renderPhoneList(list, emptyText) : renderDesktopTable(list, emptyText);
+ bindOrderActions(box);
+ }
+
+ async function loadOrders() {
+ const activeBox = document.getElementById("cond-list-active");
+ const doneBox = document.getElementById("cond-list-done");
+ if (!activeBox && !doneBox) return;
const r = await fetch("/api/cond_orders");
const d = await r.json();
const list = d.orders || [];
- if (!list.length) {
- box.innerHTML = '暂无条件单
';
- return;
- }
- if (isHubPhone()) {
- box.innerHTML =
- '' +
- list.map(renderPhoneOrderCard).join("") +
- "
";
- bindOrderActions(box);
- return;
- }
- box.innerHTML =
- '' +
- "| 客户端 | 状态 | 标的 | 触发 | 偏离 | 到期h | 出场 | 说明 | 操作 | " +
- "
" +
- list
- .map(function (o) {
- return (
- "" +
- "| " +
- escapeHtml(o.instance_name || "") +
- " | " +
- '' +
- escapeHtml(statusLabel(o)) +
- " | " +
- "" +
- escapeHtml((o.underlying || "") + " " + (o.opt_type || "")) +
- " | " +
- "" +
- escapeHtml(orderTriggerText(o).replace("≤", " ≤ ").replace("≥", " ≥ ")) +
- " | " +
- "" +
- escapeHtml(o.deviation_pct != null ? o.deviation_pct + "%" : "—") +
- " | " +
- "" +
- escapeHtml(o.min_expiry_hours != null ? String(o.min_expiry_hours) : "—") +
- " | " +
- "" +
- escapeHtml(orderExitText(o) || "—") +
- " | " +
- '' +
- escapeHtml(o.message || "") +
- " | " +
- '' +
- orderActionHtml(o) +
- " | " +
- "
"
- );
- })
- .join("") +
- "
期权中控
-
-
- Ξ
- —
- —
-
-
- ₿
- —
- —
-
-
-
-
-
-
- Ξ
- ETHUSDT
- —
- —
- —
-
-
-
- ₿
- BTCUSDT
- —
- —
- —
-
-
-
{{ messages[0] }}
{% endif %}
- {% endwith %}
- {% block body %}{% endblock %}
-
- {% if session.get('logged_in') %}
-
-
- {% endif %}
- {% if session.get('logged_in') and not request.path.startswith('/desk') %}
-
- {% endif %}
- {% block scripts %}{% endblock %}
- {% if session.get('logged_in') and not request.path.startswith('/desk') %}
-
- {% endif %}
-
-
-
-
-
-
+
+
+
+
+
+ {% block title %}加密货币｜OKX 期权中控{% endblock %}
+
+
+
+
+
+
+
+
+
+
+
+ {% if session.get('logged_in') %}
+ 退出
+ {% endif %}
+
+ {% if session.get('logged_in') %}
+
+ 期权中控
+
+
+ Ξ
+ —
+ —
+
+
+ ₿
+ —
+ —
+
+
+
+
+
+
+ Ξ
+ ETHUSDT
+ —
+ —
+ —
+
+
+
+ ₿
+ BTCUSDT
+ —
+ —
+ —
+
+
+
{{ messages[0] }}
{% endif %}
+ {% endwith %}
+ {% block body %}{% endblock %}
+
+ {% if session.get('logged_in') %}
+
+
+ {% endif %}
+ {% if session.get('logged_in') and not request.path.startswith('/desk') %}
+
+ {% endif %}
+ {% block scripts %}{% endblock %}
+ {% if session.get('logged_in') and not request.path.startswith('/desk') %}
+
+ {% endif %}
+
+
+
+
+
+
diff --git a/templates/cond_orders.html b/templates/cond_orders.html
index 8a662b9..ab70fb6 100644
--- a/templates/cond_orders.html
+++ b/templates/cond_orders.html
@@ -79,13 +79,20 @@
-
条件单历史
+ 进行中
- 加载中…
+ 加载中…
+
+
+
{% endblock %}
{% block scripts %}
-
+
{% endblock %}