trustbase-seller-backend 0.1.12 → 0.2.1

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.12",
+  "version": "0.2.1",
   "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/onboard.html

@@ -103,6 +103,14 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
   #apply-form .auploads{grid-template-columns:1fr}
   #apply-form .ascene-row{grid-template-columns:1fr}
 }
+/* ===== 服务商名片卡 (2026-10-03 xiaomu: 入驻页显示服务商是谁) ===== */
+.spcard{background:#FCFAF4;border:1px solid #EAE3D6;border-radius:14px;padding:16px 18px;margin-bottom:18px}
+.spcard.offline{opacity:.65;background:#F4F1EA}
+.spcard-h{display:flex;align-items:center;gap:8px;font-size:15px;color:#33302B}
+.spbadge{background:#C4633C;color:#fff;font-size:11px;border-radius:999px;padding:2px 10px;margin-left:auto}
+.spcard-desc{font-size:13px;color:#6B655B;margin-top:6px;line-height:1.7}
+.spcard-foot{font-size:12px;color:#8A857B;margin-top:8px;line-height:1.9}
+.spcard-foot a{color:#C4633C;text-decoration:none}
 @media print{
   body *{visibility:hidden}
   #print-area,#print-area *{visibility:visible}
@@ -116,6 +124,12 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
 <h1>TrustBase 商家入驻</h1>
 <p class="sub">在你的电脑上完成入驻，密钥永不出门</p>
 
+<div class="spcard" id="spcard" style="display:none">
+  <div class="spcard-h"><span>🏪</span><span id="sp-name" style="font-weight:600">服务商</span><span class="spbadge" id="sp-rate" style="display:none"></span></div>
+  <div class="spcard-desc" id="sp-desc"></div>
+  <div class="spcard-foot" id="sp-foot"></div>
+</div>
+
 <div class="progress" id="progress">
 <h3>入驻进度 <span id="status-meta" style="font-size:12px;color:#8A857B;font-weight:400"></span><button class="sbtn noprint" style="float:right;margin-top:-2px" onclick="loadStatus()">刷新状态</button></h3>
 <div class="step done" id="st-identity">
@@ -133,7 +147,6 @@ img.auprev{display:none;width:100%;max-height:140px;object-fit:cover;border-radi
 <div class="step" id="st-verification">
   <span class="mark">⬜</span>
   <div class="body">③ 微信收款认证
-    <div class="ops"><button class="sbtn" id="btn-verify" onclick="submitVerification()" title="链上身份认证由服务商在进件审核通过后自动完成, 一般无需手动">提交实名认证 (一般无需手动)</button></div>
     <div class="desc" id="verify-desc">提交后由服务商审核微信特约商户收款账户; 审核通过后自动发放 100 TCT 引导金 (无需重复提交)</div>
     <div class="hintbox" id="verify-msg"></div>
     <div class="ops noprint"><button class="sbtn" id="btn-apply-toggle" onclick="toggleApplyForm()">填写进件资料并上传证件</button></div>
@@ -178,6 +191,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>
@@ -347,7 +364,7 @@ function renderProgress(s){
   //   其余 → 引导提交
   var vs=s.verification||{submitted:false,status:'none'};
   var qat=vs.queried_at?(' · 查询于 '+new Date(vs.queried_at*1000).toLocaleTimeString()):'';
-  var chainTxt=vs.raw_status?('链上状态 '+vs.raw_status):'链上状态未知';
+  var chainTxt=vs.raw_status?('审核状态 '+vs.raw_status):'审核状态未知';
   var vStep=document.getElementById('st-verification');
   var ap=s.applyment||null;
   var apDone=!!(ap&&ap.done);
@@ -355,11 +372,10 @@ function renderProgress(s){
   var applyForm=document.getElementById('apply-form');
   if(apDone){
     vStep.className='step done'; vStep.querySelector('.mark').textContent='✅';
-    document.getElementById('btn-verify').style.display='none';
     if(applyForm) applyForm.style.display='none';
     document.getElementById('verify-desc').textContent='微信收款进件已完成 (sub_mchid='+(ap.sub_mchid||'')+'), 收款通道就绪'+qat;
   } else if(kycOk){
-    document.getElementById('verify-desc').textContent='链上身份认证已过 ✅ · 微信收款进件未完成 — 请填写下方进件资料, 微信审核通过后收款通道才开通'+qat;
+    document.getElementById('verify-desc').textContent='身份认证已通过 ✅ · 微信收款进件未完成 — 请填写下方进件资料, 微信审核通过后收款通道才开通'+qat;
   } else if(vs.submitted){
     document.getElementById('verify-desc').textContent='实名已提交, 等待服务商审核 ('+chainTxt+qat+')';
   } else {
@@ -487,6 +503,7 @@ 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'),
+    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||''
@@ -588,29 +605,86 @@ 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){
   var el=document.getElementById(id);
   if(el){el.className='step done';var m=el.querySelector('.mark');if(m)m.textContent='✅'}
 }
-async function submitVerification(){
-  var btn=document.getElementById('btn-verify');btn.disabled=true;btn.textContent='提交中...';
-  var msg=document.getElementById('verify-msg');
+// 服务商名片卡 (2026-10-03): /api/onboard/sp-info 代理 SP 网关公开名片; 离线降级灰色态
+function escHtml(s){return String(s||'').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;')}
+async function loadSpInfo(){
+  var card=document.getElementById('spcard');
+  if(!card) return;
   try{
-    var j=await readJson(await fetch('/onboard/submit-verification',{method:'POST',headers:{'Content-Type':'application/json'},body:'{}'}));
-    if(j.ok){
-      msg.style.display='block';msg.textContent='✅ 实名已提交, 等待服务商审核, 通过后自动发放引导金'+(j.duplicate?' (此前已提交过, 幂等忽略'+(j.txhash?', tx '+String(j.txhash).slice(0,12)+'…':'')+')':'');
-      loadStatus(); // 立刻拉一次链上状态, 不等 15s 轮询
-    } else if(j.error==='module_not_live'){
-      msg.style.display='block';msg.textContent='ℹ️ '+(j.message||'链上实名模块未上线')+' — 自动通道将在集群升级后开放, 当前请由服务商协助办理微信特约商户认证';
-    } else {
-      msg.style.display='block';msg.textContent='提交失败: '+(j.message||j.error||'未知错误');
-    }
-  }catch(e){msg.style.display='block';msg.textContent='提交失败: 服务暂时不可用，请刷新重试 ('+e.message+')'}
-  btn.disabled=false;btn.textContent='提交实名认证';
+    var j=await readJson(await fetch('/api/onboard/sp-info'));
+    if(!j||!j.name) return;
+    card.style.display='block';
+    card.classList.toggle('offline', !!j.offline);
+    document.getElementById('sp-name').textContent=j.offline&&!j.stale?'服务商暂时不可达':j.name;
+    var rb=document.getElementById('sp-rate');
+    if(j.rate_pct){rb.style.display='';rb.textContent='抽佣 '+j.rate_pct;}else{rb.style.display='none';}
+    document.getElementById('sp-desc').textContent=j.offline&&!j.stale
+      ?'资料仍可填写，提交时会加密暂存本机，服务商恢复后可重试'
+      :(j.desc||'');
+    var foot=[];
+    if(j.official_url) foot.push('<a href="'+escHtml(j.official_url)+'" target="_blank">官网</a>');
+    if(j.contact) foot.push('客服: '+escHtml(j.contact));
+    if(j.chain_address) foot.push('服务商账号: <span style="font-family:Consolas,monospace;font-size:11px">'+escHtml(j.chain_address)+'</span>');
+    // 迁移保障 (核心卖点, 必须写; 面向商户禁用"链上"术语, 用大白话)
+    foot.push('服务商由你安装时选定，可随时更换 (你的资产保存在你自己的电脑上，不被锁定)');
+    if(j.offline&&j.stale) foot.push('当前离线, 展示缓存信息');
+    document.getElementById('sp-foot').innerHTML=foot.join(' · ');
+  }catch(e){ /* 名片接口挂了就保持隐藏, 不挡入驻主流程 */ }
 }
+window.addEventListener('load',loadSpInfo);
 async function loadStatus(){
   var meta=document.getElementById('status-meta');
   try{
@@ -659,6 +733,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';
     });
   }
   // 省市编码选项 (国标区划码, 两处下拉共用; 微信官方对照表口径)