移除一键保本bug

crypto_monitor_okx/app.py

@@ -73,7 +73,6 @@ from key_sl_tp_lib import (
     sl_tp_mode_label,
     sl_tp_plan_summary_text,
 )
-from order_manual_breakeven_lib import apply_order_manual_breakeven
 from key_monitor_lib import (
     KEY_DIRECTION_WATCH,
     KEY_MONITOR_ALERT_ONLY_TYPES,
@@ -5847,80 +5846,6 @@ def api_order_cancel_tpsl(order_id):
         return jsonify({"ok": False, "msg": friendly_exchange_error(e)}), 400
 
 
-@app.route("/api/order/<int:order_id>/manual_breakeven", methods=["POST"])
-@login_required
-def api_order_manual_breakeven(order_id):
-    data = request.get_json(silent=True) or {}
-    try:
-        offset_pct = float(
-            data.get("offset_pct", os.getenv("MANUAL_BREAKEVEN_OFFSET_PCT", "0.2"))
-        )
-    except (TypeError, ValueError):
-        return jsonify({"ok": False, "msg": "offset_pct 无效"}), 400
-    if offset_pct < 0 or offset_pct > 10:
-        return jsonify({"ok": False, "msg": "偏移%须在 0～10 之间"}), 400
-    conn = get_db()
-    row = conn.execute(
-        "SELECT * FROM order_monitors WHERE id=? AND status='active'",
-        (order_id,),
-    ).fetchone()
-    if not row:
-        conn.close()
-        return jsonify({"ok": False, "msg": "持仓不存在或已结束"}), 404
-    ok, err, new_sl = apply_order_manual_breakeven(
-        row,
-        offset_pct,
-        calc_stop_fn=calc_trend_manual_breakeven_stop,
-        round_price_fn=round_price_to_exchange,
-        resolve_ex_sym_fn=resolve_monitor_exchange_symbol,
-        get_position_fn=get_live_position_contracts,
-        replace_tpsl_fn=replace_active_monitor_tpsl_on_exchange,
-    )
-    if not ok:
-        conn.close()
-        return jsonify({"ok": False, "msg": err or "保本失败"}), 400
-    conn.execute(
-        "UPDATE order_monitors SET stop_loss=?, breakeven_armed=1, breakeven_price=? WHERE id=?",
-        (new_sl, new_sl, order_id),
-    )
-    conn.commit()
-    sym = row["symbol"]
-    direction = row["direction"]
-    ex_sym = resolve_monitor_exchange_symbol(row)
-    take_profit = float(row["take_profit"] or 0)
-    slots = fetch_exchange_tpsl_slots(
-        ex_sym, direction, plan_sl=new_sl, plan_tp=take_profit
-    )
-    conn.close()
-    try:
-        entry = float(row["trigger_price"] or 0)
-        send_wechat_msg(
-            "\n".join(
-                [
-                    f"# ✅ {sym} 一键保本",
-                    f"**账户：{_wechat_account_label()}**",
-                    f"- 方向：{'做多' if direction == 'long' else '做空'}",
-                    f"- 成交价：{format_price_for_symbol(sym, entry)}",
-                    f"- 偏移：{offset_pct}%（相对成交价）",
-                    f"- 新止损：{format_price_for_symbol(sym, new_sl)}",
-                    "- 交易所：已更新止盈止损",
-                ]
-            )
-        )
-    except Exception:
-        pass
-    return jsonify(
-        {
-            "ok": True,
-            "msg": "已一键保本",
-            "stop_loss": new_sl,
-            "stop_loss_display": format_price_for_symbol(sym, new_sl),
-            "breakeven_armed": True,
-            "exchange_tpsl": slots,
-        }
-    )
-
-
 @app.route("/api/order/<int:order_id>/place_tpsl", methods=["POST"])
 @login_required
 def api_order_place_tpsl(order_id):

crypto_monitor_okx/templates/index.html

@@ -194,13 +194,6 @@
         .pos-ex-order-main{flex:1;min-width:0;line-height:1.35}
         .pos-ex-cancel-btn{padding:3px 10px;background:#3a3048;color:#d4b8ff;border:none;border-radius:6px;font-size:.74rem;cursor:pointer;flex-shrink:0}
         .pos-ex-cancel-btn:disabled{opacity:.4;cursor:not-allowed}
-        .pos-be-global{font-size:.76rem;font-weight:400;color:#8892b0;margin-left:10px;display:inline-flex;align-items:center;gap:4px}
-        .pos-be-global input{width:52px;padding:3px 6px;background:#0d1119;border:1px solid #3a4460;border-radius:6px;color:#e8ecf5;font-size:.78rem}
-        .pos-be-row{display:flex;align-items:center;gap:8px;flex-wrap:wrap;margin-bottom:10px;padding:8px 10px;background:#1a2030;border-radius:8px;border:1px solid #2a3348}
-        .pos-be-label{display:inline-flex;align-items:center;gap:6px;font-size:.78rem;color:#b8c4e8;cursor:pointer;user-select:none}
-        .pos-be-label input{width:15px;height:15px;accent-color:#6eb5ff}
-        .pos-be-offset{width:52px;padding:4px 6px;background:#0d1119;border:1px solid #3a4460;border-radius:6px;color:#e8ecf5;font-size:.78rem}
-        .pos-be-status{font-size:.74rem;color:#6ab88a}
         .tpsl-modal-backdrop{display:none;position:fixed;inset:0;background:rgba(0,0,0,.55);z-index:9000;align-items:center;justify-content:center;padding:16px}
         .tpsl-modal-backdrop.open{display:flex}
         .tpsl-modal{background:#1a2030;border:1px solid #3a4a66;border-radius:12px;padding:16px 18px;width:min(440px,100%);max-height:90vh;overflow:auto}
@@ -480,11 +473,7 @@
             </form>
         </div>
         <div class="card">
-            <h2 style="margin-bottom:8px;display:flex;align-items:center;flex-wrap:wrap;gap:6px">实时持仓
-                <span class="pos-be-global">一键保本默认偏移
-                    <input type="number" id="manual-be-offset-global" min="0" max="10" step="0.01" value="0.2" title="相对成交价，多仓为+、空仓为-">%
-                </span>
-            </h2>
+            <h2 style="margin-bottom:8px">实时持仓</h2>
             <div class="panel-scroll pos-list pos-list-live">
                 {% for o in order %}
                 <div class="pos-card" id="order-row-{{ o.id }}"
@@ -512,15 +501,6 @@
                             {% if o.breakeven_enabled %}移动保本:开 {{ o.breakeven_rr_trigger or '-' }}R→{{ price_fmt(o.symbol, o.breakeven_price) }}{% else %}移动保本:关{% endif %}
                         </span>
                     </div>
-                    <div class="pos-be-row">
-                        <label class="pos-be-label" title="将止损移至成交价±偏移%，并同步交易所止盈止损">
-                            <input type="checkbox" class="pos-be-switch" data-order-id="{{ o.id }}"
-                                {% if o.breakeven_armed %}checked data-armed="1"{% endif %}>
-                            一键保本
-                        </label>
-                        <input type="number" class="pos-be-offset" min="0" max="10" step="0.01" value="0.2" title="相对成交价偏移%">%
-                        <span class="pos-be-status" id="pos-be-status-{{ o.id }}">{% if o.breakeven_armed %}已保本{% endif %}</span>
-                    </div>
                     <div class="pos-grid">
                         <div class="pos-cell">
                             <span class="pos-label">成交价</span>
@@ -1763,96 +1743,6 @@ function submitTpslEntrust(){
             post();
         }).catch(()=>alert('无法校验盈亏比'));
 }
-const MANUAL_BE_OFFSET_KEY = 'manualBreakevenOffsetPct';
-function getManualBeOffsetPct(){
-    const g = document.getElementById('manual-be-offset-global');
-    if(g && g.value !== ''){
-        const n = parseFloat(g.value);
-        if(Number.isFinite(n)) return n;
-    }
-    const saved = localStorage.getItem(MANUAL_BE_OFFSET_KEY);
-    const n = saved ? parseFloat(saved) : 0.2;
-    return Number.isFinite(n) ? n : 0.2;
-}
-function initManualBreakevenUi(){
-    const g = document.getElementById('manual-be-offset-global');
-    if(g){
-        const saved = localStorage.getItem(MANUAL_BE_OFFSET_KEY);
-        if(saved) g.value = saved;
-        g.addEventListener('change', ()=>{
-            localStorage.setItem(MANUAL_BE_OFFSET_KEY, g.value);
-            document.querySelectorAll('.pos-be-offset').forEach(inp=>{
-                if(!inp.dataset.touched) inp.value = g.value;
-            });
-        });
-    }
-    document.querySelectorAll('.pos-be-offset').forEach(inp=>{
-        if(!inp.dataset.touched){
-            inp.value = getManualBeOffsetPct();
-        }
-        inp.addEventListener('input', ()=>{ inp.dataset.touched = '1'; });
-    });
-    document.querySelectorAll('.pos-be-switch').forEach(sw=>{
-        if(sw.dataset.bound) return;
-        sw.dataset.bound = '1';
-        sw.addEventListener('change', ()=>{
-            const orderId = sw.getAttribute('data-order-id');
-            const card = sw.closest('.pos-card');
-            const offInp = card && card.querySelector('.pos-be-offset');
-            if(!sw.checked){
-                if(sw.dataset.armed === '1') sw.checked = true;
-                return;
-            }
-            applyManualBreakeven(orderId, sw, offInp, card);
-        });
-    });
-}
-function updateOrderCardSlDisplay(card, slDisplay){
-    if(!card || !slDisplay) return;
-    card.setAttribute('data-plan-sl', slDisplay);
-    const cells = card.querySelectorAll('.pos-grid .pos-cell');
-    if(cells[1]){
-        const val = cells[1].querySelector('.pos-value');
-        if(val) val.textContent = slDisplay;
-    }
-}
-function applyManualBreakeven(orderId, sw, offInp, card){
-    const offset = offInp ? parseFloat(offInp.value) : getManualBeOffsetPct();
-    if(!Number.isFinite(offset) || offset < 0 || offset > 10){
-        alert('偏移%须在 0～10 之间');
-        sw.checked = sw.dataset.armed === '1';
-        return;
-    }
-    const dirHint = card && card.getAttribute('data-direction') === 'short' ? '下' : '上';
-    if(!confirm(`确认一键保本？止损将移至成交价${dirHint}移 ${offset}%（相对成交价）`)){
-        sw.checked = sw.dataset.armed === '1';
-        return;
-    }
-    sw.disabled = true;
-    fetch(`/api/order/${orderId}/manual_breakeven`, {
-        method:'POST',
-        headers:{'Content-Type':'application/json'},
-        body: JSON.stringify({ offset_pct: offset })
-    }).then(r=>r.json()).then(data=>{
-        if(!data.ok){
-            alert(data.msg || '保本失败');
-            sw.checked = sw.dataset.armed === '1';
-            sw.disabled = false;
-            return;
-        }
-        sw.dataset.armed = '1';
-        sw.checked = true;
-        const st = document.getElementById(`pos-be-status-${orderId}`);
-        if(st) st.textContent = '已保本';
-        if(data.stop_loss_display) updateOrderCardSlDisplay(card, data.stop_loss_display);
-        if(data.exchange_tpsl) paintExchangeTpslRow(orderId, data.exchange_tpsl);
-        else refreshPriceSnapshotConditional();
-    }).catch(()=>{
-        alert('保本请求失败');
-        sw.checked = sw.dataset.armed === '1';
-        sw.disabled = false;
-    });
-}
 function cancelExchangeTpsl(orderId, role){
     const label = role === 'sl' ? '止损' : '止盈';
     if(!confirm(`确认撤销交易所${label}委托？（不会平仓）`)) return;
@@ -2224,7 +2114,6 @@ function refreshPriceSnapshotConditional(){
         }
     }).catch(()=>{});
 }
-initManualBreakevenUi();
 setInterval(refreshPriceSnapshotConditional, {{ price_refresh_seconds * 1000 }});
 </script>
 </body>