From c8dfa50f24c29af930c920611ece663331a73f92 Mon Sep 17 00:00:00 2001
From: jacy-dukang <moonjie444@163.com>
Date: Tue, 7 Jul 2026 20:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8FID=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/h5-partner/src/pages/StoreDetailPage.tsx | 12 +++---------
 apps/h5-shop/src/pages/RecordsPage.tsx        |  2 +-
 apps/h5-shop/src/pages/RedeemConfirmPage.tsx  |  2 +-
 apps/h5-shop/src/pages/RedeemSuccessPage.tsx  |  2 +-
 apps/h5-user/src/pages/MinePage.tsx           |  2 --
 apps/h5-user/src/pages/PayPage.tsx            | 13 ++++++++++++-
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/apps/h5-partner/src/pages/StoreDetailPage.tsx b/apps/h5-partner/src/pages/StoreDetailPage.tsx
index 2f53652..eb23634 100644
--- a/apps/h5-partner/src/pages/StoreDetailPage.tsx
+++ b/apps/h5-partner/src/pages/StoreDetailPage.tsx
@@ -195,15 +195,9 @@ export default function StoreDetailPage() {
 
         <section className="partner-form-card" style={{ margin: 0, background: 'var(--color-surface-container)' }}>
           <h3 className="headline-md" style={{ borderLeft: '4px solid var(--color-subtle-gray)', paddingLeft: 12, marginBottom: 16 }}>管理信息</h3>
-          <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 16 }}>
-            <div>
-              <label className="label-md text-muted">状态</label>
-              <p className="body-md" style={{ fontWeight: 500 }}>{storeStatusLabel(status)}</p>
-            </div>
-            <div>
-              <label className="label-md text-muted">门店ID</label>
-              <p className="body-md" style={{ fontWeight: 500, fontFamily: 'monospace' }}>{String(store.id)}</p>
-            </div>
+          <div>
+            <label className="label-md text-muted">状态</label>
+            <p className="body-md" style={{ fontWeight: 500 }}>{storeStatusLabel(status)}</p>
           </div>
         </section>
       </main>
diff --git a/apps/h5-shop/src/pages/RecordsPage.tsx b/apps/h5-shop/src/pages/RecordsPage.tsx
index af5cbe0..138c8f3 100644
--- a/apps/h5-shop/src/pages/RecordsPage.tsx
+++ b/apps/h5-shop/src/pages/RecordsPage.tsx
@@ -134,7 +134,7 @@ export default function RecordsPage() {
                     <div>
                       <div className="shop-record-order">
                         <span className="shop-record-time" style={{ margin: 0 }}>订单号</span>
-                        <span>{String(r.redeemNo || r.id)}</span>
+                        <span>{r.redeemNo ? String(r.redeemNo) : '—'}</span>
                       </div>
                       <p className="shop-record-time">
                         核销时间: {new Date(String(r.createdAt)).toLocaleString('zh-CN', { hour12: false }).slice(0, 16)}
diff --git a/apps/h5-shop/src/pages/RedeemConfirmPage.tsx b/apps/h5-shop/src/pages/RedeemConfirmPage.tsx
index ae69ed8..e4f6597 100644
--- a/apps/h5-shop/src/pages/RedeemConfirmPage.tsx
+++ b/apps/h5-shop/src/pages/RedeemConfirmPage.tsx
@@ -84,7 +84,7 @@ export default function RedeemConfirmPage() {
   }
 
   const previewAmount = preview?.amount ?? 0;
-  const userLabel = preview?.user?.nickname || preview?.user?.phone || preview?.user?.userNo || '—';
+  const userLabel = preview?.user?.nickname || preview?.user?.phone || '—';
 
   return (
     <div className="shop-redeem-page">
diff --git a/apps/h5-shop/src/pages/RedeemSuccessPage.tsx b/apps/h5-shop/src/pages/RedeemSuccessPage.tsx
index a05c11c..a2a0ce4 100644
--- a/apps/h5-shop/src/pages/RedeemSuccessPage.tsx
+++ b/apps/h5-shop/src/pages/RedeemSuccessPage.tsx
@@ -22,7 +22,7 @@ export default function RedeemSuccessPage() {
 
   const storeName = (location.state as { storeName?: string })?.storeName || '当前门店';
   const user = (location.state as { user?: { nickname?: string; phone?: string; userNo?: string } })?.user;
-  const userLabel = user?.nickname || user?.phone || user?.userNo || '—';
+  const userLabel = user?.nickname || user?.phone || '—';
   const amount = Number(result?.amount ?? 0);
   const redeemNo = String(result?.redeemNo || '—');
   const createdAt = result?.createdAt
diff --git a/apps/h5-user/src/pages/MinePage.tsx b/apps/h5-user/src/pages/MinePage.tsx
index 3dbe594..b7161f2 100644
--- a/apps/h5-user/src/pages/MinePage.tsx
+++ b/apps/h5-user/src/pages/MinePage.tsx
@@ -77,7 +77,6 @@ export default function MinePage() {
   }
 
   const nickname = profile?.nickname || '用户';
-  const userNo = profile?.userNo || '';
   const avatar = profile?.avatarUrl || DEFAULT_AVATAR;
   const hasWechat = !!profile?.hasWechat;
 
@@ -98,7 +97,6 @@ export default function MinePage() {
           <div className="mine-profile-info">
             <h1 className="mine-profile-name">{nickname}</h1>
             <div className="mine-profile-meta">
-              {userNo && <span className="mine-profile-id">ID: {userNo}</span>}
               <span className="mine-member-tag">{hasWechat ? '微信会员' : '好客会员'}</span>
             </div>
           </div>
diff --git a/apps/h5-user/src/pages/PayPage.tsx b/apps/h5-user/src/pages/PayPage.tsx
index 92f1ff0..86da844 100644
--- a/apps/h5-user/src/pages/PayPage.tsx
+++ b/apps/h5-user/src/pages/PayPage.tsx
@@ -40,6 +40,7 @@ export default function PayPage() {
   const [msg, setMsg] = useState('');
   const [showBindPhone, setShowBindPhone] = useState(false);
   const [wxSessionKey, setWxSessionKey] = useState<string | null>(null);
+  const [orderNo, setOrderNo] = useState('');
 
   const refreshPayReadiness = useCallback(async () => {
     try {
@@ -72,6 +73,16 @@ export default function PayPage() {
     refreshPayReadiness();
   }, [refreshPayReadiness]);
 
+  useEffect(() => {
+    if (!orderId) {
+      setOrderNo('');
+      return;
+    }
+    request<{ orderNo?: string }>('USER_H5', `/trade/orders/${orderId}`)
+      .then((order) => setOrderNo(order.orderNo || ''))
+      .catch(() => setOrderNo(''));
+  }, [orderId]);
+
   useEffect(() => {
     if (!isWechatEnv()) return;
     handleWechatAuthCallback()
@@ -181,7 +192,7 @@ export default function PayPage() {
         )}
 
         {msg && <p className="pay-wechat-auth-msg">{msg}</p>}
-        <p className="label-md text-muted" style={{ marginTop: 24 }}>订单号 {orderId}</p>
+        {orderNo && <p className="label-md text-muted" style={{ marginTop: 24 }}>订单号 {orderNo}</p>}
       </div>
       <div className="page-actions">
         <button