diff --git a/apps/admin-web/src/api/adminApiTypes.ts b/apps/admin-web/src/api/adminApiTypes.ts index dacf69cf6..f888d5913 100644 --- a/apps/admin-web/src/api/adminApiTypes.ts +++ b/apps/admin-web/src/api/adminApiTypes.ts @@ -2,6 +2,7 @@ import type { ProfileMembershipCycleKind, ProfileMembershipModelAccess, ProfileMembershipPlan, + ProfileMembershipStatus, } from '@genarrative/shared'; export interface ApiMeta { @@ -392,6 +393,7 @@ export type { ProfileMembershipCycleKind, ProfileMembershipModelAccess, ProfileMembershipPlan, + ProfileMembershipStatus, }; export interface AdminTrackingEventListQuery { eventKey?: string; @@ -1057,7 +1059,7 @@ export interface AdminUserDetailResponse { export interface AdminProfileMembershipPayload { plan: ProfileMembershipPlan; /** 与后端 `RuntimeProfileMembershipStatus` 对齐:`normal` / `active`。 */ - status: 'normal' | 'active'; + status: ProfileMembershipStatus; cycleKind: ProfileMembershipCycleKind; cycleIndex: number; cycleCount: number; diff --git a/apps/admin-web/src/config/membershipDisplay.ts b/apps/admin-web/src/config/membershipDisplay.ts index 411f76dca..3a903c5fb 100644 --- a/apps/admin-web/src/config/membershipDisplay.ts +++ b/apps/admin-web/src/config/membershipDisplay.ts @@ -1,6 +1,7 @@ import type { ProfileMembershipCycleKind, ProfileMembershipPlan, + ProfileMembershipStatus, } from '../api/adminApiTypes'; /** 会员档位展示名;`normal` 即非会员。 */ @@ -22,7 +23,7 @@ export const membershipCycleKindLabels: Record< }; /** 会员状态展示名;与后端 `RuntimeProfileMembershipStatus` 的 `normal` / `active` 对齐。 */ -export const membershipStatusLabels: Record = { +export const membershipStatusLabels: Record = { normal: '非会员', active: '生效中', }; @@ -39,5 +40,5 @@ export function formatMembershipCycleKind(kind: string): string { /** 把后端的会员状态 code 映射成展示名,未知值原样返回。 */ export function formatMembershipStatus(status: string): string { - return membershipStatusLabels[status] ?? status; + return membershipStatusLabels[status as ProfileMembershipStatus] ?? status; }