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 && (