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-19 18:40:58 +08:00
parent a3c3087e46
commit 2772e7f1df
7 changed files with 92 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils/orderActions.ts
View File

@@ -8,10 +8,11 @@ export function getOrderStatus(orderData) {
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);
order_status === OrderStatus.FINISHED;
return unPay ? 'unpay' : refund ? 'refund' : expired ? cancel_type === CancelType.TIMEOUT ? 'timeout' : 'expired' : 'progress'
const canceled = [CancelType.TIMEOUT, CancelType.USER].includes(cancel_type);
return unPay ? 'unpay' : refund ? 'refund' : canceled ? 'canceled' : expired ? 'expired' : 'progress'
}
// scene: list、detail
@@ -54,7 +55,7 @@ export function generateOrderActions(orderData, actions, scene) {
if (scene === 'list') {
const actionMap = new Map([
['timeout', [deleteOrder, gameDetail]],
['canceled', [deleteOrder, gameDetail]],
['expired', [deleteOrder, gameDetail]],
['progress', [quitGame, gameDetail]],
['refund', [deleteOrder, gameDetail]],
@@ -65,7 +66,7 @@ export function generateOrderActions(orderData, actions, scene) {
if (scene === 'detail') {
const actionMap = new Map([
['timeout', [deleteOrder, gameDetail]],
['canceled', [deleteOrder, gameDetail]],
['expired', [gameDetail, deleteOrder]],
['progress', [gameDetail, quitGame]],
['refund', [deleteOrder, gameDetail]],