bimwe/mini-programs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 订单显示问题修复、修复球局开局后可加入的问题

Browse Source
This commit is contained in:
刘杰
2025-10-01 17:26:29 +08:00
parent d30909e559
commit 9cdbfa42ad
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/orderActions.ts
View File

@@ -5,13 +5,13 @@ export function getOrderStatus(orderData) {
if (!order_no) {
return 'none'
}
const unPay = order_status === OrderStatus.PENDING && cancel_type === CancelType.NONE;
const unPay = order_status === OrderStatus.PENDING && ([CancelType.NONE].includes(cancel_type));
const refund = [RefundStatus.PENDING, RefundStatus.SUCCESS].includes(refund_status);
const expired =
order_status === OrderStatus.FINISHED ||
[CancelType.TIMEOUT, CancelType.USER].includes(cancel_type);
return unPay ? 'unpay' : refund ? 'refund' : expired ? 'expired' : 'progress'
return unPay ? 'unpay' : refund ? 'refund' : expired ? cancel_type === CancelType.TIMEOUT ? 'timeout' : 'expired' : 'progress'
}
// scene: list、detail
@@ -54,6 +54,7 @@ export function generateOrderActions(orderData, actions, scene) {
if (scene === 'list') {
const actionMap = new Map([
['timeout', [deleteOrder, gameDetail]],
['expired', [deleteOrder, gameDetail]],
['progress', [quitGame, gameDetail]],
['refund', [deleteOrder, gameDetail]],
@@ -64,6 +65,7 @@ export function generateOrderActions(orderData, actions, scene) {
if (scene === 'detail') {
const actionMap = new Map([
['timeout', [deleteOrder, gameDetail]],
['expired', [gameDetail, deleteOrder]],
['progress', [gameDetail, quitGame]],
['refund', [deleteOrder, gameDetail]],