trustbase-seller-backend 0.1.11 → 0.2.0

package/core/chain-signer.js

@@ -47,6 +47,8 @@ const CUSTOM_TYPE_URLS = [
     "/trustchain.economy.v1.MsgGrantCredits",
     // N13 (2026-09-23): trustcoin 账户自助注册 (上架/下单前置; signer=creator, 商户本人签)
     "/trustchain.trustcoin.v1.MsgRegisterAccount",
+    // N17 (2026-10): 引导金池自动回补 (oracle c5-glue stepPoolRefill, authority 签)
+    "/trustchain.reward.v1.MsgRewardPoolTransfer",
 ];
 
 let _root = null;
@@ -68,6 +70,8 @@ function protoRoot() {
         "trustchain/economy/v1/tx.proto",
         // N13 (2026-09-23): trustcoin 账户注册
         "trustchain/trustcoin/v1/tx.proto",
+        // N17 (2026-10): reward 池划转 (MsgRewardPoolTransfer)
+        "trustchain/reward/v1/tx.proto",
     ], { keepCase: true });
     _root = root;
     return root;
@@ -192,7 +196,12 @@ async function pollFinalTx(lcdUrl, txhash) {
     return null;
 }
 
-class SequenceMismatchErrorJs extends Error {}
+/** P4: sequence mismatch 统一抛 routes/chain-writes 的 SequenceMismatchError —
+ *  c5-glue/sp-notify/chain-writes 三处 "重查序号重试一次" 的 instanceof 判断对 JS 通道同样生效。
+ *  延迟 require 规避循环依赖 (chain-writes.js 顶部即 require 本模块, 加载期取不到其 class)。 */
+function newSequenceMismatchError(msg) {
+    return new (require("../routes/chain-writes").SequenceMismatchError)(msg);
+}
 
 /**
  * JS 直签 + 广播完整流程。入参/返回与 chain-writes.js 的 CLI 路径对齐:
@@ -201,7 +210,8 @@ class SequenceMismatchErrorJs extends Error {}
  *   account: {accountNumber, sequence} (字符串)
  * 返回 {txhash, code, raw_log} (code!=0 也返回, 由调用方判 502)
  * memo: 可选; 下单 (MsgCreateOrder) 走 "tb-auth:<sha256>" 意愿摘要, 其余写路径留空
- * 抛 SequenceMismatchErrorJs (message 含 "account sequence mismatch")
+ * 抛 chain-writes.SequenceMismatchError (message 含 "account sequence mismatch") — P4 统一后
+ *   调用方 instanceof chainWrites.SequenceMismatchError 的重试逻辑对 JS 通道同样生效
  * 抛 Error("tx_delivery_timeout: ...") 当 15s 未入块
  */
 async function jsSignAndBroadcast(c, messages, account, baseDir, memo) {
@@ -228,7 +238,7 @@ async function jsSignAndBroadcast(c, messages, account, baseDir, memo) {
     const txBytes = TxRaw.encode(txRaw).finish();
     const checkTx = await broadcastTxSync(c.rpcUrl, txBytes);
     if (/account sequence mismatch/i.test(checkTx.raw_log)) {
-        throw new SequenceMismatchErrorJs(`account sequence mismatch: ${checkTx.raw_log}`);
+        throw newSequenceMismatchError(`account sequence mismatch: ${checkTx.raw_log}`);
     }
     if (checkTx.code !== 0) {
         // CheckTx 拒绝 (码/ccodespace/log 原样回传, 语义同 CLI broadcast 的 code!=0)
@@ -237,7 +247,7 @@ async function jsSignAndBroadcast(c, messages, account, baseDir, memo) {
     const final = await pollFinalTx(c.lcdUrl, checkTx.txhash);
     if (final) {
         if (/account sequence mismatch/i.test(final.raw_log)) {
-            throw new SequenceMismatchErrorJs(`account sequence mismatch: ${final.raw_log}`);
+            throw newSequenceMismatchError(`account sequence mismatch: ${final.raw_log}`);
         }
         return final;
     }
@@ -254,5 +264,5 @@ module.exports = {
     jsSignerAddress,
     jsSignAndBroadcast,
     toEncodeObjects,
-    SequenceMismatchErrorJs,
+    newSequenceMismatchError,
 };

package/oracle/c5-glue.js

@@ -80,6 +80,9 @@ const SIGNER_FORBIDDEN_RE = /intended signer does not match|signature verificati
 // N14: settle 幂等 (已结算/状态已变/订单不存在 → 按完成处理, 不再重试)
 const SETTLE_DONE_RE = /already settled|not in confirmed status|order not found/i;
 
+// E6 P2: 链上 reason_kind+ref_id 幂等命中 (上轮 tx 实际已入块但本地未记 done, 如交付超时后重发被链拒)
+const GRANT_DUP_RE = /already granted|duplicate|grant already exists/i;
+
 function sha256Hex(s) {
     return crypto.createHash("sha256").update(String(s)).digest("hex");
 }
@@ -566,8 +569,21 @@ function createOracleGlue(deps) {
                 amount: String(g.amount),
                 reason_kind: reasonKind,
                 ref_id: g.refId,
-            }]);
+            }]).catch((e) => {
+                // sendTx 异常 (链抖动/超时): 留 pending 等下轮 retryPendingGrants 补发,
+                // 不上抛 — 避免中断本批后续 grant (此前异常会丢失同批剩余 grant 的台账行)
+                warn(`[oracle-glue] E6 发放异常 ${reasonKind}/${g.refId}: ${e.message} (留 pending 下轮重试)`);
+                return null;
+            });
+            if (!r) continue;
             if (r.code !== 0) {
+                if (GRANT_DUP_RE.test(r.raw_log)) {
+                    // 链上幂等命中: 该笔实际已发放 (本地没落 done), 按完成处理
+                    db.prepare("UPDATE oracle_credit_grants SET status='done', note=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
+                        .run(`链上幂等命中: ${String(r.raw_log).slice(0, 160)}`, nowSec(), reasonKind, g.refId);
+                    log(`[oracle-glue] E6 ${reasonKind}/${g.refId} 链上已发放 (幂等命中), 按完成处理`);
+                    continue;
+                }
                 const status = MODULE_NOT_LIVE_RE.test(r.raw_log) ? "pending" : "failed";
                 db.prepare("UPDATE oracle_credit_grants SET status=?, note=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
                     .run(status, `code=${r.code}: ${String(r.raw_log).slice(0, 200)}`, nowSec(), reasonKind, g.refId);
@@ -580,8 +596,49 @@ function createOracleGlue(deps) {
         }
     }
 
-    /** E6 一轮: 拉 CONFIRMED 事实 → 逐笔结算 */
+    /** P2: 存量 pending 行补发 (上轮 economy 未上线/sendTx 异常遗留 — 此前永不再试)。
+     *  每轮结算开头先扫台账重发; 链上 reason_kind+ref_id 幂等是第二道保险:
+     *  重复发放被链拒 (GRANT_DUP_RE) 按完成处理。返回本轮处理的 pending 行数。 */
+    async function retryPendingGrants(oracleAddr) {
+        const rows = db.prepare("SELECT * FROM oracle_credit_grants WHERE status='pending'").all();
+        for (const row of rows) {
+            let r;
+            try {
+                r = await sendTx([{
+                    "@type": "/trustchain.economy.v1.MsgGrantCredits",
+                    issuer: oracleAddr,
+                    recipient: row.recipient,
+                    amount: String(row.amount),
+                    reason_kind: row.reason_kind,
+                    ref_id: row.ref_id,
+                }]);
+            } catch (e) {
+                warn(`[oracle-glue] E6 pending 补发 ${row.reason_kind}/${row.ref_id} 异常: ${e.message} (留 pending 下轮重试)`);
+                continue;
+            }
+            if (r.code !== 0) {
+                if (GRANT_DUP_RE.test(r.raw_log)) {
+                    db.prepare("UPDATE oracle_credit_grants SET status='done', note=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
+                        .run(`链上幂等命中: ${String(r.raw_log).slice(0, 160)}`, nowSec(), row.reason_kind, row.ref_id);
+                    log(`[oracle-glue] E6 pending 补发 ${row.reason_kind}/${row.ref_id} 链上已发放 (幂等命中), 按完成处理`);
+                } else if (!MODULE_NOT_LIVE_RE.test(r.raw_log)) {
+                    db.prepare("UPDATE oracle_credit_grants SET status='failed', note=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
+                        .run(`补发 code=${r.code}: ${String(r.raw_log).slice(0, 200)}`, nowSec(), row.reason_kind, row.ref_id);
+                    warn(`[oracle-glue] E6 pending 补发失败 ${row.reason_kind}/${row.ref_id} code=${r.code}: ${String(r.raw_log).slice(0, 200)}`);
+                }
+                // 模块未上线 → 留 pending 下轮再试
+                continue;
+            }
+            db.prepare("UPDATE oracle_credit_grants SET status='done', txhash=?, updated_at=? WHERE reason_kind=? AND ref_id=?")
+                .run(r.txhash, nowSec(), row.reason_kind, row.ref_id);
+            log(`[oracle-glue] E6 pending 已补发 ${row.reason_kind}/${row.ref_id} → ${row.recipient} +${row.amount} (tx=${r.txhash})`);
+        }
+        return rows.length;
+    }
+
+    /** E6 一轮: 先补发存量 pending (P2) → 拉 CONFIRMED 事实 → 逐笔结算 */
     async function settleConfirmedFacts(oracleAddr) {
+        await retryPendingGrants(oracleAddr); // 不依赖链上 params, 先清存量
         const params = await getEconomyParams();
         if (!params) { warn("[oracle-glue] economy params 查询失败 (模块未上线?), 本轮 E6 跳过"); return; }
         const pj = await lcdGet("/oxiaom/trustchain/serviceprovider/v1/providers");
@@ -732,7 +789,7 @@ function createOracleGlue(deps) {
         await settleExpiredOrders(oracleAddr);
     }
 
-    return { tick, enqueueBootstrapGrant, settleConfirmedFacts, settleExpiredOrders, stepBootstrapGrant, getEconomyParams, monthlyUsed, resolveOrderParties, settleFact, grantFeegrant, grantFeegrantFor, findFeegrant, stepPoolRefill, refillEnabled, poolBalanceUtct, refillWindow };
+    return { tick, enqueueBootstrapGrant, settleConfirmedFacts, settleExpiredOrders, stepBootstrapGrant, getEconomyParams, monthlyUsed, resolveOrderParties, settleFact, retryPendingGrants, grantFeegrant, grantFeegrantFor, findFeegrant, stepPoolRefill, refillEnabled, poolBalanceUtct, refillWindow };
 }
 
 module.exports = { createOracleGlue, oracleCfg, sha256Hex, MODULE_NOT_LIVE_RE };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trustbase-seller-backend",
-  "version": "0.1.11",
+  "version": "0.2.0",
   "description": "TrustBase Seller Backend (merchant edition) — 商品上链/订单/支付/质押 write API for TrustBase 保障链生态. 单卖家自托管形态: 签名 key 即卖家身份, 私钥不出门.",
   "main": "run-unified.js",
   "bin": {

package/payments/wechat/profitsharing.js

@@ -49,6 +49,8 @@ async function wxCall(method, urlPath, bodyObj) {
             "Authorization": agentPay.wxSignAuth(method, urlPath, bodyStr, spOverride(c)),
             "Content-Type": "application/json",
             "Accept": "application/json",
+            // 微信 APIv3 拒 undici 默认 Accept-Language: * (2026-09-25 实测 PARAM_ERROR) — 与 agent-pay wxApiCall 对齐
+            "Accept-Language": "zh-CN",
             "User-Agent": "trustbase-seller-backend/1.0",
         },
         body: method === "GET" ? undefined : bodyStr,

package/proto/trustchain/reward/v1/params.proto

@@ -0,0 +1,44 @@
+syntax = "proto3";
+package trustchain.reward.v1;
+
+import "amino/amino.proto";
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/oxiaom/trustchain/x/reward/types";
+
+message Params {
+  option (amino.name) = "trustchain/x/reward/Params";
+  option (gogoproto.equal) = true;
+
+  // reward per purchase (microTCT)
+  string purchase_reward = 1;
+
+  // reward per positive review (microTCT)
+  string review_reward = 2;
+
+  // reward per invitation (microTCT)
+  string invite_reward = 3;
+
+  // daily reward cap per user (microTCT)
+  string daily_cap = 4;
+
+  // registration reward, locked until verified (microTCT) — v0.20.0
+  string registration_reward = 5;
+
+  // invite reward when invitee role=buyer/both activates (microTCT) — v0.20.0 (PRD §4.9 default 5 TCT)
+  string invite_buyer_reward = 6;
+
+  // invite reward when invitee role=seller activates (microTCT) — v0.20.0 (PRD §4.9 default 10 TCT)
+  string invite_seller_reward = 7;
+}
+
+// RewardEvent tracks a single reward distribution.
+message RewardEvent {
+  option (amino.name) = "trustchain/x/reward/RewardEvent";
+
+  string recipient = 1;
+  string amount = 2;         // microTCT
+  string reward_type = 3;   // "purchase", "review", "invite", "listing"
+  uint64 reference_id = 4; // order_id or invite_id
+  uint64 created_at = 5;
+}

package/proto/trustchain/reward/v1/tx.proto

@@ -0,0 +1,62 @@
+syntax = "proto3";
+package trustchain.reward.v1;
+
+import "amino/amino.proto";
+import "cosmos/msg/v1/msg.proto";
+import "gogoproto/gogo.proto";
+import "trustchain/reward/v1/params.proto";
+
+option go_package = "github.com/oxiaom/trustchain/x/reward/types";
+
+// Msg defines the Msg service.
+service Msg {
+  option (cosmos.msg.v1.service) = true;
+
+  // UpdateParams defines a (governance) operation for updating the module
+  // parameters. The authority defaults to the x/gov module account.
+  rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
+
+  // RewardPoolTransfer — 奖励池定向划转 (authority/emergency 双轨, 池间调拨用)
+  rpc RewardPoolTransfer(MsgRewardPoolTransfer) returns (MsgRewardPoolTransferResponse);
+}
+
+// MsgRewardPoolTransfer 从 x/reward 奖励池向目标地址划转 TCT (池间调拨, 如: 奖励池 → 引导金池)
+message MsgRewardPoolTransfer {
+  option (cosmos.msg.v1.signer) = "authority";
+  option (amino.name) = "trustchain/x/reward/MsgRewardPoolTransfer";
+
+  // authority 是划转签名人 (gov 模块地址或应急密钥, 双轨)
+  string authority = 1;
+
+  // recipient 是收款地址 (普通账户或目标模块账户, 如 subchain 引导金池)
+  string recipient = 2;
+
+  // amount 是划转金额 (utct)
+  string amount = 3;
+}
+
+message MsgRewardPoolTransferResponse {
+  // amount 回显实际划转金额 (utct)
+  string amount = 1;
+}
+
+// MsgUpdateParams is the Msg/UpdateParams request type.
+message MsgUpdateParams {
+  option (cosmos.msg.v1.signer) = "authority";
+  option (amino.name) = "trustchain/x/reward/MsgUpdateParams";
+
+  // authority is the address that controls the module (defaults to x/gov unless overwritten).
+  string authority = 1;
+
+  // params defines the module parameters to update.
+  //
+  // NOTE: All parameters must be supplied.
+  Params params = 2 [
+    (gogoproto.nullable) = false,
+    (amino.dont_omitempty) = true
+  ];
+}
+
+// MsgUpdateParamsResponse defines the response structure for executing a
+// MsgUpdateParams message.
+message MsgUpdateParamsResponse {}

package/routes/chain-writes.js

@@ -89,10 +89,12 @@ const EXEC_TIMEOUT_MS = 30_000;
 class HttpError extends Error {
     status;
     code;
-    constructor(status, code, message) {
+    field;
+    constructor(status, code, message, field) {
         super(message);
         this.status = status;
         this.code = code;
+        this.field = field; // 可选: 出错字段名 (前端定位高亮用, 2026-10-03 进件表单错误提示)
     }
 }
 exports.HttpError = HttpError;
@@ -650,7 +652,7 @@ function createChainWritesRouter(deps) {
 }
 function handleError(res, e, tag) {
     if (e instanceof HttpError) {
-        return res.status(e.status).json({ error: e.code, message: e.message });
+        return res.status(e.status).json({ error: e.code, message: e.message, ...(e.field ? { field: e.field } : {}) });
     }
     console.error(`[chain-writes] ${tag} 失败:`, e?.message ?? e);
     return res.status(502).json({ error: 'chain_write_error', message: e?.message || String(e) });

package/routes/onboard.html

@@ -85,9 +85,23 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
 #apply-status[data-state="pending"]{background:#FFF7ED;border-color:#FED7AA}
 #apply-status a{display:inline-block;background:#C4633C;color:#fff !important;border-radius:8px;padding:10px 18px;font-size:15px;font-weight:600;text-decoration:none;margin-top:8px}
 #apply-status .aqr{display:flex;align-items:center;justify-content:center;width:120px;height:120px;border:2px dashed #93C5FD;border-radius:10px;background:#fff;color:#8A857B;font-size:12px;text-align:center;margin:10px 0 2px;line-height:1.6}
+/* 经营场景选择卡 (2026-10-03 三场景) */
+#apply-form .ascene-row{display:grid;grid-template-columns:repeat(3,1fr);gap:10px}
+#apply-form .ascene{display:flex;flex-direction:column;align-items:center;gap:2px;border:2px solid #EAE3D6;border-radius:12px;background:#FFFDF9;padding:14px 8px;cursor:pointer;text-align:center;transition:border-color .15s,background .15s}
+#apply-form .ascene input{display:none}
+#apply-form .ascene .ascene-ico{font-size:24px;line-height:1}
+#apply-form .ascene .ascene-name{font-size:14px;font-weight:600;color:#33302B}
+#apply-form .ascene .ascene-sub{font-size:11px;color:#8A857B;line-height:1.5}
+#apply-form .ascene.selected{border-color:#C4633C;background:#FBF1EA;box-shadow:0 0 0 3px rgba(196,99,60,.12)}
+#apply-form .ahint{font-size:12px;color:#B45309;background:#FFFBEB;border:1px solid #FDE68A;border-radius:8px;padding:8px 10px;margin-top:10px}
+/* 错误提示红卡 + 字段高亮 (2026-10-03 xiaomu 实测 "没反应" fix) */
+#apply-err{background:#FEF2F2;border:1px solid #FCA5A5;border-left:4px solid #DC2626;border-radius:10px;padding:12px 14px;font-size:14px;color:#991B1B;margin:4px 0 12px;line-height:1.8;word-break:break-all}
+#apply-form .aerr-field,#apply-form input.aerr-field,#apply-form select.aerr-field{border-color:#DC2626 !important;box-shadow:0 0 0 3px rgba(220,38,38,.18) !important}
+#apply-form div[id^="a_up_"].aerr-field label.sbtn{border-color:#DC2626;background:#FEF2F2}
 @media (max-width:640px){
   #apply-form .agrid{grid-template-columns:1fr}
   #apply-form .auploads{grid-template-columns:1fr}
+  #apply-form .ascene-row{grid-template-columns:1fr}
 }
 @media print{
   body *{visibility:hidden}
@@ -128,6 +142,18 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
     <div id="apply-form" style="display:none;margin-top:12px">
       <div class="desc" style="margin-bottom:12px">以下资料由你的电脑<b>本地加密</b>后交给服务商，向微信申请特约商户收款账户。身份证号/银行卡号在你电脑上就已加密，任何人 (含服务商) 都看不到明文。</div>
 
+      <div class="acard">
+        <div class="acard-h">经营场景 <span class="aopt">三选一, 决定第 4/5 张卡片要什么资料</span></div>
+        <div class="ascene-row">
+          <label class="ascene selected"><input type="radio" name="sales_scene" value="SALES_SCENES_STORE" checked onchange="setScene(this.value)">
+            <span class="ascene-ico">🏬</span><span class="ascene-name">线下门店</span><span class="ascene-sub">门店地址 + 门头/店内照片</span></label>
+          <label class="ascene"><input type="radio" name="sales_scene" value="SALES_SCENES_WEB" onchange="setScene(this.value)">
+            <span class="ascene-ico">🌐</span><span class="ascene-name">互联网网站</span><span class="ascene-sub">网址 + 截图, 需 ICP 备案</span></label>
+          <label class="ascene"><input type="radio" name="sales_scene" value="SALES_SCENES_MP" onchange="setScene(this.value)">
+            <span class="ascene-ico">📱</span><span class="ascene-name">公众号/小程序</span><span class="ascene-sub">AppID + 页面截图</span></label>
+        </div>
+      </div>
+
       <div class="acard">
         <div class="acard-h"><span class="anum">1</span>主体资料</div>
         <div class="agrid">
@@ -152,6 +178,10 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
         <div class="agrid">
           <div class="afield"><label for="a_legal_name">法人/经营者姓名</label><input id="a_legal_name" placeholder="与身份证一致"></div>
           <div class="afield"><label for="a_legal_id_number">法人身份证号</label><input id="a_legal_id_number" placeholder="17 位数字 + 数字或 X"></div>
+          <div class="afield afield-full" id="afield_idaddr" style="display:none"><label for="a_legal_id_address">身份证居住地址 <span class="aopt">企业主体必填, 本机加密</span></label><input id="a_legal_id_address" placeholder="与身份证住址一致, 如: 广东省深圳市南山区xx路xx号"></div>
+          <div class="afield afield-full" id="afield_ubo_note" style="display:none">
+            <div class="ahint" style="margin-top:0">企业主体：若最终受益人只有法定代表人本人，无需填写受益人信息 (微信自动回填)；否则暂不支持，请联系服务商协助进件</div>
+          </div>
           <div class="afield"><label for="a_period_begin">身份证有效期开始</label><input id="a_period_begin" placeholder="YYYY-MM-DD"></div>
           <div class="afield"><label for="a_period_end">有效期结束</label><input id="a_period_end" placeholder="YYYY-MM-DD 或 长期"></div>
           <div class="afield"><label for="a_contact_name">超级管理员姓名</label><input id="a_contact_name" placeholder="与微信实名一致"></div>
@@ -190,8 +220,8 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
       </div>
 
       <div class="acard">
-        <div class="acard-h"><span class="anum">4</span>门店信息</div>
-        <div class="agrid">
+        <div class="acard-h"><span class="anum">4</span><span id="acard4-title">门店信息</span></div>
+        <div class="agrid" id="scene_fields_store">
           <div class="afield"><label for="a_store_name">门店名称</label><input id="a_store_name" placeholder="线下场所名称"></div>
           <div class="afield"><label for="a_store_address_code">门店省市编码</label>
             <select id="a_store_address_code" data-citycodes>
@@ -201,6 +231,20 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
             <input id="a_storecode_manual" class="amanual" placeholder="6 位国标区划码, 如: 320200" style="display:none"></div>
           <div class="afield afield-full"><label for="a_store_address">门店详细地址</label><input id="a_store_address" placeholder="xx 路 xx 号"></div>
         </div>
+        <div id="scene_fields_web" style="display:none">
+          <div class="agrid">
+            <div class="afield afield-full"><label for="a_website_url">网站网址</label><input id="a_website_url" placeholder="https:// 开头, 需已上线可访问"></div>
+          </div>
+          <div class="ahint">⚠️ 网站需已上线且有 ICP 备案, 微信审核会实际访问验证</div>
+        </div>
+        <div id="scene_fields_mp" style="display:none">
+          <div class="agrid">
+            <div class="afield"><label for="a_appid">公众号/小程序 AppID</label><input id="a_appid" placeholder="wx 开头"></div>
+            <div class="afield"><label for="a_appid_type">类型</label>
+              <select id="a_appid_type"><option value="mp">公众号</option><option value="mini">小程序</option></select></div>
+          </div>
+          <div class="ahint">⚠️ 需已认证的公众号或小程序, 且主体与本商户一致</div>
+        </div>
       </div>
 
       <div class="acard">
@@ -209,11 +253,12 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
           <div id="a_up_license"></div>
           <div id="a_up_idfront"></div>
           <div id="a_up_idback"></div>
-          <div id="a_up_entrance"></div>
-          <div id="a_up_indoor"></div>
+          <div id="a_up_s1"></div>
+          <div id="a_up_s2"></div>
         </div>
       </div>
 
+      <div id="apply-err" style="display:none"></div>
       <button class="abtn" id="btn-apply-submit" onclick="submitApplyment()">加密并提交进件</button>
       <div class="aprivacy">🔒 资料只保存在这台电脑; 敏感字段本机加密后交服务商; 服务商暂时不可达时加密暂存本机, 可重试。</div>
     </div>
@@ -408,11 +453,36 @@ function mountApplyUpload(slotId,field,label){
 mountApplyUpload('a_up_license','license_media_id','营业执照照片 (必传)');
 mountApplyUpload('a_up_idfront','legal_id_front_media_id','身份证人像面 (必传)');
 mountApplyUpload('a_up_idback','legal_id_back_media_id','身份证国徽面 (必传)');
-mountApplyUpload('a_up_entrance','store_entrance_media_id','门店门头照片 (必传)');
-mountApplyUpload('a_up_indoor','store_indoor_media_id','门店内部照片 (必传)');
+// 经营场景 (2026-10-03 xiaomu 拍板三选一): 场景决定第 4 卡片字段 + 第 5 卡片场景照片槽
+var SCENE_UPLOADS={
+  SALES_SCENES_STORE:[['a_up_s1','store_entrance_media_id','门店门头照片 (必传)'],['a_up_s2','store_indoor_media_id','门店内部照片 (必传)']],
+  SALES_SCENES_WEB:[['a_up_s1','web_home_media_id','网站首页截图 (必传)'],['a_up_s2','web_product_media_id','商品/服务页截图 (必传)']],
+  SALES_SCENES_MP:[['a_up_s1','mp_media_id','公众号/小程序页面截图 (必传)']]
+};
+var SCENE_TITLES={SALES_SCENES_STORE:'门店信息',SALES_SCENES_WEB:'网站信息',SALES_SCENES_MP:'公众号 / 小程序'};
+function currentScene(){
+  var r=document.querySelector('input[name="sales_scene"]:checked');
+  return r?r.value:'SALES_SCENES_STORE';
+}
+function setScene(scene){
+  document.getElementById('scene_fields_store').style.display=scene==='SALES_SCENES_STORE'?'':'none';
+  document.getElementById('scene_fields_web').style.display=scene==='SALES_SCENES_WEB'?'':'none';
+  document.getElementById('scene_fields_mp').style.display=scene==='SALES_SCENES_MP'?'':'none';
+  document.getElementById('acard4-title').textContent=SCENE_TITLES[scene]||'门店信息';
+  document.querySelectorAll('.ascene').forEach(function(c){
+    c.classList.toggle('selected', c.querySelector('input').value===scene);
+  });
+  // 场景照片槽重挂 + 清掉旧场景 media_id (避免跨场景串数据)
+  ['store_entrance_media_id','store_indoor_media_id','web_home_media_id','web_product_media_id','mp_media_id'].forEach(function(k){delete _aMedia[k];});
+  var slots=SCENE_UPLOADS[scene]||SCENE_UPLOADS.SALES_SCENES_STORE;
+  slots.forEach(function(s){var el=document.getElementById(s[0]);el.style.display='';mountApplyUpload(s[0],s[1],s[2]);});
+  if(!slots.some(function(s){return s[0]==='a_up_s2';})) document.getElementById('a_up_s2').style.display='none';
+}
+setScene('SALES_SCENES_STORE'); // 默认线下门店
 function aval(id){var e=document.getElementById(id);return e?e.value.trim():''}
 function applyFormBody(){
-  return {
+  var scene=currentScene();
+  var body={
     subject_type:aval('a_subject_type'),merchant_shortname:aval('a_shortname'),merchant_name:aval('a_merchant_name'),
     license_number:aval('a_license_number'),service_phone:aval('a_service_phone'),
     settlement_id:aval('a_settlement_id'),qualification_type:aval('a_qualification_type'),
@@ -421,12 +491,49 @@ function applyFormBody(){
     legal_id_period_begin:aval('a_period_begin'),legal_id_period_end:aval('a_period_end'),
     account_type:aval('a_account_type'),account_name:aval('a_account_name'),account_number:aval('a_account_number'),
     account_bank:aval('a_account_bank'),bank_name:aval('a_bank_name'),bank_address_code:aval('a_bank_address_code'),
-    store_name:aval('a_store_name'),store_address_code:aval('a_store_address_code'),store_address:aval('a_store_address'),
+    legal_id_address:aval('a_legal_id_address'), // 企业主体必填 (F4), 个体户留空
+    sales_scene:scene,
     license_media_id:_aMedia.license_media_id||'',legal_id_front_media_id:_aMedia.legal_id_front_media_id||'',
-    legal_id_back_media_id:_aMedia.legal_id_back_media_id||'',store_entrance_media_id:_aMedia.store_entrance_media_id||'',
-    store_indoor_media_id:_aMedia.store_indoor_media_id||''
+    legal_id_back_media_id:_aMedia.legal_id_back_media_id||''
   };
+  if(scene==='SALES_SCENES_STORE'){
+    body.store_name=aval('a_store_name');body.store_address_code=aval('a_store_address_code');body.store_address=aval('a_store_address');
+    body.store_entrance_media_id=_aMedia.store_entrance_media_id||'';body.store_indoor_media_id=_aMedia.store_indoor_media_id||'';
+  }else if(scene==='SALES_SCENES_WEB'){
+    body.website_url=aval('a_website_url');
+    body.web_home_media_id=_aMedia.web_home_media_id||'';body.web_product_media_id=_aMedia.web_product_media_id||'';
+  }else{
+    body.appid=aval('a_appid');body.appid_type=aval('a_appid_type');
+    body.mp_media_id=_aMedia.mp_media_id||'';
+  }
+  return body;
 }
+// 错误提示 (2026-10-03 硬性要求): 红卡 + 平滑滚动 + 字段级红框定位
+var FIELD_EL={ // 字段名 → 页面元素 id (媒体字段 → 上传槽; 文本字段默认 a_+字段)
+  license_media_id:'a_up_license',legal_id_front_media_id:'a_up_idfront',legal_id_back_media_id:'a_up_idback',
+  store_entrance_media_id:'a_up_s1',store_indoor_media_id:'a_up_s2',
+  web_home_media_id:'a_up_s1',web_product_media_id:'a_up_s2',mp_media_id:'a_up_s1',
+  website_url:'a_website_url',appid:'a_appid'
+};
+function showApplyErr(msg,field){
+  var card=document.getElementById('apply-err');
+  card.textContent='⚠️ '+msg;
+  card.style.display='block';
+  // 清旧高亮
+  document.querySelectorAll('#apply-form .aerr-field').forEach(function(e){e.classList.remove('aerr-field');});
+  var t=null;
+  if(field){
+    // 手填接管 id 的场景 (其他银行/手动编码): getElementById 拿到的就是当前持有 id 的可见控件
+    t=document.getElementById(FIELD_EL[field]||('a_'+field));
+  }
+  if(t){
+    t.classList.add('aerr-field');
+    t.scrollIntoView({behavior:'smooth',block:'center'}); // 滚动到字段, 提示卡跟随在提交按钮上方
+  }else{
+    card.scrollIntoView({behavior:'smooth',block:'center'});
+  }
+}
+function hideApplyErr(){document.getElementById('apply-err').style.display='none';}
 // 状态机渲染: 未提交(表单) → 已提交(business_code+轮询) → TO_BE_SIGNED(签约链接) → FINISHED(sub_mchid+引导金)
 function renderApplyment(j){
   var box=document.getElementById('apply-status');
@@ -451,20 +558,33 @@ function renderApplyment(j){
 async function submitApplyment(){
   var btn=document.getElementById('btn-apply-submit');
   var msg=document.getElementById('apply-msg');
-  btn.disabled=true;btn.textContent='加密并提交中...';
+  hideApplyErr();
+  btn.disabled=true;btn.textContent='加密并提交中…';
+  // 前端 40s 兜底超时 (后端 SP 转发自身有 15s 超时; AbortController 防页面卡死)
+  var ctrl=new AbortController();
+  var timer=setTimeout(function(){ctrl.abort();},40000);
   try{
-    var j=await readJson(await fetch('/api/onboard/applyment',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(applyFormBody())}));
+    var j=await readJson(await fetch('/api/onboard/applyment',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(applyFormBody()),signal:ctrl.signal}));
+    clearTimeout(timer);
     if(j.ok){
       msg.style.display='block';
       msg.textContent='✅ 已提交微信审核 (敏感字段已在本机加密)'+(j.idempotent?' — 此前已提交过, 幂等忽略':'');
       document.getElementById('apply-form').style.display='none';
       queryApplyment();
     } else {
-      msg.style.display='block';
-      msg.textContent='提交失败: '+(j.message||j.error||'未知错误');
+      // 后端/SP/微信错误 → 醒目红卡 + 字段定位 (message 已是中文, 含字段名)
+      showApplyErr(j.message||j.error||'未知错误', j.field);
       loadApplymentStatus(); // PENDING_PUSH 时状态框给出重试按钮
     }
-  }catch(e){msg.style.display='block';msg.textContent='提交失败: 服务暂时不可用，请刷新重试 ('+e.message+')';}
+  }catch(e){
+    clearTimeout(timer);
+    if(e && e.name==='AbortError'){
+      showApplyErr('服务商响应超时，资料已加密暂存本机，可点重试');
+      loadApplymentStatus();
+    }else{
+      showApplyErr('提交失败: 服务暂时不可用，请刷新重试 ('+e.message+')');
+    }
+  }
   btn.disabled=false;btn.textContent='加密并提交进件';
 }
 async function retryApplyment(){
@@ -473,7 +593,53 @@ async function retryApplyment(){
   else{var msg=document.getElementById('apply-msg');msg.style.display='block';msg.textContent=j.message||'重试失败, 请稍后再试';}
 }
 async function queryApplyment(){
-  try{renderApplyment(await readJson(await fetch('/api/onboard/applyment/status')));}catch(e){}
+  try{
+    var j=await readJson(await fetch('/api/onboard/applyment/status'));
+    renderApplyment(j);
+    if(j && j.form_snapshot) prefillApplyForm(j.form_snapshot); // F1: 驳回/暂存后预填
+  }catch(e){}
+}
+// F1 预填: 台账快照回填非敏感字段 + 照片 media_id 复用 (敏感字段是密文/脱敏, 需重填)
+var PREFILL_MAP={subject_type:'a_subject_type',merchant_shortname:'a_shortname',merchant_name:'a_merchant_name',
+  license_number:'a_license_number',service_phone:'a_service_phone',settlement_id:'a_settlement_id',
+  qualification_type:'a_qualification_type',contact_email:'a_contact_email',legal_name:'a_legal_name',
+  legal_id_period_begin:'a_period_begin',legal_id_period_end:'a_period_end',
+  account_type:'a_account_type',account_bank:'a_account_bank',bank_name:'a_bank_name',bank_address_code:'a_bank_address_code',
+  store_name:'a_store_name',store_address_code:'a_store_address_code',store_address:'a_store_address',
+  website_url:'a_website_url',appid:'a_appid',appid_type:'a_appid_type'};
+var PREFILL_MEDIA=['license_media_id','legal_id_front_media_id','legal_id_back_media_id',
+  'store_entrance_media_id','store_indoor_media_id','web_home_media_id','web_product_media_id','mp_media_id'];
+var _prefilled=false;
+function prefillApplyForm(snap){
+  if(_prefilled||!snap||typeof snap!=='object') return;
+  _prefilled=true;
+  // 场景先切 (setScene 会重挂上传槽, 必须在写媒体状态前)
+  if(snap.sales_scene){
+    var r=document.querySelector('input[name="sales_scene"][value="'+snap.sales_scene+'"]');
+    if(r){r.checked=true;setScene(snap.sales_scene);}
+  }
+  // 主体类型联动先触发 (居住地址/UBO 说明显示 + 类目默认), 再写快照值 (避免类目被联动覆盖)
+  var subj=document.getElementById('a_subject_type');
+  if(subj&&snap.subject_type){subj.value=snap.subject_type;subj.dispatchEvent(new Event('change'));}
+  for(var k in PREFILL_MAP){
+    if(k==='subject_type') continue; // 上面已处理
+    var v=snap[k];
+    if(!v||v==='无') continue; // 敏感字段快照是脱敏的 ***后4位, 不会命中这里 (值带 *** 前缀也跳过)
+    if(String(v).indexOf('***')===0) continue;
+    var e=document.getElementById(PREFILL_MAP[k]);
+    if(e&&!e.value) e.value=v;
+  }
+  // 照片复用: media_id 还在微信侧有效, 标已传
+  var reused=0;
+  PREFILL_MEDIA.forEach(function(k){
+    if(!snap[k]) return;
+    _aMedia[k]=snap[k]; reused++;
+    var st=document.getElementById('st_'+k);
+    if(st){st.style.color='#16A34A';st.textContent='✓ 已上传过, 无需重传';}
+  });
+  var msg=document.getElementById('apply-msg');
+  msg.style.display='block';
+  msg.textContent='ℹ️ 已预填上次提交的资料; 身份证号/手机号/卡号等敏感字段需重新填写'+(reused?' (照片已传过, 无需重传)':'');
 }
 async function loadApplymentStatus(){queryApplyment();}
 function markStepDone(id){
@@ -544,6 +710,10 @@ async function submit(){
   if(subj&&stl){
     subj.addEventListener('change',function(){
       stl.value = subj.value==='SUBJECT_TYPE_ENTERPRISE' ? '716' : '719';
+      // F4: 企业主体显示身份证居住地址(必填) + UBO 说明; 个体户隐藏
+      var ent = subj.value==='SUBJECT_TYPE_ENTERPRISE';
+      var ia=document.getElementById('afield_idaddr'); if(ia) ia.style.display=ent?'':'none';
+      var un=document.getElementById('afield_ubo_note'); if(un) un.style.display=ent?'':'none';
     });
   }
   // 省市编码选项 (国标区划码, 两处下拉共用; 微信官方对照表口径)