From 5bddf6e438e8890b5a6f8b47c0f2189b52b23852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 6 Feb 2026 00:17:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=92=8C=E6=94=AF=E4=BB=98=E5=80=92=E8=AE=A1=E6=97=B6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将开发环境API_BASE_URL切换回本地地址
- 修复Tabs状态筛选器逻辑，全部状态时删除筛选参数
- 更新待收货和退货/售后标签页的订单过滤规则
- 将支付倒计时超时时间从1小时调整为24小时
- 修复立即支付按钮显示逻辑，避免已过期订单仍显示支付按钮
---
 config/env.ts                           |  4 ++--
 src/components/PaymentCountdown.tsx     |  2 +-
 src/user/order/components/OrderList.tsx | 27 ++++++++++++++++---------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/config/env.ts b/config/env.ts
index f630969..78c1e6e 100644
--- a/config/env.ts
+++ b/config/env.ts
@@ -2,8 +2,8 @@
 export const ENV_CONFIG = {
   // 开发环境
   development: {
-    // API_BASE_URL: 'http://127.0.0.1:9200/api',
-    API_BASE_URL: 'https://mp-api.websoft.top/api',
+    API_BASE_URL: 'http://127.0.0.1:9200/api',
+    // API_BASE_URL: 'https://mp-api.websoft.top/api',
     APP_NAME: '开发环境',
     DEBUG: 'true',
   },
diff --git a/src/components/PaymentCountdown.tsx b/src/components/PaymentCountdown.tsx
index c576c9e..447c2c2 100644
--- a/src/components/PaymentCountdown.tsx
+++ b/src/components/PaymentCountdown.tsx
@@ -31,7 +31,7 @@ const PaymentCountdown: React.FC<PaymentCountdownProps> = ({
   createTime,
   payStatus = false,
   realTime = false,
-  timeoutHours = 1,
+  timeoutHours = 24,
   showSeconds = false,
   className = '',
   onExpired,
diff --git a/src/user/order/components/OrderList.tsx b/src/user/order/components/OrderList.tsx
index ba80d11..7f6eb09 100644
--- a/src/user/order/components/OrderList.tsx
+++ b/src/user/order/components/OrderList.tsx
@@ -217,8 +217,10 @@ function OrderList(props: OrderListProps) {
       ...props.searchParams, // 搜索关键词等其他条件
     };
 
-    // statusFilter总是添加到搜索条件中（包括-1表示全部）
-    if (statusParams.statusFilter !== undefined) {
+    // Tabs 的 statusFilter 优先级最高；全部(-1)时不传该参数（后端按“无筛选”处理）
+    if (statusParams.statusFilter === undefined || statusParams.statusFilter === -1) {
+      delete searchConditions.statusFilter;
+    } else {
       searchConditions.statusFilter = statusParams.statusFilter;
     }
     console.log('订单筛选条件:', {
@@ -704,9 +706,13 @@ function OrderList(props: OrderListProps) {
             {/* 订单列表 */}
             {list.length > 0 && list
               ?.filter((item) => {
-                // 如果是待付款标签页（tapIndex === 1），过滤掉支付已过期的订单
-                if (tapIndex === 1 && !item.payStatus && item.orderStatus !== 2 && item.createTime) {
-                  return !isPaymentExpired(item.createTime);
+                // “待收货”不展示退款中的/已退款订单，这些订单统一放到“退货/售后”
+                if (tapIndex === 3 && (item.orderStatus === 4 || item.orderStatus === 6)) {
+                  return false;
+                }
+                // “退货/售后”只展示售后相关状态
+                if (tapIndex === 5) {
+                  return item.orderStatus === 4 || item.orderStatus === 5 || item.orderStatus === 6 || item.orderStatus === 7;
                 }
                 return true;
               })
@@ -731,6 +737,7 @@ function OrderList(props: OrderListProps) {
                               payStatus={item.payStatus}
                               realTime={false}
                               showSeconds={false}
+                              timeoutHours={24}
                               mode={'badge'}
                             />
                           ) : (
@@ -793,10 +800,12 @@ function OrderList(props: OrderListProps) {
                               e.stopPropagation();
                               void cancelOrder(item);
                             }}>取消订单</Button>
-                            <Button size={'small'} type="primary" onClick={(e) => {
-                              e.stopPropagation();
-                              void payOrder(item);
-                            }}>立即支付</Button>
+                            {(!item.createTime || !isPaymentExpired(item.createTime, 24)) && (
+                              <Button size={'small'} type="primary" onClick={(e) => {
+                                e.stopPropagation();
+                                void payOrder(item);
+                              }}>立即支付</Button>
+                            )}
                           </Space>
                         )}