From afe8f93c329c4493b7ca0fdc5beacaca2d5a7296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Wed, 4 Feb 2026 15:10:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(config):=20=E6=81=A2=E5=A4=8D=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=92=8C=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83API?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将开发环境API_BASE_URL从线上地址改回本地地址 - 在开发环境注释掉线上API地址配置 - 将测试环境API_BASE_URL从线上地址改回本地地址 - 在测试环境注释掉线上API地址配置 fix(order): 修复待收货状态下订单操作权限控制 - 在待收货状态判断条件中增加orderStatus !== 6的限制 - 防止已完成订单在待收货状态下显示查看物流和确认收货按钮 --- config/env.ts | 7 ++++--- src/user/order/components/OrderList.tsx | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/env.ts b/config/env.ts index e9c8506..90745f8 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', }, @@ -15,7 +15,8 @@ export const ENV_CONFIG = { }, // 测试环境 test: { - 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/user/order/components/OrderList.tsx b/src/user/order/components/OrderList.tsx index 78ea908..b721513 100644 --- a/src/user/order/components/OrderList.tsx +++ b/src/user/order/components/OrderList.tsx @@ -785,7 +785,7 @@ function OrderList(props: OrderListProps) { )} {/* 待收货状态：显示查看物流和确认收货 */} - {item.deliveryStatus === 20 && (!item.riderId || !!item.sendEndTime) && item.orderStatus !== 2 && ( + {item.deliveryStatus === 20 && (!item.riderId || !!item.sendEndTime) && item.orderStatus !== 2 && item.orderStatus !== 6 && (