forked from gxwebsoft/mp-10550
refactor(shop): 移除水票套票商品配送时间选择功能
- 删除了配送时间相关的状态管理和日期选择器组件 - 移除了配送时间验证和格式化逻辑 - 更新了订单提交流程,不再传递配送时间参数 - 修改支付回调处理,支持自定义成功行为和跳转逻辑 - 简化了水票商品的购买流程,移除配送时间相关校验
This commit is contained in:
@@ -19,7 +19,8 @@ export enum PaymentType {
|
||||
* 支付结果回调
|
||||
*/
|
||||
export interface PaymentCallback {
|
||||
onSuccess?: () => void;
|
||||
// Return `false` to skip default "支付成功" toast + redirect.
|
||||
onSuccess?: () => void | boolean | Promise<void | boolean>;
|
||||
onError?: (error: string) => void;
|
||||
onComplete?: () => void;
|
||||
}
|
||||
@@ -118,17 +119,27 @@ export class PaymentHandler {
|
||||
if (paymentSuccess) {
|
||||
console.log('支付成功,订单号:', result.orderNo);
|
||||
|
||||
Taro.showToast({
|
||||
title: '支付成功',
|
||||
icon: 'success'
|
||||
});
|
||||
// 先收起 loading,避免遮挡 modal/toast
|
||||
try {
|
||||
Taro.hideLoading();
|
||||
} catch (_e) {
|
||||
// ignore
|
||||
}
|
||||
|
||||
callback?.onSuccess?.();
|
||||
const onSuccessResult = await callback?.onSuccess?.();
|
||||
const skipDefaultSuccessBehavior = onSuccessResult === false;
|
||||
|
||||
// 跳转到订单页面
|
||||
setTimeout(() => {
|
||||
Taro.navigateTo({ url: '/user/order/order' });
|
||||
}, 2000);
|
||||
if (!skipDefaultSuccessBehavior) {
|
||||
Taro.showToast({
|
||||
title: '支付成功',
|
||||
icon: 'success'
|
||||
});
|
||||
|
||||
// 跳转到订单页面
|
||||
setTimeout(() => {
|
||||
Taro.navigateTo({ url: '/user/order/order' });
|
||||
}, 2000);
|
||||
}
|
||||
} else {
|
||||
throw new Error('支付未完成');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user