Skip to content

fix(classic): use configured top-up currency #5537

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

Open
a0yark wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(classic): use configured top-up currency #5537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion web/classic/src/components/topup/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
showSuccess,
renderQuota,
renderQuotaWithAmount,
getCurrencyConfig,
copy,
getQuotaPerUnit,
} from '../../helpers';
Expand Down Expand Up @@ -800,8 +801,17 @@ const TopUp = () => {
}
}, [statusState?.status]);

const formatPaymentAmount = (value) => {
const { symbol } = getCurrencyConfig();
const numericValue = Number(value);
const displayValue = Number.isFinite(numericValue)
? numericValue.toFixed(2)
: value;
return `${symbol}${displayValue}`;
};

const renderAmount = () => {
return amount + ' ' + t('元');
return formatPaymentAmount(amount);
};

const getAmount = async (value) => {
Expand Down Expand Up @@ -928,6 +938,7 @@ const TopUp = () => {
renderQuotaWithAmount={renderQuotaWithAmount}
amountLoading={amountLoading}
renderAmount={renderAmount}
formatPaymentAmount={formatPaymentAmount}
payWay={payWay}
payMethods={confirmPayMethods}
amountNumber={amount}
Expand Down
5 changes: 3 additions & 2 deletions web/classic/src/components/topup/modals/PaymentConfirmModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const PaymentConfirmModal = ({
renderQuotaWithAmount,
amountLoading,
renderAmount,
formatPaymentAmount,
payWay,
payMethods,
// 新增：用于显示折扣明细
Expand Down Expand Up @@ -97,15 +98,15 @@ const PaymentConfirmModal = ({
{t('原价')}：
</Text>
<Text delete className='text-slate-500 dark:text-slate-400'>
{`${originalAmount.toFixed(2)} ${t('元')}`}
{formatPaymentAmount(originalAmount)}
</Text>
</div>
<div className='flex justify-between items-center'>
<Text className='text-slate-500 dark:text-slate-400'>
{t('优惠')}：
</Text>
<Text className='text-emerald-600 dark:text-emerald-400'>
{`- ${discountAmount.toFixed(2)} ${t('元')}`}
{`- ${formatPaymentAmount(discountAmount)}`}
</Text>
</div>
</>
Expand Down