diff --git a/projects/app/src/pageComponents/price/ExtraPlan.tsx b/projects/app/src/pageComponents/price/ExtraPlan.tsx index 25d9ad43c..d5534eaf0 100644 --- a/projects/app/src/pageComponents/price/ExtraPlan.tsx +++ b/projects/app/src/pageComponents/price/ExtraPlan.tsx @@ -105,7 +105,9 @@ const ExtraPlan = ({ onPaySuccess }: { onPaySuccess?: () => void }) => { ); // 计算活动时间 - const activityExpirationTime = formatActivityExpirationTime(subPlans?.activityExpirationTime); + const { text: activityExpirationTime } = formatActivityExpirationTime( + subPlans?.activityExpirationTime + ); return ( diff --git a/projects/app/src/pageComponents/price/Standard.tsx b/projects/app/src/pageComponents/price/Standard.tsx index a15730581..0a833b374 100644 --- a/projects/app/src/pageComponents/price/Standard.tsx +++ b/projects/app/src/pageComponents/price/Standard.tsx @@ -134,7 +134,9 @@ const Standard = ({ }); // 计算活动时间 - const activityExpirationTime = formatActivityExpirationTime(subPlans?.activityExpirationTime); + const { text: activityExpirationTime } = formatActivityExpirationTime( + subPlans?.activityExpirationTime + ); return ( <> diff --git a/projects/app/src/pageComponents/price/utils.ts b/projects/app/src/pageComponents/price/utils.ts index a0bda93da..68ec6b8af 100644 --- a/projects/app/src/pageComponents/price/utils.ts +++ b/projects/app/src/pageComponents/price/utils.ts @@ -2,7 +2,11 @@ import { useTranslation } from 'next-i18next'; export const formatActivityExpirationTime = (date?: Date) => { const { t } = useTranslation(); - if (!date) return ''; + if (!date) { + return { + text: '' + }; + } const formatDate = new Date(date); const year = formatDate.getFullYear(); @@ -10,11 +14,13 @@ export const formatActivityExpirationTime = (date?: Date) => { const day = formatDate.getDate(); const hour = formatDate.getHours().toString().padStart(2, '0'); const minute = formatDate.getMinutes().toString().padStart(2, '0'); - return t('common:support.wallet.subscription.Activity expiration time', { - year, - month, - day, - hour, - minute - }); + return { + text: t('common:support.wallet.subscription.Activity expiration time', { + year, + month, + day, + hour, + minute + }) + }; };