Skip to content

Let's use AI to Earn!

viop

bulaienaofutuojiesenzhangbe4d50ecd90c
diff --git a/src/components/modals/VipContentModal.tsx b/src/components/modals/VipContentModal.tsx
index 12f6717a..43e69886 100644
--- a/src/components/modals/VipContentModal.tsx
+++ b/src/components/modals/VipContentModal.tsx
@@ -35,11 +35,37 @@ const VipContentModal = memo(({ open, onClose }: VipContentModalProps) => {
// 辅助函数处理翻译
const translate = (key: string) => t(key as any);
+ // 状态判断辅助函数
+ const getVipStatusInfo = (status: string) => {
+ switch (status) {
+ case 'none':
+ return { isVip: false, isMonthly: false, isYearly: false, isAutoRenew: false, isOnce: false };
+ case 'trialing':
+ return { isVip: true, isMonthly: false, isYearly: false, isAutoRenew: false, isOnce: false };
+ case 'monthly_once':
+ return { isVip: true, isMonthly: true, isYearly: false, isAutoRenew: false, isOnce: true };
+ case 'yearly_once':
+ return { isVip: true, isMonthly: false, isYearly: true, isAutoRenew: false, isOnce: true };
+ case 'active_monthly':
+ return { isVip: true, isMonthly: true, isYearly: false, isAutoRenew: true, isOnce: false };
+ case 'active_yearly':
+ return { isVip: true, isMonthly: false, isYearly: true, isAutoRenew: true, isOnce: false };
+ case 'active_nonrenewing':
+ return { isVip: true, isMonthly: false, isYearly: false, isAutoRenew: false, isOnce: false };
+ case 'expired':
+ return { isVip: false, isMonthly: false, isYearly: false, isAutoRenew: false, isOnce: false };
+ default:
+ return { isVip: false, isMonthly: false, isYearly: false, isAutoRenew: false, isOnce: false };
+ }
+ };
+
// 判断用户是否为有效会员
const isVip = useMemo(() => {
- return userStore.userInfo?.vipInfo &&
- userStore.userInfo.vipInfo.expireTime &&
- new Date(userStore.userInfo.vipInfo.expireTime) > new Date();
+ const vipInfo = userStore.userInfo?.vipInfo;
+ if (!vipInfo) return false;
+
+ const statusInfo = getVipStatusInfo(vipInfo.status);
+ return statusInfo.isVip && vipInfo.expireTime && new Date(vipInfo.expireTime) > new Date();
}, [userStore.userInfo]);
// 判断用户是否已经是相同类型的会员且未过期
@@ -53,10 +79,11 @@ const VipContentModal = memo(({ open, onClose }: VipContentModalProps) => {
}
const vipInfo = userStore.userInfo.vipInfo;
+ const statusInfo = getVipStatusInfo(vipInfo.status);
return {
- month: vipInfo.cycleType === 1, // 1 是月度
- year: vipInfo.cycleType === 2, // 2 是年度
- once: false // 一次性购买不在此判断范围内
+ month: statusInfo.isMonthly && statusInfo.isAutoRenew, // 连续包月
+ year: statusInfo.isYearly && statusInfo.isAutoRenew, // 连续包年
+ once: statusInfo.isOnce // 一次性购买
};
}, [userStore.userInfo, isVip]);
@@ -215,14 +242,30 @@ const VipContentModal = memo(({ open, onClose }: VipContentModalProps) => {
<div className={vipStyles.planType}>
{translate('modal.vipInfo.planType')}:
<span className={vipStyles.planValue}>
- { userStore.userInfo.vipInfo.cycleType === 2 && ( userStore.userInfo.vipInfo.autoContinue ? translate('modal.vipInfo.yearly') : translate('modal.vipInfo.yearly2'))}
- { userStore.userInfo.vipInfo.cycleType === 1 && ( userStore.userInfo.vipInfo.autoContinue ? translate('modal.vipInfo.monthly') : translate('modal.vipInfo.monthly2'))}
-
- {/* {!userStore.userInfo.vipInfo.autoContinue && ` (${translate('modal.vipInfo.singleMonth')})`} */}
+ {(() => {
+ const statusInfo: any = getVipStatusInfo(userStore.userInfo.vipInfo.status);
+ if (statusInfo.isYearly && statusInfo.isAutoRenew) {
+ return translate('modal.vipInfo.yearly');
+ } else if (statusInfo.isYearly && !statusInfo.isAutoRenew) {
+ return translate('modal.vipInfo.yearly2');
+ } else if (statusInfo.isMonthly && statusInfo.isAutoRenew) {
+ return translate('modal.vipInfo.monthly');
+ } else if (statusInfo.isMonthly && !statusInfo.isAutoRenew) {
+ return translate('modal.vipInfo.monthly2');
+ } else if (statusInfo.isOnce) {
+ return statusInfo.isYearly ? translate('modal.vipInfo.yearly2') : translate('modal.vipInfo.monthly2');
+ } else if (userStore.userInfo.vipInfo.status === 'trialing') {
+ return ` ${translate('modal.vipInfo.trial' as any)}`;
+ }
+ return translate('modal.vipInfo.monthly');
+ })()}
</span>
</div>
<div className={vipStyles.expireTime}>
- { userStore.userInfo.vipInfo.autoContinue ? translate('modal.vipInfo.xufeiTime') : translate('modal.vipInfo.expireTime')}:
+ {(() => {
+ const statusInfo = getVipStatusInfo(userStore.userInfo.vipInfo.status);
+ return statusInfo.isAutoRenew ? translate('modal.vipInfo.xufeiTime') : translate('modal.vipInfo.expireTime');
+ })()}:
<span className={vipStyles.expireValue}>
{new Date(userStore.userInfo.vipInfo.expireTime).toLocaleDateString()}
</span>
@@ -261,7 +304,12 @@ const VipContentModal = memo(({ open, onClose }: VipContentModalProps) => {
{translate('modal.tabs.monthly')} <Tag style={{ marginLeft: 6, border: '1px solid rgba(184,221,255,.08)' }}>{translate('modal.savings.monthly')}</Tag>
</div>
{
- !userStore.userInfo?.vipInfo?.autoContinue && (
+ (() => {
+ const vipInfo = userStore.userInfo?.vipInfo;
+ if (!vipInfo) return true;
+ const statusInfo = getVipStatusInfo(vipInfo.status);
+ return !statusInfo.isAutoRenew;
+ })() && (
<div onClick={() => handleTabClick('once')} className={`${vipStyles.switchBtn} ${activeTab === 'once' ? vipStyles.active : ''}`}>
{translate('modal.tabs.once')}
</div>
@@ -304,9 +352,9 @@ const VipContentModal = memo(({ open, onClose }: VipContentModalProps) => {
className={vipStyles.primaryBtn}
onClick={() => handleActivate('year')}
loading={loading}
- disabled={isCurrentPlan.year&& userStore.userInfo?.vipInfo?.autoContinue}
+ disabled={isCurrentPlan.year}
>
- {(isCurrentPlan.year && userStore.userInfo?.vipInfo?.autoContinue) ? translate('currentPlan') : translate('modal.plans.goumai')}
+ {isCurrentPlan.year ? translate('currentPlan') : translate('modal.plans.goumai')}
</Button>
<div className={vipStyles.benefitBox}><span className={vipStyles.dot} /> {translate('modal.plans.yearly.points')}</div>
<div className={vipStyles.subDesc}>{translate('modal.plans.yearly.description')}</div>
@@ -353,9 +401,9 @@ const VipContentModal = memo(({ open, onClose }: VipContentModalProps) => {
className={vipStyles.primaryBtn}
onClick={() => handleActivate('month')}
loading={loading}
- disabled={isCurrentPlan.month&& userStore.userInfo?.vipInfo?.autoContinue}
+ disabled={isCurrentPlan.month}
>
- {(isCurrentPlan.month && userStore.userInfo?.vipInfo?.autoContinue) ? translate('currentPlan') : translate('modal.plans.goumai')}
+ {isCurrentPlan.month ? translate('currentPlan') : translate('modal.plans.goumai')}
</Button>
<div className={vipStyles.benefitBox}><span className={vipStyles.dot} /> {translate('modal.plans.monthly.points')}</div>
<div className={vipStyles.subDesc}>{translate('modal.plans.monthly.description')}</div>