fix: 修改充值提醒,钱包显示
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 47s
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 47s
This commit is contained in:
@@ -142,16 +142,32 @@
|
||||
);
|
||||
|
||||
// 判断是否为强充订单
|
||||
if (orderResult.order_type === 'recharge' && orderResult.recharge && orderResult.pay_config) {
|
||||
// 强充订单:显示提示信息并直接使用返回的 pay_config 支付
|
||||
if (!orderResult.pay_config.package) {
|
||||
if (orderResult.order_type === 'recharge' && orderResult.recharge) {
|
||||
const recharge = orderResult.recharge;
|
||||
|
||||
// 检查充值订单状态
|
||||
if (recharge.status === 2 || recharge.status === 3) {
|
||||
// 已关闭或已退款的订单
|
||||
uni.hideLoading();
|
||||
showModal.value = false;
|
||||
uni.showToast({
|
||||
title: `充值订单${recharge.status_name},请重新下单`,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查是否有支付配置(待支付状态应该有)
|
||||
if (!orderResult.pay_config || !orderResult.pay_config.package) {
|
||||
uni.hideLoading();
|
||||
showModal.value = false;
|
||||
uni.showToast({ title: '支付参数获取失败', icon: 'none' });
|
||||
return;
|
||||
}
|
||||
|
||||
// 获取强充信息
|
||||
const forceRechargeAmount = orderResult.linked_package_info?.force_recharge_amount || 0;
|
||||
const forceRechargeAmount = orderResult.linked_package_info?.force_recharge_amount || recharge.amount;
|
||||
const packageNames = orderResult.linked_package_info?.package_names || [];
|
||||
|
||||
uni.hideLoading();
|
||||
@@ -258,7 +274,6 @@
|
||||
paySign: payConfig.pay_sign
|
||||
}, function(res) {
|
||||
if (res.err_msg === 'get_brand_wcpay_request:ok') {
|
||||
console.log('支付成功', res);
|
||||
const successMsg = isForceRecharge ? '充值成功,套餐将自动购买' : '支付成功';
|
||||
uni.showToast({ title: successMsg, icon: 'success', duration: 2000 });
|
||||
setTimeout(() => {
|
||||
@@ -267,7 +282,6 @@
|
||||
} else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
|
||||
uni.showToast({ title: '已取消支付', icon: 'none' });
|
||||
} else {
|
||||
console.error('支付失败', res);
|
||||
uni.showToast({ title: '支付失败', icon: 'none' });
|
||||
}
|
||||
});
|
||||
@@ -281,7 +295,6 @@
|
||||
signType: payConfig.sign_type,
|
||||
paySign: payConfig.pay_sign,
|
||||
success: (res) => {
|
||||
console.log('支付成功', res);
|
||||
const successMsg = isForceRecharge ? '充值成功,套餐将自动购买' : '支付成功';
|
||||
uni.showToast({ title: successMsg, icon: 'success', duration: 2000 });
|
||||
setTimeout(() => {
|
||||
@@ -289,7 +302,6 @@
|
||||
}, 1500);
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error('支付失败', err);
|
||||
if (err.errMsg && (err.errMsg.includes('cancel') || err.errMsg.includes('用户取消'))) {
|
||||
uni.showToast({ title: '已取消支付', icon: 'none' });
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user