Skip to content

Fix/payment result nan #2314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Wei-Shaw merged 2 commits into from
May 11, 2026
+13 −6
Merged

Fix/payment result nan #2314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6884b03
fix: 修复支付成功页充值金额显示 NaN
dexcoder6 May 9, 2026
ba1c6fa
fix: 修复管理端订单详情充值金额显示 NaN
dexcoder6 May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions frontend/src/components/admin/payment/AdminOrderDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
})

Expand Down
10 changes: 7 additions & 3 deletions frontend/src/views/user/PaymentResultView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,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
})

Expand Down
Loading