@seasonkoh/webaz 0.1.29 → 0.1.30

package/dist/pwa/public/app.js

@@ -171,7 +171,7 @@ window.doRegisterPasskey = async (deviceLabel) => {
 window.requestPasskeyGate = async (purpose, purposeData) => {
   if (!isWebAuthnSupported()) throw new Error(t('当前设备不支持 Passkey'))
   const start = await POST('/webauthn/auth/start', { purpose, purpose_data: purposeData })
-  if (start.error) throw new Error(start.error)
+  if (start.error) { const _e = new Error(start.error); _e.code = start.error_code; throw _e }   // code=NO_PASSKEY_REGISTERED → 前端才引导注册;其余(取消/设备)不误导
   const opts = start.options
   const publicKey = {
     ...opts,
@@ -566,7 +566,7 @@ async function render(page, params) {
     const { status, body } = await apiWithStatus('GET', '/me')
     if (status === 200 && body && !body.error) {
       state.user = body
-      connectSSE(); maybePromptPlacementBind(); refreshCartBadge(); maybeShowInstallBanner(); maybeClaimPendingProductShare(); maybeClaimPendingShopReferral(); setTimeout(refreshCompareBadge, 0); refreshChatsBadge(); refreshFeedbackBadge(); refreshSnfBadge(); setTimeout(ensureSnfPull, 800)
+      connectSSE(); maybePromptPlacementBind(); refreshCartBadge(); maybeShowInstallBanner(); maybeClaimPendingProductShare(); maybeClaimPendingShopReferral(); setTimeout(refreshCompareBadge, 0); refreshChatsBadge(); refreshFeedbackBadge(); refreshSnfBadge(); setTimeout(ensureSnfPull, 800); if (window.arbEntryHydrate) arbEntryHydrate()
       try { p2pStart() } catch (e) { console.warn('[P2P] start err', e) }
     } else if (status === 401 || status === 403) {
       // 真·鉴权失败：清掉两层存储
@@ -644,11 +644,11 @@ async function render(page, params) {
       return renderContributeTasks(app)
     case 'seller':
       if (state.user?.role === 'logistics')  return renderLogistics(app)
-      if (state.user?.role === 'arbitrator') return renderDisputeList(app)
+      if (state.canArbitrate) return renderDisputeList(app)  // PR-E:仲裁入口跟随 can_arbitrate,非 role==='arbitrator'
       return renderSeller(app)
     case 'edit-product':  return renderEditProduct(app, params[0])
     case 'wallet':        return renderWallet(app)
-    case 'agents':        return renderConnectedAgents(app)
+    case 'agents':        return renderConnectedAgents(app); case 'pair': return window.renderAgentPair(app); case 'agent-approvals': return window.renderAgentApprovals(app)  // RFC-020 #pair 配对授权页 / #agent-approvals 扩权审批页
     case 'note':          return renderNoteLanding(app, params[0])
     case 'tag':           return renderTagPage(app, decodeURIComponent(params[0] || ''))
     case 'governance':    return renderGovernance(app)
@@ -721,7 +721,7 @@ async function render(page, params) {
       if (params[0] === 'public-ideas')            return renderAdminPublicIdeas(app)
       if (params[0] === 'task-proposals')          return renderAdminTaskProposals(app)
       if (params[0] === 'quota-requests')          return renderAdminBuildTaskQuota(app)
-      if (params[0] === 'operator-claims')         return renderAdminOperatorClaims(app); if (params[0] === 'deferrals') return renderAdminDirectPayDeferrals(app); if (params[0] === 'product-verifications') return renderAdminProductVerifications(app); if (params[0] === 'store-verifications') return renderAdminStoreVerifications(app); if (params[0] === 'compliance') return renderAdminDirectReceiveCompliance(app); if (params[0] === 'dp-ops') return renderAdminDirectPayHub(app); if (params[0] === 'dp-fee') return renderAdminDirectPayFeeOps(app)  // PR-②c 缓交 / PR-④b 逐品 / PR-⑤b 店铺 / PR-⑧ 合规录入 / PR-B 商户运营 hub + 平台服务费
+      if (params[0] === 'operator-claims')         return renderAdminOperatorClaims(app); if (params[0] === 'deferrals') return renderAdminDirectPayDeferrals(app); if (params[0] === 'product-verifications') return renderAdminProductVerifications(app); if (params[0] === 'store-verifications') return renderAdminStoreVerifications(app); if (params[0] === 'compliance') return renderAdminDirectReceiveCompliance(app); if (params[0] === 'dp-ops') return renderAdminDirectPayHub(app); if (params[0] === 'dp-fee') return renderAdminDirectPayFeeOps(app); if (params[0] === 'platform-receive') return renderAdminPlatformReceiveAccounts(app); if (params[0] === 'fee-prepay-requests') return renderAdminFeePrepayRequests(app); if (params[0] === 'arbitrators') return renderAdminArbitrators(app); if (params[0] === 'contribution-ops') return renderAdminContributionHub(app); if (params[0] === 'bond-deposits') return renderAdminBondDeposits(app); if (params[0] === 'agent-strikes') return renderAdminAgentStrikes(app)  // PR-②c 缓交 / PR-④b 逐品 / PR-⑤b 店铺 / PR-⑧ 合规录入 / PR-B 商户运营 hub + 平台服务费 + 平台收款方式 + 预充值申请审核 / PR-F 仲裁员管理
       if (params[0] === 'params')                  return renderAdminParams(app)
       if (params[0] === 'timeline' && params[1])   return renderAdminUserTimeline(app, params[1])
       if (params[0] === 'timeline')                return renderAdminUserTimelinePicker(app)
@@ -845,14 +845,14 @@ async function render(page, params) {
 // M7.4：order 含 has_pending_claim=1 时附加一枚"验证中"chip
 function orderStatusBadges(order) {
   if (!order) return ''
-  const main = statusBadge(order.status)
+  const main = statusBadge(order.status, order.payment_rail)
   if (Number(order.has_pending_claim) === 1) {
     return `${main} <span style="display:inline-block;font-size:10px;background:#eef2ff;color:#3730a3;padding:2px 8px;border-radius:99px;font-weight:600;margin-left:4px">🔎 ${t('验证中')}</span>`
   }
   return main
 }
 
-function statusBadge(status) {
+function statusBadge(status, rail) {
   const map = {
     created:          ['gray',   t('待付款')],
     paid:             ['blue',   t('待接单')],
@@ -875,7 +875,8 @@ function statusBadge(status) {
     dispute_dismissed:   ['gray',   t('争议驳回')],
     expired:             ['gray',   t('已过期')],
   }
-  const [color, label] = map[status] || ['gray', status]
+  // 直付(非托管)争议终态:不发生退款/资金释放 → 用信誉裁决语义(dpTerminalBadge,见 app-order-labels.js)
+  const [color, label] = (rail === 'direct_p2p' && ((window.dpTerminalBadge && window.dpTerminalBadge(status)) || (window.dpNegotiationBadge && window.dpNegotiationBadge(status)) || (window.dpAcceptBadge && window.dpAcceptBadge(status)))) || map[status] || ['gray', status]
   return `<span class="badge badge-${color}">${label}</span>`
 }
 
@@ -1027,10 +1028,10 @@ function preLaunchBannerHTML() {
 // 没有 Passkey 登录 / 找回路径,丢 key 换设备后 Passkey 救不回账号(与弹窗"增强不替代恢复邮箱"一致)。
 function recoveryBannerHTML() {
   const u = state.user
-  if (!u || u.role === 'admin') return ''
-  const hasRecovery = u.has_password || u.email_verified
-  if (hasRecovery) return ''
-  return `<div style="background:#fef2f2;border:1px solid #fca5a5;border-radius:8px;padding:10px 14px;font-size:12px;color:#991b1b;line-height:1.6;margin:8px 12px 12px">
+  if (!u || u.role === 'admin' || u.has_password || u.email_verified) return ''
+  if (!location.hash.startsWith('#me') && Date.now() < +(localStorage.getItem('webaz_recovery_dismiss_until') || 0)) return ''   // 走查批次2·横幅降噪:可关闭 7 天冷却;「我的」域恒显(设置入口所在,安全提醒不静音到死角)
+  return `<div data-rcv style="background:#fef2f2;border:1px solid #fca5a5;border-radius:8px;padding:10px 14px;font-size:12px;color:#991b1b;line-height:1.6;margin:8px 12px 12px;position:relative">
+    <button title="${t('暂时隐藏(7 天)')}" onclick="localStorage.setItem('webaz_recovery_dismiss_until', String(Date.now() + 7 * 86400e3)); this.closest('[data-rcv]').remove()" style="position:absolute;top:6px;right:8px;background:none;border:none;cursor:pointer;color:#b91c1c;font-size:14px;padding:2px 6px">×</button>
     🚨 <strong>${t('账户还没有恢复方式')}</strong> — ${t('闪退或换设备清缓存后可能永久无法登录。')}
     <div style="margin-top:8px;display:flex;gap:8px;flex-wrap:wrap">
       <button class="btn btn-sm" style="font-size:11px;padding:4px 10px;background:#dc2626;color:#fff;border:none;border-radius:6px;cursor:pointer" onclick="navigate('#me/settings')">${t('立即设置密码 / 绑定邮箱')} →</button>
@@ -2645,7 +2646,7 @@ async function renderAdminOrders(app, opts = {}) {
       <div style="display:flex;justify-content:space-between;align-items:flex-start;gap:8px">
         <div style="flex:1;min-width:0">
           <div style="font-weight:600">${escHtml(o.product_title)}</div>
-          <div style="font-size:12px;color:#6b7280;margin-top:2px">${o.total_amount} WAZ · ${fmtTime(o.created_at)}</div>
+          <div style="font-size:12px;color:#6b7280;margin-top:2px">${o.payment_rail === 'direct_p2p' ? `<span style="background:#fef3c7;color:#92400e;border-radius:99px;padding:1px 8px;font-size:10px;font-weight:600;margin-right:4px">${t('直付')}</span>${o.total_amount} USDC` : `${o.total_amount} WAZ`} · ${fmtTime(o.created_at)}</div>
           <div style="font-size:11px;color:#6b7280;margin-top:4px">${t('买家')}: ${escHtml(o.buyer_name)} · ${t('卖家')}: ${escHtml(o.seller_name)}</div>
           <div style="font-size:11px;color:#9ca3af;margin-top:2px">${o.id}</div>
         </div>
@@ -2671,34 +2672,7 @@ window.doAdminOrderFilter = () => {
   renderAdminOrders(document.getElementById('app'), { status })
 }
 
-async function renderAdminDisputes(app) {
-  if (!state.user) { renderLogin(); return }
-  if (!isAdmin()) { app.innerHTML = shell(`<div class="alert alert-info">${t('仅限管理员')}</div>`, 'admin'); return }
-  app.innerHTML = shell(loading$(), 'admin')
-  const data = await GET('/admin/disputes')
-  if (data.error) { app.innerHTML = shell(alert$('error', data.error), 'admin'); return }
-  const list = data.disputes.map(d => `
-    <div class="card" style="margin-bottom:10px;font-size:13px">
-      <div style="display:flex;justify-content:space-between;align-items:flex-start;gap:8px">
-        <div style="flex:1;min-width:0">
-          <div style="font-weight:600">${escHtml(d.product_title || '—')}</div>
-          <div style="font-size:12px;color:#6b7280;margin-top:2px">${escHtml((d.reason || '').slice(0, 80))}</div>
-          <div style="font-size:11px;color:#6b7280;margin-top:6px">${t('原告')}: ${escHtml(d.initiator_name || '—')} → ${t('被告')}: ${escHtml(d.defendant_name || '—')}</div>
-          <div style="font-size:11px;color:#9ca3af;margin-top:4px">${d.id} · ${fmtTime(d.created_at)}</div>
-        </div>
-        <div style="display:flex;flex-direction:column;gap:6px;align-items:flex-end">
-          <span style="background:#fef3c7;color:#92400e;padding:2px 8px;border-radius:8px;font-size:11px">${d.status}</span>
-          ${d.total_amount ? `<div style="font-size:12px;color:#374151">${d.total_amount} WAZ</div>` : ''}
-        </div>
-      </div>
-    </div>`).join('') || `<div class="empty"><div class="empty-icon">⚖️</div><div class="empty-text">${t('暂无争议')}</div></div>`
-  app.innerHTML = shell(`
-    <h1 class="page-title">⚖️ ${t('争议查看')}</h1>
-    <div style="margin-bottom:16px"><button class="btn btn-outline btn-sm" style="width:auto" onclick="navigate('#admin')">${t('返回概览')}</button></div>
-    <div style="font-size:12px;color:#6b7280;margin-bottom:10px">${t('共')} ${data.disputes.length} ${t('条结果')}（${t('含已结案')}）</div>
-    ${list}
-  `, 'admin')
-}
+// renderAdminDisputes 已抽出到 app-admin-disputes.js(window.renderAdminDisputes;可区分状态/直付-托管/进度/指派/结案 + 可管理:过滤+钻取)。
 
 async function renderAdminTasks(app, opts = {}) {
   if (!state.user) { renderLogin(); return }
@@ -8115,8 +8089,8 @@ async function renderReturnsCenter(app) {
   ])
   const items = list?.items || []
   const reasons = RETURN_REASON_LABEL()
-  const STATUS_COLORS = { pending:'#d97706', refunded:'#16a34a', rejected:'#dc2626', cancelled:'#6b7280', accepted_pickup_pending:'#0891b2', picked_up:'#4f46e5' }
-  const STATUS_LABEL = () => ({ pending: t('待处理'), refunded: t('已退款'), rejected: t('已拒绝'), cancelled: t('已取消'), accepted_pickup_pending: '📦 ' + t('待物流上门取件'), picked_up: '🚛 ' + t('已揽收，待卖家确认收到') })
+  const STATUS_COLORS = { pending:'#d97706', refunded:'#16a34a', rejected:'#dc2626', cancelled:'#6b7280', accepted_pickup_pending:'#0891b2', picked_up:'#4f46e5', ...(window.dpReturnStatusColors ? window.dpReturnStatusColors() : {}) }
+  const STATUS_LABEL = () => ({ pending: t('待处理'), refunded: t('已退款'), rejected: t('已拒绝'), cancelled: t('已取消'), accepted_pickup_pending: '📦 ' + t('待物流上门取件'), picked_up: '🚛 ' + t('已揽收，待卖家确认收到'), ...(window.dpReturnStatusLabels ? window.dpReturnStatusLabels() : {}) })
 
   const statsHtml = stats ? `
     <div class="card" style="background:linear-gradient(135deg,#fff7ed,#fef3c7);margin-bottom:14px">
@@ -8982,7 +8956,7 @@ window.doLogin = async () => {
   if (!key) return showMsg('error', t('请粘贴 api_key'))
   state.apiKey = key
   const user = await GET('/me')
-  if (user.error) { state.apiKey = null; return showMsg('error', t('无效的 api_key，请重新输入')) }
+  if (user.error) { if (user.error_code === 'AGENT_BLOCKED' && window.renderAgentBlockedAppeal) { try { document.querySelectorAll('.js-modal, .js-sheet').forEach(m => m.remove()) } catch {}; return void window.renderAgentBlockedAppeal(user.error) } state.apiKey = null; return showMsg('error', t('无效的 api_key，请重新输入')) }
   state.user = user
   await persistApiKey(key)
   connectSSE()
@@ -10463,7 +10437,7 @@ window.openBuySheet = function(productId) {
         </div>
       </details>
 
-      ${window.dpRailSelectorHtml ? window.dpRailSelectorHtml(prod.id, prod.price) : ''}
+      ${window.dpRailSelectorHtml ? window.dpRailSelectorHtml(prod.id, prod.price) : ''}${window.shipRegionBlockHtml ? window.shipRegionBlockHtml(prod.id) : ''}${window.purchaseTermsBlockHtml ? window.purchaseTermsBlockHtml(prod.id) : ''}
       <div id="buy-msg" style="margin-top:10px"></div>
       <div id="tax-preview-slot" style="margin-top:8px"></div>
 
@@ -11311,7 +11285,7 @@ window.doBuy = async (productId, price) => {
   const qtyInp = document.getElementById('inp-qty')
   const quantity = qtyInp ? Math.max(1, Math.min(Number(qtyInp.max) || 1, Math.floor(Number(qtyInp.value) || 1))) : 1
   const payment_rail = window.dpSelectedRail ? window.dpSelectedRail() : 'escrow'; if (!payment_rail) { const _dp=document.querySelector('input[name="dp-rail"]:checked')?.value==='direct_p2p'; const _m=document.getElementById('buy-msg'); if(_m) _m.innerHTML = alert$('error', _dp ? t('直付暂未就绪或不可用,请稍候重试或改选支付方式') : t('请选择支付方式')); const _b=document.getElementById('dp-rail-block'); if(_b) _b.open=true; return } if (window.closeSheet) window.closeSheet()  // #28 空 rail 一律拦(永不静默落 escrow);[PRELAUNCH-WAZ-SIM] 未选→空;校验通过才关 sheet(块内 return 不关→提示+展开可见,修 P2)
-  const res = await POST('/orders', { product_id: productId, shipping_address: addr, notes, sponsor_hint, coupon_code, delivery_window, variant_id, expected_price, buy_insurance, anonymous_recipient, donation_pct, quantity, payment_rail, direct_receive_account_id: (payment_rail === 'direct_p2p' && window.dpSelectedAccountId) ? (window.dpSelectedAccountId() || undefined) : undefined, ...giftPayload })
+  const res = await POST('/orders', { product_id: productId, shipping_address: addr, notes, sponsor_hint, coupon_code, delivery_window, variant_id, expected_price, buy_insurance, anonymous_recipient, donation_pct, quantity, payment_rail, ship_to_region: (window.shipSelectedRegion ? window.shipSelectedRegion() : undefined), direct_receive_account_id: (payment_rail === 'direct_p2p' && window.dpSelectedAccountId) ? (window.dpSelectedAccountId() || undefined) : undefined, ...giftPayload })
   if (payment_rail === 'direct_p2p') return void (window.dpAfterCreate && window.dpAfterCreate(res))
   if (res.error_code === 'PRICE_CHANGED') {
     document.getElementById('buy-msg').innerHTML = alert$('error', `${t('价格已变动')}：${window.fmtPrice(res.old_price)} → ${window.fmtPrice(res.new_price)} · ${t('请刷新页面')}`)
@@ -11709,6 +11683,7 @@ async function renderOrders(app) {
   const ordersScope = state.ordersScope || (state.user.role === 'seller' ? 'sold' : 'all')
   if (ordersScope === 'sold')      orders = orders.filter(o => o.seller_id === state.user.id)
   else if (ordersScope === 'bought') orders = orders.filter(o => o.buyer_id === state.user.id)
+  const railChipsHtml = window.orderRailChipsHtml(orders); orders = window.orderRailApply(orders)   // 类型(支付轨)筛选 chip + 过滤;逻辑在 app-order-rail-filter.js
   const groups = {
     all:        { label: t('全部'),         icon: '📋', match: () => true },
     pay:        { label: t('待付款'),       icon: '💳', match: o => o.status === 'created' },
@@ -11778,18 +11753,18 @@ async function renderOrders(app) {
           <div class="order-icon">${pending ? '⏰' : getCategoryIcon(o.category)}</div>
           <div class="order-info">
             <div class="order-title">${escHtml(o.product_title)}</div>
-            <div class="order-meta">${fmtTime(o.created_at)} · ${o.buyer_id === state.user.id ? t('我买的') : t('我卖的')}</div>
+            <div class="order-meta">${fmtTime(o.created_at)} · ${o.buyer_id === state.user.id ? t('我买的') : t('我卖的')}${window.orderRailBadge(o)}</div>
             <div style="margin-top:6px">${orderStatusBadges(o)}</div>
           </div>
-          <div class="order-amount">${o.total_amount}</div>
+          <div class="order-amount">${window.orderAmountHtml(o)}</div>
         </div>
         ${canRebuy ? `<div style="border-top:1px solid #f3f4f6;padding:8px 14px;display:flex;justify-content:flex-end"><button onclick="event.stopPropagation();navigate('#order-product/${o.product_id}')" style="background:#eef2ff;color:#3730a3;border:1px solid #c7d2fe;padding:4px 12px;border-radius:99px;font-size:11px;font-weight:600;cursor:pointer">🔁 ${t('再次购买')}</button></div>` : ''}
       </div>`
       }).join('')
 
   const exportRole = state.user?.role === 'seller' ? 'seller' : 'buyer'
-  const exportBtn = `<button class="btn btn-outline btn-sm" style="float:right;font-size:11px;padding:4px 10px" onclick="exportOrders('${exportRole}')">📥 ${t('导出 CSV')}</button>`
-  app.innerHTML = shell(`<h1 class="page-title">${t('我的订单')} ${exportBtn}</h1>${mainTabsHtml}${scopeChipsHtml}${notePromptPlaceholder('orders')}${tabsHtml}${pendingBanner}${list}`, 'orders')
+  const exportBtn = `<button class="btn btn-outline btn-sm" style="float:right;font-size:11px;padding:4px 10px" onclick="exportOrders('${exportRole}','${state.ordersRail || 'all'}')">📥 ${t('导出 CSV')}</button>`
+  app.innerHTML = shell(`<h1 class="page-title">${t('我的订单')} ${exportBtn}</h1>${mainTabsHtml}${scopeChipsHtml}${railChipsHtml}${notePromptPlaceholder('orders')}${tabsHtml}${pendingBanner}${list}`, 'orders')
   hydrateNotePrompt('orders')
 }
 
@@ -11821,9 +11796,9 @@ window.printOrderReceipt = async (orderId) => {
     <div class="row"><span>${t('商品')}</span><strong>${escHtml(product?.title || '—')}</strong></div>
     ${variantStr ? `<div class="row"><span>${t('规格')}</span><span>${escHtml(variantStr)}</span></div>` : ''}
     <div class="row"><span>${t('数量')}</span><span>${order.quantity}</span></div>
-    <div class="row"><span>${t('单价')}</span><span>${order.unit_price} WAZ</span></div>
-    ${Number(order.coupon_discount) > 0 ? `<div class="row"><span>${t('优惠')}</span><span style="color:#dc2626">-${order.coupon_discount} WAZ</span></div>` : ''}
-    <div class="total">${t('总计')}: ${order.total_amount} WAZ</div>
+    <div class="row"><span>${t('单价')}</span><span>${order.unit_price} USDC</span></div>
+    ${Number(order.coupon_discount) > 0 ? `<div class="row"><span>${t('优惠')}</span><span style="color:#dc2626">-${order.coupon_discount} USDC</span></div>` : ''}
+    <div class="total">${t('总计')}: ${order.total_amount} USDC</div>
     <hr style="margin:14px 0;border:none;border-top:1px solid #ddd">
     <div class="muted">${t('收货地址')}: ${escHtml(order.shipping_address || '—')}</div>
     <div class="muted">${t('订单状态')}: ${order.status}</div>
@@ -11832,12 +11807,10 @@ window.printOrderReceipt = async (orderId) => {
   w.document.close()
 }
 
-window.exportOrders = (role) => {
-  // 直接打开端点 → 浏览器下载（Authorization 头通过 token query 传递）
-  const url = `/api/orders/export?role=${role}&token=${encodeURIComponent(state.apiKey)}`
-  // 浏览器导航触发下载（Content-Disposition: attachment）
-  // 由于 auth() 当前只读 Authorization 头，导出端点需支持 query token；改用 fetch + blob 下载更稳
-  fetch(`/api/orders/export?role=${role}`, { headers: { Authorization: 'Bearer ' + state.apiKey } })
+window.exportOrders = (role, rail) => {
+  const railQ = (rail === 'escrow' || rail === 'direct_p2p') ? `&rail=${rail}` : ''   // 导出与当前筛选一致(对账分轨)
+  // auth() 只读 Authorization 头 → 用 fetch + blob 下载（Content-Disposition: attachment）
+  fetch(`/api/orders/export?role=${role}${railQ}`, { headers: { Authorization: 'Bearer ' + state.apiKey } })
     .then(async (r) => {
       const truncated = r.headers.get('X-Truncated') === '1'
       const limit = r.headers.get('X-Truncated-Limit')
@@ -11937,7 +11910,7 @@ async function renderOrdersShare(app, mainTabsHtml) {
           <div style="font-size:28px;flex-shrink:0">${getCategoryIcon(o.category)}</div>
           <div style="flex:1;min-width:0">
             <div style="font-size:13px;font-weight:500;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">${escHtml(o.product_title)}</div>
-            <div style="font-size:11px;color:#6b7280;margin-top:2px"><a href="#order/${o.id}" style="color:#6b7280;text-decoration:none">${t('订单')} ${orderShort}</a> · ${fmtTime(o.updated_at || o.created_at)}${typeof o.total_amount !== 'undefined' ? ` · ${o.total_amount} WAZ` : ''}</div>
+            <div style="font-size:11px;color:#6b7280;margin-top:2px"><a href="#order/${o.id}" style="color:#6b7280;text-decoration:none">${t('订单')} ${orderShort}</a> · ${fmtTime(o.updated_at || o.created_at)}${typeof o.total_amount !== 'undefined' ? ` · ${window.orderAmountHtml(o)}` : ''}</div>
           </div>
           <div style="display:flex;gap:4px;flex-shrink:0">
             <button class="btn btn-outline btn-sm" style="width:auto;padding:5px 8px;font-size:10px;white-space:nowrap" onclick="shareCompletedOrder('${o.product_id}', '${escHtml(o.product_title || '').replace(/'/g, "\\'")}')">🔗 ${t('添加口令')}</button>
@@ -12181,10 +12154,10 @@ function orderStageTimeline(order, history) {
     { key: 'completed',  label: t('完成'),  icon: '✓' },
   ]
   // 异常状态：单独 banner，不画时间线（防误导）
-  const ANOMALY = ['disputed', 'cancelled', 'fault_seller', 'fault_buyer', 'fault_logistics', 'refunded_partial', 'refunded_full', 'dispute_dismissed', 'expired']
+  const ANOMALY = ['disputed', 'payment_query', 'cancelled', 'fault_seller', 'fault_buyer', 'fault_logistics', 'refunded_partial', 'refunded_full', 'dispute_dismissed', 'expired']
   if (ANOMALY.includes(order.status)) {
     const colorMap = {
-      disputed: '#f59e0b', cancelled: '#6b7280',
+      disputed: '#f59e0b', payment_query: '#f59e0b', cancelled: '#6b7280',
       fault_seller: '#dc2626', fault_buyer: '#dc2626', fault_logistics: '#dc2626',
       refunded_full: '#16a34a', refunded_partial: '#3b82f6', dispute_dismissed: '#6b7280', expired: '#9ca3af',
     }
@@ -12198,7 +12171,7 @@ function orderStageTimeline(order, history) {
     return `<div style="background:#fff;border:0.5px solid #e5e7eb;border-radius:12px;padding:14px 16px;margin-bottom:10px;display:flex;align-items:center;gap:10px">
       <div style="width:8px;height:8px;border-radius:50%;background:${c};flex-shrink:0"></div>
       <div style="flex:1">
-        <div style="font-size:14px;font-weight:600;color:#1f2937">${labelMap[order.status] || order.status}</div>
+        <div style="font-size:14px;font-weight:600;color:#1f2937">${(order.payment_rail === 'direct_p2p' && ((window.dpTerminalLabel && window.dpTerminalLabel(order.status)) || (window.dpNegotiationLabel && window.dpNegotiationLabel(order.status)) || (window.dpAcceptLabel && window.dpAcceptLabel(order.status)))) || labelMap[order.status] || order.status}</div>
         <div style="font-size:11px;color:#8e8e93;margin-top:2px">${t('查看下方时间线了解流转详情')}</div>
       </div>
     </div>`
@@ -12218,7 +12191,7 @@ function orderStageTimeline(order, history) {
   // "当前" = 正在等待的下一阶段（不是已完成的最后阶段）
   // created → 等付款；paid → 等接单；accepted → 等发货；shipped/in_transit → 等送达；
   // delivered → 等买家确认；confirmed/completed → 全部完成
-  const statusToIdx = { created: 1, paid: 2, accepted: 3, shipped: 4, picked_up: 4, in_transit: 4, delivered: 5, confirmed: 6, completed: 6 }
+  const statusToIdx = { created: 1, direct_pay_window: 1, direct_expired_unconfirmed: 1, paid: 2, accepted: 3, shipped: 4, picked_up: 4, in_transit: 4, delivered: 5, confirmed: 6, completed: 6 }
   let currentIdx = statusToIdx[order.status] ?? 0
 
   const dot = (s, i) => {
@@ -12252,7 +12225,7 @@ function orderStageTimeline(order, history) {
 // 与顶部紧凑 stepper 互补：stepper 给总览，timeline 给细节
 function orderTrackingTimeline(order, history, trackingInfo, STATUS_ZH) {
   // 异常订单不显示物流时间线（争议/取消等）— 由顶部 stepper 异常 banner 兜底
-  const ANOMALY = ['disputed', 'cancelled', 'fault_seller', 'fault_buyer', 'fault_logistics', 'refunded_partial', 'refunded_full', 'dispute_dismissed', 'expired']
+  const ANOMALY = ['disputed', 'payment_query', 'cancelled', 'fault_seller', 'fault_buyer', 'fault_logistics', 'refunded_partial', 'refunded_full', 'dispute_dismissed', 'expired']
   if (ANOMALY.includes(order.status)) return ''
 
   // 已完成节点 lookup
@@ -12382,14 +12355,18 @@ function nextActionCard(order, isBuyer, isSeller, activeDeadline, isOverdue) {
   // 我自己是违约方时只看到警告，不显示按钮（不能自己触发对自己的判责）
   const meAtFault = hint.overdueFault && hint.overdueFault === ('fault_' + (isBuyer ? 'buyer' : isSeller ? 'seller' : ''))
   const canForceTrigger = isOverdue && hint.overdueFault && !meAtFault && (isBuyer || isSeller)
+  // 直付(非托管):WebAZ 不退款/不放款 → 超时后果只写信誉责任,绝不写"退款/资金释放"
+  const overdueConsequence = order.payment_rail === 'direct_p2p'
+    ? ({ paid: '卖家信誉扣分;直付非托管,WebAZ 不退款/不放款', accepted: '卖家信誉扣分;直付非托管,WebAZ 不退款/不放款', in_transit: '物流/履约信誉扣分;直付非托管,WebAZ 不退款', delivered: '系统自动确认直付订单完成;不涉及平台放款' }[order.status] || hint.overdueConsequence)
+    : hint.overdueConsequence
   return `<div style="background:${bg};border:0.5px solid ${isOverdue ? '#fecaca' : '#e5e7eb'};border-radius:12px;padding:14px 16px;margin-bottom:10px">
     <div style="display:flex;align-items:center;gap:10px">
       <div style="font-size:22px;line-height:1">${icon}</div>
       <div style="flex:1">
         <div style="font-size:14px;font-weight:600;color:${tone}">${t(myHint)}</div>
         ${activeDeadline?.deadline ? `<div style="font-size:11px;color:#8e8e93;margin-top:2px">${isOverdue ? t('已超时，协议将自动判责') : fmtCountdown(activeDeadline.deadline)}</div>` : ''}
-        ${isOverdue && hint.overdueConsequence ? `<div style="margin-top:8px;padding:8px 10px;background:#fff;border-radius:6px;font-size:12px;color:#7c2d12;border:1px dashed #fecaca">
-          ⚖️ ${t('协议处置')}：${t(hint.overdueConsequence)}
+        ${isOverdue && overdueConsequence ? `<div style="margin-top:8px;padding:8px 10px;background:#fff;border-radius:6px;font-size:12px;color:#7c2d12;border:1px dashed #fecaca">
+          ⚖️ ${t('协议处置')}：${t(overdueConsequence)}
         </div>` : ''}
         ${canForceTrigger ? `<button onclick="forceTimeoutCheck('${order.id}')" style="margin-top:10px;background:#dc2626;color:#fff;border:none;border-radius:8px;padding:8px 14px;font-size:13px;font-weight:600;cursor:pointer">⚡ ${t('立即触发判责')}</button>
         <div style="font-size:10px;color:#9ca3af;margin-top:6px">${t('协议巡检每 5 分钟一次；你也可立即触发，无需等待。')}</div>` : ''}
@@ -12450,10 +12427,10 @@ async function renderOrderDetail(app, orderId) {
   const historyHtml = (history || []).map(h => `
     <div class="timeline-item">
       <div><span class="timeline-status">${t(STATUS_ZH[h.from_status] || h.from_status)} → ${t(STATUS_ZH[h.to_status] || h.to_status)}</span></div>
-      <div class="timeline-actor">${h.actor_name}（${h.actor_role_name || h.actor_role}）</div>
+      <div class="timeline-actor">${escHtml(h.actor_name)}（${escHtml(h.actor_role_name || h.actor_role)}）</div>
       <div class="timeline-time">${fmtTime(h.created_at)}</div>
-      ${h.notes ? `<div class="timeline-evidence" style="color:#6b7280">💬 ${h.notes}</div>` : ''}
-      ${(h.evidence_items || []).map(e => `<div class="timeline-evidence">📎 ${e.description}</div>`).join('')}
+      ${h.notes ? `<div class="timeline-evidence" style="color:#6b7280">💬 ${escHtml(h.notes)}</div>` : ''}
+      ${(h.evidence_items || []).map(e => `<div class="timeline-evidence">📎 ${escHtml(e.description)}</div>`).join('')}
     </div>`).join('')
 
   // 物流追踪完整时间轴 — 含订单全流转 + 未到达节点的截止提示
@@ -12503,17 +12480,17 @@ async function renderOrderDetail(app, orderId) {
     ${nextActionCard(order, isBuyer, isSeller, activeDeadline, isOverdue)}
 
     <div class="card">
-      <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px">
-        <div style="font-size:13px;color:#6b7280;font-family:monospace">${order.id}</div>
-        <div style="display:flex;gap:6px;align-items:center">
-          ${(isBuyer || isSeller) ? `<button class="btn btn-sm" style="background:#eef2ff;color:#4338ca;font-size:11px;padding:4px 10px" onclick="openChatForContext('order','${order.id}')">💬 ${t('联系对方')}</button>` : ''}
+      <div style="display:flex;flex-wrap:wrap;justify-content:space-between;align-items:center;gap:8px;margin-bottom:12px">
+        <div style="font-size:12px;color:#9ca3af;font-family:monospace;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex:1 1 120px;min-width:0" title="${escHtml(order.id)}">${order.id}</div>
+        <div style="display:flex;gap:6px;align-items:center;flex-wrap:wrap;flex-shrink:0;white-space:nowrap">
+          ${(isBuyer || isSeller) ? `<button class="btn btn-sm" style="background:#eef2ff;color:#4338ca;font-size:11px;padding:4px 10px;white-space:nowrap" onclick="openChatForContext('order','${order.id}')">💬 ${t('联系对方')}</button>` : ''}
           ${orderStatusBadges(order)}
         </div>
       </div>
-      <div class="detail-row"><span class="detail-label">${t('商品')}</span><span class="detail-value">${product?.title || ''}</span></div>
-      <div class="detail-row"><span class="detail-label">${t('金额')}</span><span class="detail-value" style="color:#4f46e5">${order.total_amount} WAZ${usdHint(order.total_amount)}${Number(order.insurance_premium) > 0 ? ` <span style="font-size:10px;color:#6366f1;background:#eef2ff;padding:1px 6px;border-radius:99px;margin-left:4px">🛡 ${t('已购保险')} +${order.insurance_premium}</span>` : ''}</span></div>
+      <div class="detail-row" style="align-items:flex-start"><span class="detail-label" style="flex-shrink:0;margin-right:12px">${t('商品')}</span><span class="detail-value" style="text-align:left;max-width:78%;word-break:break-word;line-height:1.5">${escHtml(product?.title || '')}</span></div>
+      <div class="detail-row"><span class="detail-label">${t('金额')}</span><span class="detail-value" style="color:#4f46e5">${window.orderAmountHtml(order)}${Number(order.insurance_premium) > 0 ? ` <span style="font-size:10px;color:#6366f1;background:#eef2ff;padding:1px 6px;border-radius:99px;margin-left:4px">🛡 ${t('已购保险')} +${order.insurance_premium}</span>` : ''}</span></div>
       <div class="detail-row"><span class="detail-label">${t('下单时间')}</span><span class="detail-value">${fmtTime(order.created_at)}</span></div>
-      ${order.shipping_address ? `<div class="detail-row"><span class="detail-label">${t('收货地址')}</span><span class="detail-value">${order.shipping_address}</span></div>` : ''}
+      ${order.shipping_address ? `<div class="detail-row"><span class="detail-label">${t('收货地址')}</span><span class="detail-value">${escHtml(order.shipping_address)}</span></div>` : ''}
       ${order.anonymous_recipient && order.recipient_code ? `<div class="detail-row"><span class="detail-label">🔒 ${t('取件代号')}</span><span class="detail-value" style="font-family:monospace;font-size:14px;font-weight:700;color:#166534;background:#dcfce7;padding:2px 10px;border-radius:6px;letter-spacing:1px">${escHtml(order.recipient_code)}</span></div><div style="font-size:11px;color:#15803d;padding:0 14px 8px">${t('凭此代号到自提点取件 · 卖家和物流不知道你的真实姓名')}</div>` : ''}
       ${order.anonymous_recipient && !order.recipient_code ? `<div class="detail-row"><span class="detail-label">🔒 ${t('匿名订单')}</span><span class="detail-value" style="font-size:11px;color:#6b7280">${t('买家选择了匿名收货')}</span></div>` : ''}
       ${Number(order.donation_amount) > 0 ? `<div class="detail-row"><span class="detail-label">❤️ ${t('随单捐赠')}</span><span class="detail-value" style="color:#dc2626;font-weight:600">${order.donation_amount} WAZ</span></div>` : ''}
@@ -12523,7 +12500,7 @@ async function renderOrderDetail(app, orderId) {
       ${order.content_hash_at_order ? `<div class="detail-row"><span class="detail-label">🔒 ${t('P2P 内容哈希')}</span><span class="detail-value" style="font-family:monospace;font-size:11px;word-break:break-all">${escHtml(order.content_hash_at_order)}</span></div>` : ''}
       ${activeDeadline?.deadline ? `<div class="detail-row"><span class="detail-label">${t('截止')}</span><span class="detail-value" style="color:${isOverdue ? '#dc2626' : '#6b7280'};font-size:12px">${fmtTime(activeDeadline.deadline)}</span></div>` : ''}
     </div>
-    ${order.payment_rail === 'direct_p2p' && window.dpOrderDisclosureHtml ? window.dpOrderDisclosureHtml(order) : ''}
+    ${order.payment_rail === 'direct_p2p' && isBuyer && window.dpOrderDisclosureHtml ? window.dpOrderDisclosureHtml(order) : ''}${window.dpReconcileCard ? window.dpReconcileCard(order, isSeller) : ''}${order.payment_rail === 'direct_p2p' && window.dpNegotiationCard ? window.dpNegotiationCard(order) : ''}${window.dpCancelRefundCard ? window.dpCancelRefundCard(order, isBuyer, isSeller) : ''}${window.dpPendingAcceptCard ? window.dpPendingAcceptCard(order, isBuyer, isSeller) : ''}${window.mutualCancelCard ? window.mutualCancelCard(order, isBuyer, isSeller) : ''}
 
     ${trackingHtml}
     ${disputeHtml}
@@ -12590,7 +12567,7 @@ async function renderOrderDetail(app, orderId) {
       <div class="action-title">${t('完整状态历史')}</div>
       <div class="timeline">${historyHtml || `<div style="color:#6b7280;font-size:13px">${t('暂无记录')}</div>`}</div>
     </div>
-  `, 'orders'); if (order.payment_rail === 'direct_p2p' && window.dpHydrateOrderDisclosure) window.dpHydrateOrderDisclosure(order.id)  // direct_p2p:最终 DOM 已就位,#dp-order-instr 必命中(both-acked→收款说明快照;否则 D1/D2 门;非买家→错误提示)。退货/评价 widget 注入各自子容器,不动此框
+  `, 'orders'); if (order.payment_rail === 'direct_p2p' && isBuyer && window.dpHydrateOrderDisclosure) window.dpHydrateOrderDisclosure(order.id)  // direct_p2p 买家:最终 DOM 已就位,#dp-order-instr 必命中(both-acked→收款说明快照;否则 D1/D2 门)。卡片与 hydrate 均 isBuyer 门(端点本就 NOT_ORDER_BUYER,非买家渲染只会得红色报错噪音)。退货/评价 widget 注入各自子容器,不动此框
 
   // Wave B-3: 退货 widget — 异步加载（仅 completed 订单可退）
   // 买家:有退货窗口可申请/查看;卖家:有退货申请时内联查看+处理(accept/reject/received),无申请则隐藏卡
@@ -13061,14 +13038,14 @@ async function renderReturnWidgetForOrder(order, product) {
     const events = detail?.timeline || []
     const item = detail?.item || mine
     const isBuyer = state.user && state.user.id === item.buyer_id
-    const STATUS_COLORS = { pending:'#d97706', accepted:'#16a34a', refunded:'#16a34a', rejected:'#dc2626', cancelled:'#6b7280', escalated:'#6b21a8' }
-    const STATUS_LABEL = () => ({ pending: t('待卖家处理'), accepted: t('已同意'), refunded: t('已退款'), rejected: t('已拒绝'), cancelled: t('已取消'), escalated: t('已升级仲裁') })
+    const STATUS_COLORS = { pending:'#d97706', accepted:'#16a34a', refunded:'#16a34a', rejected:'#dc2626', cancelled:'#6b7280', escalated:'#6b21a8', ...(window.dpReturnStatusColors ? window.dpReturnStatusColors() : {}) }
+    const STATUS_LABEL = () => ({ pending: t('待卖家处理'), accepted: t('已同意'), refunded: t('已退款'), rejected: t('已拒绝'), cancelled: t('已取消'), escalated: t('已升级仲裁'), ...(window.dpReturnStatusLabels ? window.dpReturnStatusLabels() : {}) })
 
     const isActive = !['refunded', 'cancelled', 'escalated'].includes(item.status)
     const canEscalate = isBuyer && (
       item.status === 'rejected' ||
-      (item.status === 'pending' && (Date.now() - new Date(item.created_at).getTime()) >= 7 * 86400 * 1000)
-    )
+      (item.status === 'pending' && (Date.now() - new Date(item.created_at).getTime()) >= 7 * 86400 * 1000) ||
+      (window.dpReturnCanEscalate ? window.dpReturnCanEscalate(item, order) : false))
 
     area.innerHTML = `
       <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:8px">
@@ -13078,11 +13055,11 @@ async function renderReturnWidgetForOrder(order, product) {
 
       ${isSellerView && item.status === 'pending' ? `
         <div style="display:flex;gap:8px;margin-bottom:8px">
-          <button class="btn btn-success btn-sm" style="flex:1;font-size:12px" onclick="decideReturn('${item.id}','accept','${order.id}')">${t('接受退款')}</button>
+          <button class="btn btn-success btn-sm" style="flex:1;font-size:12px" onclick="decideReturn('${item.id}','accept','${order.id}')">${order.payment_rail === 'direct_p2p' ? t('同意退货(场外退款)') : t('接受退款')}</button>
           <button class="btn btn-outline btn-sm" style="flex:1;font-size:12px;color:#dc2626;border-color:#fecaca" onclick="decideReturn('${item.id}','reject','${order.id}')">${t('拒绝退货')}</button>
         </div>` : ''}
       ${isSellerView && item.status === 'picked_up' ? `
-        <button class="btn btn-success btn-sm" style="width:100%;font-size:12px;margin-bottom:8px" onclick="confirmReturnReceived('${item.id}','${order.id}')">${t('✓ 已收到退货 · 触发退款')}</button>` : ''}
+        <button class="btn btn-success btn-sm" style="width:100%;font-size:12px;margin-bottom:8px" onclick="confirmReturnReceived('${item.id}','${order.id}')">${order.payment_rail === 'direct_p2p' ? '✓ ' + t('已收到退货') : t('✓ 已收到退货 · 触发退款')}</button>` : ''}${window.dpReturnHandshake ? window.dpReturnHandshake(item, isBuyer, isSellerView, order) : ''}
 
       <div style="padding:10px;background:#fafafa;border-radius:8px;margin-bottom:8px">
         <div style="font-size:11px;font-weight:600;color:#6b7280;margin-bottom:8px">🧾 ${t('协商时间线')} · ${events.length} ${t('条')}</div>
@@ -13099,8 +13076,8 @@ async function renderReturnWidgetForOrder(order, product) {
 
       ${canEscalate ? `
         <div style="margin-top:8px;padding:8px 10px;background:#fef2f2;border:1px solid #fecaca;border-radius:6px">
-          <div style="font-size:11px;color:#991b1b;margin-bottom:6px">${item.status === 'rejected' ? t('卖家已拒绝 — 如有异议可升级至平台仲裁') : t('卖家 7 天内未回应 — 可升级至平台仲裁')}</div>
-          <button class="btn btn-sm" style="background:#6b21a8;color:#fff;padding:5px 14px;font-size:11px" onclick="escalateReturn('${item.id}','${order.id}')">⚖️ ${t('升级至仲裁')}</button>
+          <div style="font-size:11px;color:#991b1b;margin-bottom:6px">${(window.dpReturnCanEscalate && window.dpReturnCanEscalate(item, order)) ? window.dpReturnEscalateHint(item) : item.status === 'rejected' ? t('卖家已拒绝 — 如有异议可升级至平台仲裁') : t('卖家 7 天内未回应 — 可升级至平台仲裁')}</div>
+          <button class="btn btn-sm" style="background:#6b21a8;color:#fff;padding:5px 14px;font-size:11px" onclick="escalateReturn('${item.id}','${order.id}','${order.payment_rail || ''}')">⚖️ ${t('升级至仲裁')}</button>
         </div>
       ` : ''}
     `
@@ -13114,7 +13091,7 @@ async function renderReturnWidgetForOrder(order, product) {
 
   area.innerHTML = `
     <div style="margin-bottom:8px">${t('退货窗口')}：${returnDays} ${t('天')} · ${remainText}</div>
-    <button class="btn btn-outline btn-sm" onclick="openReturnRequestModal('${order.id}', ${Number(order.total_amount)})">${t('申请退货')}</button>
+    <button class="btn btn-outline btn-sm" onclick="openReturnRequestModal('${order.id}', ${Number(order.total_amount)}, '${order.payment_rail === 'direct_p2p' ? 'USDC' : 'WAZ'}')">${t('申请退货')}</button>
   `
 }
 
@@ -13134,8 +13111,8 @@ window.sendReturnMessage = async (returnId, orderId) => {
   }
 }
 
-window.escalateReturn = async (returnId, orderId) => {
-  if (!confirm(t('确定升级到仲裁？协议会冻结卖家资产并指派仲裁员审核。'))) return
+window.escalateReturn = async (returnId, orderId, rail) => {
+  if (!confirm(rail === 'direct_p2p' ? t('确定升级到仲裁？直付订单为信誉裁决:仲裁不经手资金,按证据对卖家作信誉处罚。') : t('确定升级到仲裁？协议会冻结卖家资产并指派仲裁员审核。'))) return
   const res = await POST(`/return-requests/${returnId}/escalate`, {})
   if (res.error) return toast$(res.error, 'error')
   toast$(t('已升级仲裁'), 'success')
@@ -13286,18 +13263,21 @@ window.toggleOrderAddrEdit = (expand) => {
   }
 }
 
-// Wave G-5: WAZ → USD 近似（用 USDC peg）显示
-function wazToUsd(waz) {
-  const rate = Number(state._wazUsdcRate || 1)
-  if (rate <= 0) return null
-  return Number(waz) / rate  // 1 USDC ≈ 1 USD
-}
-// 渲染 ≈ $X.XX 小字（默认 buyer / 全局，可选 hidePrefix）
-function usdHint(waz, opts = {}) {
-  const usd = wazToUsd(waz)
-  if (usd == null || !Number.isFinite(usd)) return ''
-  const txt = `≈ $${usd.toFixed(2)}`
-  return `<span style="font-size:10px;color:#9ca3af;margin-left:4px;font-weight:400">${txt}</span>`
+// 订单金额显示(RFC-014 USDC 计价):escrow → USDC + 买家本地币参考(fmtPrice,纯展示,无真实托管);
+//   direct_p2p → USDC + 【买家下单时所选卖家收款账户币种】的应付额(dpFxInCurrency,不是本地币——买家只能按卖家
+//   支持的币种付款)。币种取自账号快照(currency 属非敏感元数据,pre-ack 也可见;仅 instruction/qr 受披露门)。
+//   该币种无汇率 → dpFxInCurrency 回落币种码,绝不臆造换算。
+window.orderAmountHtml = (o) => {
+  const usdc = Number(o && o.total_amount)
+  if (o && o.payment_rail === 'direct_p2p') {
+    let cur = ''
+    try { cur = String(JSON.parse(o.direct_pay_account_snapshot || '{}').currency || '').toUpperCase() } catch {}
+    const base = `${Number.isFinite(usdc) ? (Number.isInteger(usdc) ? usdc : usdc.toFixed(2)) : '—'} USDC`
+    if (!cur || cur === 'USDC' || cur === 'USD') return window.fmtPrice(usdc)  // USDC 账户:USDC + 买家本地法币参考(fmtPrice)
+    const pay = window.dpFxInCurrency ? window.dpFxInCurrency(usdc, cur) : cur
+    return `${base} <span style="font-size:10px;color:#9ca3af;margin-left:4px;font-weight:400">${t('应付')} ≈ ${pay}</span>`
+  }
+  return window.fmtPrice(usdc)
 }
 
 // Wave C-1: 规格格式化（订单详情 / 列表用）
@@ -13350,7 +13330,7 @@ function RETURN_REASON_LABEL() {
   }
 }
 
-window.openReturnRequestModal = (orderId, total) => {
+window.openReturnRequestModal = (orderId, total, cur = 'WAZ') => {
   const labels = RETURN_REASON_LABEL()
   const html = `
     <div class="js-modal" style="background:rgba(0,0,0,0.6);position:fixed;inset:0;z-index:1000;display:flex;align-items:flex-end;justify-content:center" onclick="this.remove()">
@@ -13367,9 +13347,9 @@ window.openReturnRequestModal = (orderId, total) => {
           <textarea class="form-control" id="ret-text" rows="3" maxlength="500" placeholder="${t('描述问题（可选，便于卖家判断）')}"></textarea>
         </div>
         <div class="form-group">
-          <label class="form-label">${t('退款金额')} (WAZ) *</label>
+          <label class="form-label">${t('退款金额')} (${cur}) *</label>
           <input class="form-control" id="ret-amount" type="number" min="0.01" max="${total}" step="0.01" value="${total}">
-          <div style="font-size:11px;color:#9ca3af;margin-top:2px">${t('订单总额')}: ${total} WAZ · ${t('可申请部分退款')}</div>
+          <div style="font-size:11px;color:#9ca3af;margin-top:2px">${t('订单总额')}: ${total} ${cur} · ${t('可申请部分退款')}${cur === 'USDC' ? ' · ' + t('直付退款在协议外完成,金额为参考') : ''}</div>
         </div>
         <div class="form-group" style="background:#f0fdf4;border:1px solid #86efac;border-radius:8px;padding:10px 12px">
           <label style="display:flex;align-items:flex-start;gap:8px;font-size:12px;color:#166534;cursor:pointer">
@@ -13424,13 +13404,14 @@ function getActions(order, isBuyer, isSeller, isLogistic) {
   // 直付(direct_p2p):买家在 direct_pay_window 标记"我已付款"(Passkey 门) 或取消(不门控);其余阶段沿用通用规则
   if (order.payment_rail === 'direct_p2p' && isBuyer && s === 'direct_pay_window')
     return [{ action: 'mark_paid', label: '✅ 我已付款', style: 'success' }, { action: 'cancel', label: '取消订单', style: 'secondary' }]
+  if (order.payment_rail === 'direct_p2p' && window.dpNegotiationActions) { const _na = window.dpNegotiationActions(order, isBuyer, isSeller); if (_na) return _na }  // 货款协商(payment_query/disputed)动作
   // M8 面交订单：买家在 paid / accepted 都可"面交完成"直接结算
   if (isInPerson && isBuyer && (s === 'paid' || s === 'accepted'))
     return [{ action: 'confirm_in_person', label: '🤝 面交完成 / 确认收货', style: 'success' }]
   if (isSeller && s === 'paid')
     return [{ action: 'accept', label: '接单', style: 'success' }, { action: 'decline', label: '拒绝接单', style: 'danger', custom: 'decline' }]
   if (isSeller && s === 'accepted' && !isInPerson)
-    return [{ action: 'ship', label: '确认发货', style: 'success', logisticsSelector: true, trackingInput: true, evidencePlaceholder: '包装状态描述 / 货物说明（可选）' }]
+    return [{ action: 'ship', label: '确认发货', style: 'success', logisticsSelector: true, trackingInput: true, evidencePlaceholder: '包装状态描述 / 货物说明（可选）' }, ...(order.payment_rail === 'direct_p2p' ? [{ action: 'report_nonpayment', label: '未收到货款(告知买家核实)', style: 'danger' }] : [])]
   if (isSeller && s === 'accepted' && isInPerson)
     return [{ action: 'noop_in_person', label: '🤝 面交中（等待买家确认）', style: 'secondary', disabled: true }]
   if ((isLogistic || isSelfFulfillSeller) && s === 'shipped')
@@ -13440,7 +13421,7 @@ function getActions(order, isBuyer, isSeller, isLogistic) {
   if ((isLogistic || isSelfFulfillSeller) && s === 'in_transit')
     return [{ action: 'deliver', label: '📬 确认投递', style: 'success', needsEvidence: true, noteLabel: '投递凭证', evidencePlaceholder: '门牌照片描述 / 收件人姓名 / 签收时间', helperText: isSelfFulfillSeller ? '自履约投递需留存签收/门牌/交付说明，买家确认后才结算。' : '' }]
   if (isBuyer && s === 'delivered')
-    return [{ action: 'confirm', label: '确认收货', style: 'success' }, { action: 'dispute', label: '发起争议', style: 'danger', needsEvidence: true, noteLabel: '争议理由', evidencePlaceholder: '描述问题（货不对版/货损/未收到等）' }]
+    return [{ action: 'confirm', label: '确认收货', style: 'success' }, { action: 'dispute', label: '未收到货 / 有问题？', style: 'danger', needsEvidence: true, noteLabel: '争议理由', evidencePlaceholder: '描述问题（未收到 / 货不对版 / 货损等）', helperText: '未收到货？可先联系卖家核实（可能晚到或放了代收点）。确认异常再提交 —— 发起争议后自动确认将暂停，不会因超时被视为已收货。' }]
   return null
 }
 
@@ -13503,7 +13484,7 @@ window.handleAction = async (orderId, action, idx, needsEvidence, hasLogisticsSe
     if (!confirm(t('确认已收到物品？escrow 将立即释放给卖家，无法撤销。'))) return
     msgEl.innerHTML = `<div class="alert alert-info"><span class="spinner"></span>${t('确认中...')}</div>`
     const res = await POST(`/orders/${orderId}/confirm-in-person`, {})
-    if (res.error) { msgEl.innerHTML = alert$('error', res.error); return }
+    if (res.error) { msgEl.innerHTML = alert$('error', window.orderErrorText ? window.orderErrorText(res.error_code, res.error) : res.error); return }
     msgEl.innerHTML = alert$('success', t('面交完成 — escrow 已释放'))
     maybeThankSponsorAndClear()
     setTimeout(() => renderOrderDetail(document.getElementById('app'), orderId), 1000)
@@ -13511,7 +13492,7 @@ window.handleAction = async (orderId, action, idx, needsEvidence, hasLogisticsSe
   }
   if (action === 'noop_in_person') return
   const confirmText = {
-    ship: t('确认已经发货？发货后买家将看到物流信息，超时/虚假发货可能进入争议或判责。'),
+    ship: (window._dpOrderRail === 'direct_p2p' && window.dpPayRef) ? `${t('直付订单:发货前请核实货款已到账 —— 银行流水附言应为')} ${window.dpPayRef(orderId)}${t('(同买家同金额多单务必逐单核对参考号)。发货即视为你确认已收到货款;发货后不可再报告未收款,只能走争议。')}` : t('确认已经发货？发货后买家将看到物流信息，超时/虚假发货可能进入争议或判责。'),
     pickup: t('确认已揽收并回传凭证？请确保单号或揽收说明真实可追踪。'),
     deliver: t('确认已投递？请确保投递凭证真实，买家仍需确认收货后才结算。'),
     confirm: t('确认收货？escrow 将进入结算流程，无法撤销。'),
@@ -13560,7 +13541,7 @@ window.handleAction = async (orderId, action, idx, needsEvidence, hasLogisticsSe
 
   const res = await POST(`/orders/${orderId}/action`, body)
   if (res.error) {
-    msgEl.innerHTML = alert$('error', res.error)
+    msgEl.innerHTML = alert$('error', window.orderErrorText ? window.orderErrorText(res.error_code, res.error) : res.error)
   } else {
     msgEl.innerHTML = alert$('success', t('操作成功！'))
     // S8: confirm action 触发 completed → 检查是否首单，若是则致谢 + 清 ctx
@@ -13828,8 +13809,8 @@ function buildTimelineEvent(ev, dispute, user, actors) {
   const isMe = user && actor && actor.id === user.id
   // 当无 actor（如 system resolved 事件），不重复显示与 role chip 相同的名字
   const actorLabel = actor
-    ? (actor.handle ? '@' + escHtml(actor.handle) : escHtml(actor.name))
-    : ''
+    ? (actor.name ? escHtml(actor.name) : (actor.handle ? '@' + escHtml(actor.handle) : ''))
+    : ''   // 走查批次3:昵称优先(自动生成的 @handle 可读性差;上方 party chips 本就用昵称,对齐)
 
   // 内容主体 — 按 type 分支
   let bodyHtml = ''
@@ -13876,14 +13857,14 @@ function buildTimelineEvent(ev, dispute, user, actors) {
   } else if (ev.type === 'ruling' || ev.type === 'resolved') {
     const meta = ev.meta || {}
     const rulingLabel = meta.ruling || meta.ruling_type
-    const rulingText = rulingLabel ? t(RULING_LABELS[rulingLabel] || rulingLabel) : ''
+    const rulingText = rulingLabel ? ((dispute.payment_rail === 'direct_p2p' && window.dpRulingLabel && window.dpRulingLabel(rulingLabel)) || t(RULING_LABELS[rulingLabel] || rulingLabel)) : ''
     let liability = []
     try { liability = typeof meta.liability_parties === 'string' ? JSON.parse(meta.liability_parties) : (meta.liability_parties || []) } catch {}
     bodyHtml = `
       ${rulingText ? `<div style="font-weight:700;font-size:14px;color:${typeMeta.border};margin-bottom:4px">${t(rulingText)}</div>` : ''}
       ${ev.body ? `<div style="font-size:13px;line-height:1.5;white-space:pre-wrap;color:#374151">${escHtml(ev.body)}</div>` : ''}
-      ${meta.refund_amount != null ? `<div style="font-size:12px;margin-top:6px">💸 ${t('退款金额')}：<strong>${meta.refund_amount} WAZ</strong></div>` : ''}
-      ${liability.length > 0 ? `<div style="margin-top:6px">
+      ${dispute.payment_rail !== 'direct_p2p' && meta.refund_amount != null ? `<div style="font-size:12px;margin-top:6px">💸 ${t('退款金额')}：<strong>${meta.refund_amount} WAZ</strong></div>` : ''}
+      ${dispute.payment_rail !== 'direct_p2p' && liability.length > 0 ? `<div style="margin-top:6px">
         <div style="font-size:11px;color:#6b7280;margin-bottom:2px">${t('责任分配')}：</div>
         ${liability.map(lp => `<div style="font-size:12px;margin-top:2px">${(TL_ROLE_META[lp.role]||TL_ROLE_META.unknown).icon} ${t(lp.role)} ${t('承担')} ${lp.amount} WAZ${lp.insurance_cap!=null?` (${t('保险上限')} ${lp.insurance_cap})`:''}</div>`).join('')}
       </div>` : ''}`
@@ -13928,7 +13909,7 @@ function buildDisputeTimelineSection(dispute, user) {
 
 function buildDisputeHtml(dispute, user) {
   const isDefendant  = user && user.id === dispute.defendant_id
-  const isArbitrator = user && user.role === 'arbitrator'
+  const isArbitrator = !!state.canArbitrate  // PR-E:跟随后端 can_arbitrate(active whitelist),非 user.role;后端 COI/assign 才是边界
   // is_party is set by the server; fallback to local check
   const isParty = dispute.is_party || (user && dispute.parties && dispute.parties.some(p => p.id === user.id))
   const parties = dispute.parties || []
@@ -14072,20 +14053,13 @@ function buildDisputeHtml(dispute, user) {
   const arbitrateSection = isArbitrator && (dispute.status === 'open' || dispute.status === 'in_review') ? `
     <div style="margin-top:12px;border-top:1px solid #fecaca;padding-top:12px">
       <div style="font-weight:600;font-size:13px;margin-bottom:8px">⚖️ 仲裁员裁定（截止 ${fmtTime(dispute.arbitrate_deadline)}）</div>
-      <div style="font-size:12px;color:#92400e;background:#fffbeb;border:1px solid #fcd34d;border-radius:6px;padding:6px 10px;margin-bottom:8px">
-        💰 败诉方须缴纳仲裁费：订单金额 × 1%（最低 1 WAZ）。部分退款时双方各付 0.5%。仲裁费 50% 归仲裁员，50% 归协议。
-      </div>
-      <div id="arbitrate-msg"></div>
+      ${window.dpArbFeeNote ? window.dpArbFeeNote(dispute.payment_rail) : ''}
+      <input type="hidden" id="arb-rail" value="${dispute.payment_rail || ''}"><div id="arbitrate-msg"></div>
 
       <div class="form-group" style="margin-bottom:10px">
         <label style="font-size:12px;color:#6b7280;display:block;margin-bottom:4px">裁定方式</label>
         <div style="display:flex;flex-direction:column;gap:6px">
-          ${[
-            ['refund_buyer',    '🔵 全额退款买家（买家胜诉，卖家承担）'],
-            ['release_seller',  '🟢 资金释放给卖家（卖家胜诉）'],
-            ['partial_refund',  '🟡 部分退款（折中，需填金额）'],
-            ['liability_split', '⚖️ 责任分配（指定各方赔付额）'],
-          ].map(([val, label]) => `
+          ${(window.dpArbRulingOptions ? window.dpArbRulingOptions(dispute.payment_rail, dispute.can_dismiss_to_negotiation) : []).map(([val, label]) => `
             <label style="display:flex;align-items:center;gap:8px;font-size:13px;cursor:pointer;padding:8px;background:#f9fafb;border-radius:6px">
               <input type="radio" name="arb-ruling-radio" value="${val}" onclick="onArbRulingChange('${val}')"> ${label}
             </label>`).join('')}
@@ -14334,14 +14308,15 @@ window.handleArbitrate = async (disputeId) => {
   if (!reason) { msgEl.innerHTML = alert$('error', t('请填写裁定理由')); return }
 
   let body = { ruling, reason }
+  const nc = document.getElementById('arb-rail')?.value === 'direct_p2p'   // 直付:仅信誉裁决 → 不读/不发任何退款/赔付金额
 
-  if (ruling === 'partial_refund') {
+  if (!nc && ruling === 'partial_refund') {
     const amount = document.getElementById('arb-amount')?.value
     if (!amount) { msgEl.innerHTML = alert$('error', t('部分退款需填写退款金额')); return }
     body = { ...body, refund_amount: Number(amount) }
   }
 
-  if (ruling === 'liability_split') {
+  if (!nc && ruling === 'liability_split') {
     const liabilityParties = []
     let totalCalc = 0
     for (const chk of document.querySelectorAll('.arb-liable-chk:checked')) {
@@ -14367,8 +14342,8 @@ window.handleArbitrate = async (disputeId) => {
     body = { ...body, liability_parties: liabilityParties, refund_amount: totalCalc }
   }
 
-  msgEl.innerHTML = `<div class="alert alert-info"><span class="spinner"></span>${t('裁定中...')}</div>`
-  const res = await POST(`/disputes/${disputeId}/arbitrate`, body)
+  let _arbTk; try { _arbTk = await requestPasskeyGate('arbitrate', { dispute_id: disputeId }) } catch (e) { msgEl.innerHTML = alert$('error', (e && e.message ? e.message + ' — ' : '') + t('仲裁裁定需现场真人 Passkey 验证')); return }; msgEl.innerHTML = `<div class="alert alert-info"><span class="spinner"></span>${t('裁定中...')}</div>`  // 所有 ruling(含驳回)先取 arbitrate gate token
+  const res = await POST(`/disputes/${disputeId}/arbitrate`, { ...body, webauthn_token: _arbTk })
   if (res.error) { msgEl.innerHTML = alert$('error', res.error); return }
 
   // 显示仲裁费明细
@@ -14381,10 +14356,11 @@ window.handleArbitrate = async (disputeId) => {
 
 // 裁定方式切换 → 控制相关输入框显隐
 window.onArbRulingChange = (ruling) => {
+  const nc = document.getElementById('arb-rail')?.value === 'direct_p2p'   // 直付:无金额/无赔付 → 两个金额区块永不出现
   const partialRow = document.getElementById('arb-partial-row')
   const liabilityBlock = document.getElementById('arb-liability-block')
-  if (partialRow) partialRow.style.display = ruling === 'partial_refund' ? '' : 'none'
-  if (liabilityBlock) liabilityBlock.style.display = ruling === 'liability_split' ? '' : 'none'
+  if (partialRow) partialRow.style.display = (!nc && ruling === 'partial_refund') ? '' : 'none'
+  if (liabilityBlock) liabilityBlock.style.display = (!nc && ruling === 'liability_split') ? '' : 'none'
 }
 
 // 责任分配：勾选责任方时启用金额输入框，并实时计算合计
@@ -14567,7 +14543,7 @@ async function hydrateSimilarCases(disputeId) {
 
 async function renderDisputeList(app) {
   if (!state.user) { renderLogin(); return }
-  if (state.user.role !== 'arbitrator') {
+  if (!state.canArbitrate) {  // PR-E:跟随后端 can_arbitrate(active whitelist),whitelist-only(role=buyer)真人仲裁员也能进
     app.innerHTML = shell(`
       <h1 class="page-title">${t('争议仲裁台')}</h1>
       <div class="alert alert-info">${t('此功能仅限仲裁员使用。')}<br>${t('你的角色')}：${state.user.role}</div>
@@ -14757,7 +14733,7 @@ async function renderLogistics(app) {
         <div style="flex:1;min-width:0">
           <div style="font-size:13px;font-weight:600;white-space:nowrap;overflow:hidden;text-overflow:ellipsis">${escHtml(o.product_title)}${windowChip}</div>
           ${o.shipping_address ? `<div style="font-size:11px;color:#6b7280;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin-top:2px">📍 ${escHtml(o.shipping_address)}</div>` : ''}
-          <div style="font-size:10px;color:${urgent ? '#dc2626' : '#9ca3af'};margin-top:2px${urgent ? ';font-weight:600' : ''}">${o.total_amount} WAZ · ${o.ship_deadline ? `${urgent ? '⚠ ' : ''}${t('截止')} ${fmtTime(o.ship_deadline)}` : fmtTime(o.created_at)}</div>
+          <div style="font-size:10px;color:${urgent ? '#dc2626' : '#9ca3af'};margin-top:2px${urgent ? ';font-weight:600' : ''}">${window.orderAmountHtml(o)} · ${o.ship_deadline ? `${urgent ? '⚠ ' : ''}${t('截止')} ${fmtTime(o.ship_deadline)}` : fmtTime(o.created_at)}</div>
         </div>
         ${act ? `<div style="font-size:11px;color:#065f46;font-weight:600;flex-shrink:0;white-space:nowrap">${act.short} →</div>` : ''}
       </div>
@@ -14977,7 +14953,7 @@ function renderInsightsBlock(d) {
       <div class="card" style="padding:12px">
         <div style="font-size:10px;color:#9ca3af;text-transform:uppercase">${t('30 天 GMV')}</div>
         <div style="font-size:18px;font-weight:800;color:#15803d;margin-top:2px">${Number(s.gmv||0).toFixed(0)} <span style="font-size:11px;font-weight:600;color:#6b7280">WAZ</span></div>
-        <div style="font-size:10px;color:#6b7280;margin-top:2px">${deltaChip(vs.gmv_pct||0, t('环比'))}</div>
+        <div style="font-size:10px;color:#6b7280;margin-top:2px">${deltaChip(vs.gmv_pct||0, t('环比'))}</div>${window.gmvRailSplitHtml ? window.gmvRailSplitHtml(s.gmv_escrow, s.gmv_direct_pay) : ''}
       </div>
       <div class="card" style="padding:12px">
         <div style="font-size:10px;color:#9ca3af;text-transform:uppercase">${t('30 天订单')}</div>
@@ -15300,7 +15276,7 @@ async function renderSeller(app) {
             <div class="order-meta">${fmtTime(o.created_at)}</div>
             <div style="margin-top:6px">${orderStatusBadges(o)}</div>
           </div>
-          <div class="order-amount">${o.total_amount} WAZ</div>
+          <div class="order-amount">${window.orderAmountHtml(o)}</div>
         </div>
       </div>`).join('')
   const acceptHtml = paidOrders.length === 0
@@ -15509,7 +15485,7 @@ async function renderSeller(app) {
       ${subTabBtn('settings', '⚙️ ' + t('设置'))}
     </div>
   `
-  const settingsSection = sellerSubTab === 'settings' ? ((window.dpSellerReadinessSection ? window.dpSellerReadinessSection() : '') + (window.dpSellerFeeSection ? window.dpSellerFeeSection() : '') + (window.dpSellerDeferralSection ? window.dpSellerDeferralSection() : '') + (window.dpSellerProductVerifySection ? window.dpSellerProductVerifySection() : '') + (window.dpSellerStoreVerifySection ? window.dpSellerStoreVerifySection() : '') + (window.dpSellerInstructionSection ? window.dpSellerInstructionSection() : '') + (window.draAccountsSection ? window.draAccountsSection() : '')) : ''
+  const settingsSection = sellerSubTab === 'settings' ? ((window.dpSellerReadinessSection ? window.dpSellerReadinessSection() : '') + (window.dpSellerFeeSection ? window.dpSellerFeeSection() : '') + (window.dpSalesReportSection ? window.dpSalesReportSection() : '') + (window.dpFeeRequestSection ? window.dpFeeRequestSection() : '') + (window.dpSellerDeferralSection ? window.dpSellerDeferralSection() : '') + (window.dpSellerProductVerifySection ? window.dpSellerProductVerifySection() : '') + (window.dpSellerStoreVerifySection ? window.dpSellerStoreVerifySection() : '') + (window.dpSellerInstructionSection ? window.dpSellerInstructionSection() : '') + (window.draAccountsSection ? window.draAccountsSection() : '') + (window.shipSellerSettingsSection ? window.shipSellerSettingsSection() : '') + (window.bondSellerSection ? window.bondSellerSection() : '')) : ''
 
   // 数据中心区块（30 天聚合 — 销售曲线 / Top 商品 / 客户洞察 / 状态分布）
   const insightsBlock = insights ? renderInsightsBlock(insights) : ''
@@ -15561,6 +15537,7 @@ async function renderSeller(app) {
         <div style="font-weight:600;font-size:13px;color:#1e40af;margin-top:6px">${t('普通上架')}</div>
         <div style="font-size:10px;color:#1d4ed8;margin-top:2px">${t('标准商品 · 即买即发')}</div>
       </div>
+      ${window.freeShippingMarketingCard ? window.freeShippingMarketingCard() : ''}
       <div onclick="location.hash='#seller-trials'" class="card" style="padding:14px;cursor:pointer;background:linear-gradient(135deg,#faf5ff,#fdf2f8);border-color:#ddd6fe">
         <div style="font-size:24px">🎁</div>
         <div style="font-weight:600;font-size:13px;color:#6b21a8;margin-top:6px">${t('测评免单活动')}</div>
@@ -15572,8 +15549,7 @@ async function renderSeller(app) {
   const skillsSection = sellerSubTab === 'skills' ? `
     <div style="font-size:12px;color:#6b7280;margin-bottom:10px">${t('Skill 自动化 · 让 Agent 替你接单/报价/发货')}</div>
   ` : ''
-  // 注:Skill 真实内容由下方 #my-skills-list 同步渲染(mySkills 已同步就绪);
-  //    此前这里有个 #skill-mgmt-content loading$() 占位但全文件无人填充 → spinner 永转,已删除。
+  // 注:Skill 真实内容由下方 #my-skills-list 同步渲染(mySkills 已同步就绪);此前 #skill-mgmt-content loading$() 占位无人填充 → spinner 永转,已删除。
 
   const productsSection = sellerSubTab === 'products' ? `
     <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px">
@@ -15751,7 +15727,7 @@ async function renderSeller(app) {
             <input type="checkbox" id="prd-fragile" style="width:16px;height:16px">
             <label for="prd-fragile" style="font-size:13px">${t('易碎品，需特殊包装')}</label>
           </div>
-        </details>
+        </details>${window.listingCommerceSectionHtml ? window.listingCommerceSectionHtml(null) : ''}
         <div style="display:flex;gap:8px;align-items:center;margin-bottom:12px"><label class="form-label" style="margin:0;font-size:13px">${t('低库存阈值')}</label><input class="form-control" id="prd-low-stock" type="number" value="3" min="0" style="width:90px"><input type="checkbox" id="prd-auto-delist" checked style="width:16px;height:16px"><label for="prd-auto-delist" style="font-size:13px">${t('售罄自动下架')}</label></div>
         <!-- 2026-05-24 #981：测评免单 (Trial Review Refund) -->
         <details style="margin-bottom:16px" id="prd-trial-section">
@@ -15844,7 +15820,7 @@ async function renderSeller(app) {
       </div>
     </div>
   `, 'seller')
-  if (sellerSubTab === 'settings') { window.dpHydrateInstruction && window.dpHydrateInstruction(); window.dpHydrateSellerReadiness && window.dpHydrateSellerReadiness(); window.dpHydrateSellerFee && window.dpHydrateSellerFee(); window.dpHydrateSellerDeferral && window.dpHydrateSellerDeferral(); window.dpHydrateSellerProductVerify && window.dpHydrateSellerProductVerify(); window.dpHydrateSellerStoreVerify && window.dpHydrateSellerStoreVerify(); window.draHydrateAccounts && window.draHydrateAccounts() }
+  if (sellerSubTab === 'settings') { window.dpHydrateInstruction && window.dpHydrateInstruction(); window.dpHydrateSellerReadiness && window.dpHydrateSellerReadiness(); window.dpHydrateSellerFee && window.dpHydrateSellerFee(); window.dpHydrateSalesReport && window.dpHydrateSalesReport(); window.dpHydrateFeeRequest && window.dpHydrateFeeRequest(); window.dpHydrateSellerDeferral && window.dpHydrateSellerDeferral(); window.dpHydrateSellerProductVerify && window.dpHydrateSellerProductVerify(); window.dpHydrateSellerStoreVerify && window.dpHydrateSellerStoreVerify(); window.draHydrateAccounts && window.draHydrateAccounts(); window.shipHydrateSellerSettings && window.shipHydrateSellerSettings(); window.bondHydrateSeller && window.bondHydrateSeller() }
 
   // 智能下单"我也要上架"跳过来时：自动切到商品 tab + 展开手工上架表单 + 预填标题
   // hashchange 可能多次触发 renderSeller — 用 window cache 保证每次重渲都能应用
@@ -16144,10 +16120,10 @@ window.doAddProduct = async () => {
     commission_rate: commissionPct / 100,
     ...(extTitle ? { external_title: extTitle } : {}),
     ...(checkedAliases.length ? { aliases: checkedAliases } : {}),
-    ...(state._addProductImgs?.length ? { image_hashes: state._addProductImgs.map(it => it.hash) } : {}),
+    ...(state._addProductImgs?.length ? { image_hashes: state._addProductImgs.map(it => it.hash) } : {}), ...(window.listingCommerceHasOverrides && window.listingCommerceHasOverrides() ? { create_status: 'warehouse' } : {}),   // S4:含覆盖的新品先落仓库,全落定后激活
   }
   const res = await POST('/products', payload)
-  if (res.error) { msgEl.innerHTML = alert$('error', res.error); return }
+  if (res.error) { msgEl.innerHTML = alert$('error', res.error); return } if (res.product_id && window.listingCommerceSave) { const lc = await window.listingCommerceSave(res.product_id, { activate: payload.create_status === 'warehouse' }); if (!lc.ok) { msgEl.innerHTML = alert$('error', (payload.create_status === 'warehouse' ? t('商品已存为仓库(未公开),配送/税费设置失败,请到「我的商品」编辑修复后上架:') : t('单品配送/税费设置失败:')) + lc.error); return } }
 
   // 产品创建成功 → 把每张图的 blob 存到本地 IDB + 注册 manifest（带 thumbnail）
   // 服务端只拿到了 hash 数组；blob 字节留在卖家节点
@@ -16697,7 +16673,7 @@ async function renderEditProduct(app, productId) {
             <label for="ep-fragile" style="font-size:13px">${t('易碎品，需特殊包装')}</label>
           </div>
         </div>
-      </details>
+      </details>${window.listingCommerceSectionHtml ? window.listingCommerceSectionHtml(p) : ''}
       <button class="btn btn-primary" onclick="doUpdateProduct('${productId}')">${t('保存修改')}</button>
     </div>
 
@@ -16882,7 +16858,7 @@ window.doUpdateProduct = async (productId) => {
     body: JSON.stringify(payload),
   }).then(r => r.json())
   if (btn) { btn.disabled = false; btn.textContent = t('保存修改') }
-  if (res.error) { msgEl.innerHTML = alert$('error', res.error); return }
+  if (res.error) { msgEl.innerHTML = alert$('error', res.error); return } if (window.listingCommerceSave) { const lc = await window.listingCommerceSave(productId); if (!lc.ok) { msgEl.innerHTML = alert$('error', t('单品配送/税费设置失败:') + lc.error); return } }   // S4 单品覆盖
   msgEl.innerHTML = alert$('success', t('已保存'))
   setTimeout(() => msgEl.innerHTML = '', 2000)
 }
@@ -17110,7 +17086,7 @@ async function p2pConnectTo(peerId) {
 
   const offer = await pc.createOffer()
   await pc.setLocalDescription(offer)
-  await POST('/signaling/send', { to: peerId, type: 'offer', data: offer })
+  await POST('/signaling/send', { to: peerId, type: 'offer', data: offer }); if (window.pollBoost) pollBoost()   // 主动建 P2P 会话 → 握手期间信令保持 3s
   return entry
 }
 
@@ -17294,8 +17270,8 @@ async function p2pStart() {
   p2pStop()
   await p2pHeartbeatTick()
   await p2pSignalingTick()
-  _heartbeatTimer = setInterval(p2pHeartbeatTick, 60_000)
-  _signalingTimer = setInterval(p2pSignalingTick, 3_000)
+  _heartbeatTimer = setInterval(() => { if (!document.hidden) p2pHeartbeatTick() }, 60_000)   // 后台/锁屏暂停(poll-governor)
+  _signalingTimer = setInterval(() => { if (!window.pollGate || window.pollGate('signaling')) p2pSignalingTick() }, 3_000); window._p2pSigTick = p2pSignalingTick   // 按需化:governor 定 3s/60s 节奏+后台暂停(缺 governor fail-open 维持 3s);_p2pSigTick 供回前台补拉
 }
 
 function p2pStop() {
@@ -17336,7 +17312,7 @@ window.p2pUnpinContent = async (hash) => {
 async function p2pSignalingTick() {
   if (!state.user) return
   try {
-    const data = await GET('/signaling/poll')
+    const data = await GET('/signaling/poll'); if (window.pollActivity) pollActivity('signaling', (data.signals || []).length)   // 有信令进来 → governor 恢复 3s 快节奏
     for (const s of (data.signals || [])) {
       try { await p2pHandleSignal(s) } catch (e) { console.warn('[P2P] signal handle err', e) }
     }
@@ -17699,7 +17675,7 @@ async function renderVerifyTasks(app) {
   // ── Verifier 状态 banner（依据 /verifier/status） ─────────────
   const vState = vStatus?.state || 'none'
   let verifierBanner = ''
-  if (vState === 'none') {
+  if (vState === 'none' && state.user?.role !== 'verifier' && !(state.user?.roles || []).includes('verifier')) {   // 已是审核员(role 直授,无申请记录)不再邀请"申请审核员资格"(走查:身份矛盾卡)
     verifierBanner = `
       <div class="card" style="margin-bottom:16px;background:linear-gradient(135deg,#f5f3ff,#fce7f3);border-color:#c4b5fd">
         <div style="font-size:15px;font-weight:600;margin-bottom:6px">🛡 ${t('申请审核员资格')}</div>
@@ -18788,10 +18764,10 @@ function connectSSE() {
     if (data.type === 'init') {
       updateBadge(data.unread)
     } else {
-      // 实时推送：更新角标 + 显示 toast
+      // 实时推送：更新角标 + 显示 toast(N1:模板通知按 viewer locale 渲染,旧推送回退原文)
       state.unread++
       updateBadge(state.unread)
-      showToast(data.title, data.body)
+      const _tn = window.notifRender ? window.notifRender(data) : data; showToast(_tn.title, _tn.body)
     }
   }
   state.sse.onerror = () => {
@@ -21518,9 +21494,9 @@ async function renderMessages(app, deepSub) {
     }
     body = notifications.length === 0
       ? `<div style="text-align:center;color:#9ca3af;padding:40px 0;font-size:13px">🔔 ${t('暂无通知')}</div>`
-      : notifications.map(n => {
-          let actions = []
-          try { actions = n.actions ? JSON.parse(n.actions) : [] } catch {}
+      : notifications.map(nRaw => {
+          const n = window.notifRender ? window.notifRender(nRaw) : nRaw   // N1:template_key → viewer locale 渲染;旧行回退存量 title/body
+          let actions = []; try { actions = n.actions ? JSON.parse(n.actions) : [] } catch {}
           const route = routeFor(n)
           const hasActions = Array.isArray(actions) && actions.length > 0
           // 卡片 onclick：仅当无 actions 时整卡可点（兼容旧 notif）
@@ -22913,11 +22889,8 @@ async function renderAdminProtocol(app) {
       ${adminLinkCard('🏦', t('慈善基金拨款'), t('从基金池拨款给指定用户'), '#admin/fund-disburse')}
       ${adminLinkCard('📜', t('审计日志'), t('全部 admin 写操作'), '#admin/audit')}
       ${adminLinkCard('🛑', t('错误监控'), t('24h 趋势 + burst 告警'), '#admin/errors')}
-      ${adminLinkCard('📨', t('Welcome 提交'), t('#welcome 留下的邮箱订阅 + 建议'), '#admin/public-ideas')}
-      ${adminLinkCard('🛠️', t('任务建议收件箱'), t('陌生人 / agent 提交的共建任务建议;审阅 → 转正式任务'), '#admin/task-proposals')}
-      ${((state.user && state.user.admin_type || 'root') === 'root') ? adminLinkCard('🎟️', t('建任务额度审核'), t('非根管理员的建任务扩容申请;批准 = 限时计数授权(仅 root)'), '#admin/quota-requests') : ''}
-      ${adminLinkCard('🔗', t('关联个人贡献账号'), t('把本管理席位的协调贡献归属到你的真实个人账号(需对方确认 + root 审批)'), '#me/operator-claims')}
-      ${((state.user && state.user.admin_type || 'root') === 'root') ? adminLinkCard('🪪', t('操作席位关联审批'), t('管理席位→个人贡献账号的关联申请;确认 + 审批 / 撤销(仅 root)'), '#admin/operator-claims') : ''}${((state.user && state.user.admin_type || 'root') === 'root') ? adminLinkCard('💳', t('Direct Pay 商户运营'), t('直付:合规录入 / 缓交 / 商品·店铺验证 / 平台服务费预充值 / 上线控制(仅 root)'), '#admin/dp-ops') : ''}
+      ${adminLinkCard('🌱', t('共建运营'), t('共建任务建议 / Welcome 提交 / 建任务额度 / 贡献账号关联'), '#admin/contribution-ops')}
+      ${((state.user && state.user.admin_type || 'root') === 'root') ? adminLinkCard('💳', t('Direct Pay 商户运营'), t('直付:合规录入 / 缓交 / 商品·店铺验证 / 平台服务费预充值 / 上线控制(仅 root)'), '#admin/dp-ops') : ''}${((state.user && state.user.admin_type || 'root') === 'root') ? adminLinkCard('⚖', t('仲裁员管理'), t('授权/暂停/撤销真人仲裁员(唯一授权源=active 白名单,需现场 Passkey)'), '#admin/arbitrators') + adminLinkCard('🚦', t('Agent 封禁与申诉'), t('待审申诉队列(批准=立即解封)/ 主动签发 strike'), '#admin/agent-strikes') : ''}
     </div>
   `, 'admin-protocol')
 }