From 7988a10241d0490b9a6913c2de19cb20f750ef98 Mon Sep 17 00:00:00 2001
From: jacy-dukang <moonjie444@163.com>
Date: Fri, 10 Jul 2026 11:10:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AB=AF=E2=80=9C=E8=A1=A5?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E2=80=9D=E7=9A=84bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/h5-user/src/pages/OrderDetailPage.tsx |  5 ++--
 apps/h5-user/src/pages/OrderListPage.tsx   | 33 ++++++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/apps/h5-user/src/pages/OrderDetailPage.tsx b/apps/h5-user/src/pages/OrderDetailPage.tsx
index f2c2b3f..daa0676 100644
--- a/apps/h5-user/src/pages/OrderDetailPage.tsx
+++ b/apps/h5-user/src/pages/OrderDetailPage.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from 'react';
-import { Link, useNavigate, useParams, useSearchParams } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 import AppImage from '@dukang/shared-ui/AppImage';
 import AppToast from '../components/AppToast';
 import { request } from '../lib/api';
@@ -118,7 +118,6 @@ function fullReceiverAddress(order: Order) {
 
 export default function OrderDetailPage() {
   const { id } = useParams();
-  const [params] = useSearchParams();
   const navigate = useNavigate();
   const [order, setOrder] = useState<Order | null>(null);
   const [showCs, setShowCs] = useState(false);
@@ -126,7 +125,7 @@ export default function OrderDetailPage() {
   const [shareToast, setShareToast] = useState('');
   const [confirming, setConfirming] = useState(false);
 
-  const isReship = order?.orderType === 'RESHIPMENT' || params.get('type') === 'reship';
+  const isReship = order?.orderType === 'RESHIPMENT';
 
   async function loadOrder() {
     if (!id) return;
diff --git a/apps/h5-user/src/pages/OrderListPage.tsx b/apps/h5-user/src/pages/OrderListPage.tsx
index 3abb72f..89fc3b6 100644
--- a/apps/h5-user/src/pages/OrderListPage.tsx
+++ b/apps/h5-user/src/pages/OrderListPage.tsx
@@ -20,9 +20,17 @@ const STATUS_LABEL: Record<string, string> = {
   SHIPPING: '配送中',
   PENDING_RECEIVE: '待收货',
   COMPLETED: '已完成',
-  RESHIP: '补发中',
 };
 
+function isReshipOrder(order: Record<string, unknown>) {
+  return String(order.orderType) === 'RESHIPMENT';
+}
+
+function orderStatusLabel(order: Record<string, unknown>) {
+  if (isReshipOrder(order)) return '补发中';
+  return STATUS_LABEL[String(order.status)] || String(order.status);
+}
+
 export default function OrderListPage() {
   const [params, setParams] = useSearchParams();
   const tab = params.get('tab') || 'all';
@@ -38,18 +46,24 @@ export default function OrderListPage() {
       <PageHeader title="我的订单" onBack={() => navigate('/mine')} />
       <OrderStatusTabs tabs={TABS} active={tab} onChange={(key) => setParams({ tab: key })} />
       {data.list.length === 0 && <div className="empty">暂无订单</div>}
-      {data.list.map((o, i) => {
+      {data.list.map((o) => {
         const items = (o.items as Array<Record<string, unknown>>) || [];
         const item = items[0];
-        const isReshipDemo = i === 0 && tab === 'all';
+        const isReship = isReshipOrder(o);
         const isPendingPay = String(o.status) === 'PENDING_PAY';
         return (
           <div key={String(o.id)} className="card">
             <div className="card-row" style={{ marginBottom: 8 }}>
-              <span className="label-md text-muted">订单号: {String(o.orderNo)}</span>
-              <span className="status-tag">{STATUS_LABEL[String(o.status)] || String(o.status)}</span>
+              <span className="label-md text-muted">
+                订单号: {String(o.orderNo)}
+                {isReship && (
+                  <span className="tag-reship" style={{ marginLeft: 8 }}>
+                    补发单
+                  </span>
+                )}
+              </span>
+              <span className="status-tag">{orderStatusLabel(o)}</span>
             </div>
-            {isReshipDemo && <span className="tag-reship" style={{ marginBottom: 8, display: 'inline-block' }}>补发示例</span>}
             {item && (
               <div className="card-row">
                 <AppImage
@@ -74,11 +88,8 @@ export default function OrderListPage() {
                   去付款
                 </button>
               )}
-              <Link
-                to={`/orders/${o.id}${isReshipDemo ? '?type=reship' : ''}`}
-                className="btn btn-outline btn-pill"
-              >
-                {isReshipDemo ? '查看进度' : '查看详情'}
+              <Link to={`/orders/${o.id}`} className="btn btn-outline btn-pill">
+                查看详情
               </Link>
             </div>
           </div>