fix(order): 修复订单列表筛选逻辑和支付倒计时配置
- 将开发环境API_BASE_URL切换回本地地址 - 修复Tabs状态筛选器逻辑,全部状态时删除筛选参数 - 更新待收货和退货/售后标签页的订单过滤规则 - 将支付倒计时超时时间从1小时调整为24小时 - 修复立即支付按钮显示逻辑,避免已过期订单仍显示支付按钮
This commit is contained in:
@@ -2,8 +2,8 @@
|
|||||||
export const ENV_CONFIG = {
|
export const ENV_CONFIG = {
|
||||||
// 开发环境
|
// 开发环境
|
||||||
development: {
|
development: {
|
||||||
// API_BASE_URL: 'http://127.0.0.1:9200/api',
|
API_BASE_URL: 'http://127.0.0.1:9200/api',
|
||||||
API_BASE_URL: 'https://mp-api.websoft.top/api',
|
// API_BASE_URL: 'https://mp-api.websoft.top/api',
|
||||||
APP_NAME: '开发环境',
|
APP_NAME: '开发环境',
|
||||||
DEBUG: 'true',
|
DEBUG: 'true',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ const PaymentCountdown: React.FC<PaymentCountdownProps> = ({
|
|||||||
createTime,
|
createTime,
|
||||||
payStatus = false,
|
payStatus = false,
|
||||||
realTime = false,
|
realTime = false,
|
||||||
timeoutHours = 1,
|
timeoutHours = 24,
|
||||||
showSeconds = false,
|
showSeconds = false,
|
||||||
className = '',
|
className = '',
|
||||||
onExpired,
|
onExpired,
|
||||||
|
|||||||
@@ -217,8 +217,10 @@ function OrderList(props: OrderListProps) {
|
|||||||
...props.searchParams, // 搜索关键词等其他条件
|
...props.searchParams, // 搜索关键词等其他条件
|
||||||
};
|
};
|
||||||
|
|
||||||
// statusFilter总是添加到搜索条件中(包括-1表示全部)
|
// Tabs 的 statusFilter 优先级最高;全部(-1)时不传该参数(后端按“无筛选”处理)
|
||||||
if (statusParams.statusFilter !== undefined) {
|
if (statusParams.statusFilter === undefined || statusParams.statusFilter === -1) {
|
||||||
|
delete searchConditions.statusFilter;
|
||||||
|
} else {
|
||||||
searchConditions.statusFilter = statusParams.statusFilter;
|
searchConditions.statusFilter = statusParams.statusFilter;
|
||||||
}
|
}
|
||||||
console.log('订单筛选条件:', {
|
console.log('订单筛选条件:', {
|
||||||
@@ -704,9 +706,13 @@ function OrderList(props: OrderListProps) {
|
|||||||
{/* 订单列表 */}
|
{/* 订单列表 */}
|
||||||
{list.length > 0 && list
|
{list.length > 0 && list
|
||||||
?.filter((item) => {
|
?.filter((item) => {
|
||||||
// 如果是待付款标签页(tapIndex === 1),过滤掉支付已过期的订单
|
// “待收货”不展示退款中的/已退款订单,这些订单统一放到“退货/售后”
|
||||||
if (tapIndex === 1 && !item.payStatus && item.orderStatus !== 2 && item.createTime) {
|
if (tapIndex === 3 && (item.orderStatus === 4 || item.orderStatus === 6)) {
|
||||||
return !isPaymentExpired(item.createTime);
|
return false;
|
||||||
|
}
|
||||||
|
// “退货/售后”只展示售后相关状态
|
||||||
|
if (tapIndex === 5) {
|
||||||
|
return item.orderStatus === 4 || item.orderStatus === 5 || item.orderStatus === 6 || item.orderStatus === 7;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
})
|
})
|
||||||
@@ -731,6 +737,7 @@ function OrderList(props: OrderListProps) {
|
|||||||
payStatus={item.payStatus}
|
payStatus={item.payStatus}
|
||||||
realTime={false}
|
realTime={false}
|
||||||
showSeconds={false}
|
showSeconds={false}
|
||||||
|
timeoutHours={24}
|
||||||
mode={'badge'}
|
mode={'badge'}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
@@ -793,10 +800,12 @@ function OrderList(props: OrderListProps) {
|
|||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
void cancelOrder(item);
|
void cancelOrder(item);
|
||||||
}}>取消订单</Button>
|
}}>取消订单</Button>
|
||||||
<Button size={'small'} type="primary" onClick={(e) => {
|
{(!item.createTime || !isPaymentExpired(item.createTime, 24)) && (
|
||||||
e.stopPropagation();
|
<Button size={'small'} type="primary" onClick={(e) => {
|
||||||
void payOrder(item);
|
e.stopPropagation();
|
||||||
}}>立即支付</Button>
|
void payOrder(item);
|
||||||
|
}}>立即支付</Button>
|
||||||
|
)}
|
||||||
</Space>
|
</Space>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user