feat条件单页支持资金与交易户双向划转,并修正账户名被挤占。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
dekun
2026-10-13 14:36:52 +08:00
parent 1c3ea77db8
commit b81b999090
4 changed files with 90 additions and 34 deletions
+51 -21
View File
@@ -251,7 +251,7 @@
if (fundEl) fundEl.textContent = "资金 " + fmtTradingU(fundingUsdt);
}
function transferFundingToTrading(instanceId) {
function transferInternal(instanceId, direction) {
const id = String(instanceId || "");
const it = candidatesById[id];
if (!it) return;
@@ -263,31 +263,39 @@
window.alert(it.transfer_block_msg || "当前不可划转");
return;
}
const fund = Number(it.funding_usdt);
const toTrading = direction !== "to_funding";
const fromAcct = toTrading ? "funding" : "trading";
const toAcct = toTrading ? "trading" : "funding";
const srcBal = Number(toTrading ? it.funding_usdt : it.trading_usdt);
const defAmt =
!Number.isNaN(fund) && fund > 0 ? String(Math.round(fund * 10000) / 10000) : "";
const raw = window.prompt("资金户 → 交易户(USDT)。本页划转,条件单表单不会丢失。", defAmt);
!Number.isNaN(srcBal) && srcBal > 0
? String(Math.round(srcBal * 10000) / 10000)
: "";
const label = toTrading ? "资金户 → 交易户" : "交易户 → 资金户";
const raw = window.prompt(label + "(USDT)。本页划转,条件单表单不会丢失。", defAmt);
if (raw == null) return;
const amount = Number(String(raw).trim());
if (!(amount > 0)) {
window.alert("请输入大于 0 的数量");
return;
}
const btn = document.querySelector(
const btns = document.querySelectorAll(
'.cond-inst-xfer[data-inst-id="' + id.replace(/"/g, "") + '"]'
);
if (btn) {
const labels = [];
btns.forEach(function (btn) {
labels.push(btn.textContent);
btn.disabled = true;
btn.textContent = "划转中…";
}
});
fetch("/api/instances/" + encodeURIComponent(id) + "/transfer", {
method: "POST",
credentials: "same-origin",
headers: { "Content-Type": "application/json", Accept: "application/json" },
body: JSON.stringify({
amount: amount,
from: "funding",
to: "trading",
from: fromAcct,
to: toAcct,
ccy: "USDT",
}),
})
@@ -307,10 +315,14 @@
if (st) {
st.textContent =
(it.name || id) +
" 已划入交易 " +
" " +
label +
" " +
fmtTradingU(amount) +
"(交易 " +
fmtTradingU(d.trading_usdt) +
" / 资金 " +
fmtTradingU(d.funding_usdt) +
")";
}
})
@@ -318,10 +330,11 @@
window.alert("划转请求失败");
})
.finally(function () {
if (btn) {
btn.disabled = !!(it.transfer_blocked || !it.online);
btn.textContent = "划入交易";
}
const blocked = !!(it.transfer_blocked || !it.online);
btns.forEach(function (btn, i) {
btn.disabled = blocked;
btn.textContent = labels[i] || btn.getAttribute("data-label") || "划转";
});
});
}
@@ -341,16 +354,18 @@
const xferBlocked = !!(it.transfer_blocked || !it.online);
const xferTitle = xferBlocked
? it.transfer_block_msg || (!it.online ? "离线" : "不可划转")
: "资金户→交易户,本页完成不丢表单";
: "本页双向划转,表单不丢";
const dis = xferBlocked ? " disabled" : "";
return (
'<div class="cond-inst-row' +
(disabled ? " is-off" : "") +
'" data-inst-id="' +
escapeHtml(id) +
'">' +
'<label class="cond-inst' +
'<div class="cond-inst' +
(disabled ? " is-off" : "") +
'" title="' +
'">' +
'<label class="cond-inst-head" title="' +
escapeHtml(tip) +
'">' +
'<input type="checkbox" name="cf-inst" value="' +
@@ -365,23 +380,35 @@
'<span class="cond-inst-tag">' +
escapeHtml(tip) +
"</span>" +
"</label>" +
'<div class="cond-inst-body">' +
'<span class="cond-inst-funds cond-inst-funds--trading" title="交易账户可用">交易 ' +
escapeHtml(fmtTradingU(it.trading_usdt)) +
"</span>" +
'<span class="cond-inst-funds cond-inst-funds--funding muted" title="资金账户可用">资金 ' +
escapeHtml(fmtTradingU(it.funding_usdt)) +
"</span>" +
"</label>" +
'<span class="cond-inst-actions">' +
'<button type="button" class="btn btn-sm cond-inst-xfer" data-inst-id="' +
escapeHtml(id) +
'" title="' +
'" data-dir="to_trading" data-label="划入交易" title="' +
escapeHtml(xferTitle) +
'"' +
(xferBlocked ? " disabled" : "") +
dis +
">划入交易</button>" +
'<button type="button" class="btn btn-secondary btn-sm cond-inst-xfer" data-inst-id="' +
escapeHtml(id) +
'" data-dir="to_funding" data-label="划入资金" title="' +
escapeHtml(xferTitle) +
'"' +
dis +
">划入资金</button>" +
'<button type="button" class="btn btn-secondary btn-sm cond-inst-open" data-inst-id="' +
escapeHtml(id) +
'" title="新标签打开实例">打开</button>' +
"</span>" +
"</div>" +
"</div>" +
"</div>"
);
}
@@ -443,7 +470,10 @@
btn.addEventListener("click", function (ev) {
ev.preventDefault();
ev.stopPropagation();
transferFundingToTrading(btn.getAttribute("data-inst-id") || "");
transferInternal(
btn.getAttribute("data-inst-id") || "",
btn.getAttribute("data-dir") || "to_trading"
);
});
});
box.querySelectorAll(".cond-inst-open").forEach(function (btn) {