Skip to content

feat(costcenter):support alipay #5345

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

Closed
xudaotutou wants to merge 1 commit into from
Closed

feat(costcenter):support alipay #5345

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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ pkg/registry/save/testdata/registry
deploy/cloud/tars
.vscode/
/lifecycle/tools/

**.env*
29 changes: 19 additions & 10 deletions frontend/providers/costcenter/src/components/RechargeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ const BonusBox = (props: {
fontWeight="500"
fontSize="12px"
>
<Text mr="4px">{t('Bonus')}</Text>
<Text mr="4px">{/* {t('Bonus')} */}+</Text>
<CurrencySymbol boxSize={'10px'} mr={'2px'} type={currency} />
<Text> {props.bouns}</Text>
</Flex>
Expand Down Expand Up @@ -372,10 +372,12 @@ const RechargeModal = forwardRef(
const getBonus = (amount: number) => {
let ratio = 0;
let specialIdx = specialBonus.findIndex(([k]) => +k === amount);
if (specialIdx >= 0) return Math.floor((amount * specialBonus[specialIdx][1]) / 100);
// if (specialIdx >= 0) return Math.floor((amount * specialBonus[specialIdx][1]) / 100);
if (specialIdx >= 0) return Math.floor(specialBonus[specialIdx][1]);
const step = [...steps].reverse().findIndex((step) => amount >= step);
if (ratios.length > step && step > -1) ratio = [...ratios].reverse()[step];
return Math.floor((amount * ratio) / 100);
// return Math.floor((amount * ratio) / 100);
return ratio;
};
const { stripeEnabled, wechatEnabled } = useEnvStore();
useEffect(() => {
Expand Down Expand Up @@ -698,32 +700,39 @@ const RechargeModal = forwardRef(
ratios[idx]
] as const
)
.filter(([_, _2, ratio], idx) => {
return ratio > 0;
.filter(([step, _2, ratio], idx) => {
return (
ratio > 0 &&
specialBonus.findIndex(([k, v]) => +k === step && v !== 0) === -1
);
})

.map(([pre, next, ratio], idx) => (
<>
<Text key={idx} pl={'24px'} color={'grayModern.900'}>
{/* <Text key={idx} pl={'24px'} color={'grayModern.900'}>
{pre}
{' <= '}
{t('Recharge Amount')}
{next ? `< ${next}` : ''}
</Text> */}
<Text key={idx} pl={'24px'} color={'grayModern.900'}>
{pre}
{/* = {t('Recharge Amount')}{' '} */}
</Text>
<Text px={'24px'} color={'grayModern.900'}>
{t('Bonus')}
{ratio.toFixed(2)}%
{ratio.toFixed(2)}
</Text>
</>
))}
{specialBonus &&
specialBonus.map(([k, v], i) => (
<>
<Text key={i} pl={'24px'} color={'grayModern.900'}>
{k} = {t('Recharge Amount')}{' '}
{k}
{/* = {t('Recharge Amount')}{' '} */}
</Text>
<Text pl={'24px'} color={'grayModern.900'}>
{t('Bonus')} {v} %
{t('Bonus')} {v}
</Text>
</>
))}
Expand Down
Loading