fix: package-list
All checks were successful
构建并部署前端到生产环境 / build-and-deploy (push) Successful in 47s

This commit is contained in:
sexygoat
2026-04-15 15:23:39 +08:00
parent d3a40f0d77
commit 43a13bf863
3 changed files with 18 additions and 5 deletions

View File

@@ -52,6 +52,15 @@ export const walletApi = {
}); });
}, },
// 支付充值订单
payRechargeOrder(identifier, rechargeOrderId, paymentMethod) {
return request({
url: `/api/c/v1/recharge-orders/${rechargeOrderId}/pay`,
method: 'POST',
data: { identifier, payment_method: paymentMethod, app_type: APP_TYPE }
});
},
getTransactions(identifier, page, page_size, params = {}) { getTransactions(identifier, page, page_size, params = {}) {
return request({ return request({
url: '/api/c/v1/wallet/transactions', url: '/api/c/v1/wallet/transactions',

View File

@@ -544,16 +544,17 @@
}); });
try { try {
// 获取充值订单详情(包含支付配置 // 调用支付接口获取支付配置
const rechargeData = await walletApi.getRechargeOrderDetail( const payData = await walletApi.payRechargeOrder(
userStore.state.identifier, userStore.state.identifier,
rechargeOrder.recharge_order_id || rechargeOrder.recharge_id rechargeOrder.recharge_order_id || rechargeOrder.recharge_id,
'wechat'
); );
uni.hideLoading(); uni.hideLoading();
// 验证支付配置 // 验证支付配置
if (!rechargeData.pay_config || !rechargeData.pay_config.package) { if (!payData.pay_config || !payData.pay_config.package) {
uni.showToast({ uni.showToast({
title: '支付参数获取失败', title: '支付参数获取失败',
icon: 'none' icon: 'none'
@@ -561,6 +562,8 @@
return; return;
} }
const rechargeData = payData;
// 调起微信支付 // 调起微信支付
// #ifdef H5 // #ifdef H5
if (typeof WeixinJSBridge === 'undefined') { if (typeof WeixinJSBridge === 'undefined') {
@@ -919,6 +922,7 @@
padding: 12rpx 32rpx; padding: 12rpx 32rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
width:100%;
&::after { &::after {
border: none; border: none;

View File

@@ -163,7 +163,7 @@
} }
// 检查充值订单是否已存在(待支付状态但无支付配置) // 检查充值订单是否已存在(待支付状态但无支付配置)
if (recharge.status === 0 && (!orderResult.pay_config || !orderResult.pay_config.package)) { if (recharge.status === 1 && (!orderResult.pay_config || !orderResult.pay_config.package)) {
// 待支付订单已存在,引导用户跳转到订单页面 // 待支付订单已存在,引导用户跳转到订单页面
uni.hideLoading(); uni.hideLoading();
showModal.value = false; showModal.value = false;