From 3ac008a217ecaa23fffb200e3f55deaa744b730a Mon Sep 17 00:00:00 2001
From: jacy <18049821889@163.com>
Date: Mon, 17 Aug 2026 22:50:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(h5-shop):=20=E4=BF=AE=E5=A4=8D=E9=97=AD?=
 =?UTF-8?q?=E5=BA=97/=E4=BC=91=E6=81=AF=E4=B8=AD=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=BC=B9=E7=AA=97=E4=B8=8D=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 根因：门店非OPEN时后端 preview 拦截，preview 为 null 导致确认按钮 disabled，弹窗永远触发不了
- RedeemConfirmPage：storeClosed 时确认按钮可点→弹开张框；开张后重拉预览并继续核销
- 弹窗文案对齐「门店目前休息中无法核销，是否开启营业」

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>
---
 apps/h5-shop/src/pages/PhoneRedeemPage.tsx   |  6 +--
 apps/h5-shop/src/pages/RedeemConfirmPage.tsx | 52 ++++++++++++--------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/apps/h5-shop/src/pages/PhoneRedeemPage.tsx b/apps/h5-shop/src/pages/PhoneRedeemPage.tsx
index 9b4d677..a3e0b76 100644
--- a/apps/h5-shop/src/pages/PhoneRedeemPage.tsx
+++ b/apps/h5-shop/src/pages/PhoneRedeemPage.tsx
@@ -139,7 +139,7 @@ export default function PhoneRedeemPage() {
 
       <main className="shop-redeem-main">
         {storeClosed && (
-          <p className="shop-redeem-error" style={{ marginBottom: 12 }}>门店当前休息中（未营业），暂不支持核销</p>
+          <p className="shop-redeem-error" style={{ marginBottom: 12 }}>门店目前休息中无法核销，开启营业后可继续</p>
         )}
 
         <section className="shop-redeem-card">
@@ -234,8 +234,8 @@ export default function PhoneRedeemPage() {
       {showOpenModal && (
         <div className="shop-redeem-modal" role="dialog" aria-modal="true">
           <div className="shop-redeem-modal-card">
-            <h4 className="shop-redeem-modal-title">是否开启营业？</h4>
-            <p className="shop-redeem-modal-desc">门店当前休息中，开启营业后即可继续核销。</p>
+            <h4 className="shop-redeem-modal-title">门店休息中</h4>
+            <p className="shop-redeem-modal-desc">门店目前休息中无法核销，是否开启营业？</p>
             <div className="shop-redeem-modal-actions">
               <button
                 type="button"
diff --git a/apps/h5-shop/src/pages/RedeemConfirmPage.tsx b/apps/h5-shop/src/pages/RedeemConfirmPage.tsx
index ee198a4..f60cc47 100644
--- a/apps/h5-shop/src/pages/RedeemConfirmPage.tsx
+++ b/apps/h5-shop/src/pages/RedeemConfirmPage.tsx
@@ -50,27 +50,34 @@ export default function RedeemConfirmPage() {
     setToken(scanned);
   }, [searchParams, navigate]);
 
-  useEffect(() => {
+  async function loadPreview() {
     if (!token.trim()) {
       setPreview(null);
       return;
     }
-    request<Preview>('SHOP_H5', '/shop/redeem/preview', {
-      method: 'POST',
-      body: JSON.stringify({ token }),
-    })
-      .then(setPreview)
-      .catch(async (e) => {
-        setPreview(null);
-        setMsg(e instanceof Error ? e.message : '无法预览核销码');
-        const report = await reportRedeemFailure(token, 'preview', e);
-        if (report?.thresholdReached) {
-          setFailCount(report.failCount);
-          setShowWeakNet(true);
-        } else if (report) {
-          setFailCount(report.failCount);
-        }
+    try {
+      const p = await request<Preview>('SHOP_H5', '/shop/redeem/preview', {
+        method: 'POST',
+        body: JSON.stringify({ token }),
       });
+      setPreview(p);
+      setMsg('');
+    } catch (e) {
+      setPreview(null);
+      setMsg(e instanceof Error ? e.message : '无法预览核销码');
+      const report = await reportRedeemFailure(token, 'preview', e);
+      if (report?.thresholdReached) {
+        setFailCount(report.failCount);
+        setShowWeakNet(true);
+      } else if (report) {
+        setFailCount(report.failCount);
+      }
+    }
+  }
+
+  useEffect(() => {
+    void loadPreview();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [token]);
 
   async function doConfirm() {
@@ -119,6 +126,9 @@ export default function RedeemConfirmPage() {
       });
       setStoreClosed(false);
       setShowOpenModal(false);
+      setMsg('');
+      // 开张后重新拉取预览（门店已 OPEN，后端不再拦截），再继续核销
+      await loadPreview();
       await doConfirm();
     } catch (e) {
       setShowOpenModal(false);
@@ -142,7 +152,7 @@ export default function RedeemConfirmPage() {
 
       <main className="shop-redeem-main">
         {storeClosed && (
-          <p className="shop-redeem-error" style={{ marginBottom: 12 }}>门店当前休息中（未营业），暂不支持核销</p>
+          <p className="shop-redeem-error" style={{ marginBottom: 12 }}>门店目前休息中无法核销，开启营业后可继续</p>
         )}
         <section className="shop-redeem-card">
           <div className="shop-redeem-banner">
@@ -214,13 +224,13 @@ export default function RedeemConfirmPage() {
                 <button
                   type="button"
                   className={`shop-redeem-confirm-btn${loading ? ' success' : ''}`}
-                  disabled={loading || !preview}
+                  disabled={loading || (!preview && !storeClosed)}
                   onClick={() => void confirm()}
                 >
                   <span className="material-symbols-outlined shop-fill-icon">
                     {loading ? 'sync' : 'check_circle'}
                   </span>
-                  <span>{loading ? '正在核销...' : preview ? `确认核销 ¥${formatAmount(previewAmount)}` : '加载中…'}</span>
+                  <span>{loading ? '正在核销...' : preview ? `确认核销 ¥${formatAmount(previewAmount)}` : storeClosed ? '确认核销' : '加载中…'}</span>
                 </button>
                 <p className="shop-redeem-hint">请核对金额后点击确认</p>
               </>
@@ -242,8 +252,8 @@ export default function RedeemConfirmPage() {
       {showOpenModal && (
         <div className="shop-redeem-modal" role="dialog" aria-modal="true">
           <div className="shop-redeem-modal-card">
-            <h4 className="shop-redeem-modal-title">是否开启营业？</h4>
-            <p className="shop-redeem-modal-desc">门店当前休息中，开启营业后即可继续核销。</p>
+            <h4 className="shop-redeem-modal-title">门店休息中</h4>
+            <p className="shop-redeem-modal-desc">门店目前休息中无法核销，是否开启营业？</p>
             <div className="shop-redeem-modal-actions">
               <button
                 type="button"