zfc/sub2api
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2314 from dexcoder6/fix/payment-result-nan

Browse Source 
Fix/payment result nan
This commit is contained in:
Wesley Liddick 2026-05-11 11:24:46 +08:00 committed by GitHub
commit 8b0b507a95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/components/admin/payment/AdminOrderDetail.vue
View File

@ -130,13 +130,16 @@ const props = defineProps<{
/** 充值金额 (base amount before fee) = pay_amount - fee = pay_amount / (1 + fee_rate/100) */
const baseAmount = computed(() => {
if (!props.order) return 0
if (props.order.fee_rate <= 0) return props.order.pay_amount
return props.order.pay_amount / (1 + props.order.fee_rate / 100)
const feeRate = Number(props.order.fee_rate) || 0
if (feeRate <= 0) return props.order.pay_amount
return props.order.pay_amount / (1 + feeRate / 100)
})
/** 手续费 = pay_amount - baseAmount */
const feeAmount = computed(() => {
if (!props.order || props.order.fee_rate <= 0) return 0
if (!props.order) return 0
const feeRate = Number(props.order.fee_rate) || 0
if (feeRate <= 0) return 0
return props.order.pay_amount - baseAmount.value
})

10
frontend/src/views/user/PaymentResultView.vue
View File

@ -140,13 +140,17 @@ const refreshAttempts = ref(0)
/** 充值金额 = pay_amount / (1 + fee_rate/100)，fee_rate=0 时等于 pay_amount */
const baseAmount = computed(() => {
if (!order.value || order.value.fee_rate <= 0) return order.value?.pay_amount ?? 0
return Math.round((order.value.pay_amount / (1 + order.value.fee_rate / 100)) * 100) / 100
if (!order.value) return 0
const feeRate = Number(order.value.fee_rate) || 0
if (feeRate <= 0) return order.value.pay_amount ?? 0
return Math.round((order.value.pay_amount / (1 + feeRate / 100)) * 100) / 100
})
/** 手续费 = pay_amount - baseAmount */
const feeAmount = computed(() => {
if (!order.value || order.value.fee_rate <= 0) return 0
if (!order.value) return 0
const feeRate = Number(order.value.fee_rate) || 0
if (feeRate <= 0) return 0
return Math.round((order.value.pay_amount - baseAmount.value) * 100) / 100
})