diff --git a/src/components/ServerCard.tsx b/src/components/ServerCard.tsx index fa73c41..94c9048 100644 --- a/src/components/ServerCard.tsx +++ b/src/components/ServerCard.tsx @@ -79,9 +79,9 @@ export default function ServerCard({ now, serverInfo }: { now: number; serverInf
) : parsedData.billingDataMod.amount === "0" ? (免费
- ) : ( + ) : parsedData.billingDataMod.amount === "-1" ? (按量收费
- )} + ) : null} > ) : ( <> @@ -95,9 +95,9 @@ export default function ServerCard({ now, serverInfo }: { now: number; serverInf ) : parsedData.billingDataMod.amount === "0" ? (免费
- ) : ( + ) : parsedData.billingDataMod.amount === "-1" ? (按量收费
- )} + ) : null} > ))} {parsedData?.planDataMod && ( @@ -215,9 +215,9 @@ export default function ServerCard({ now, serverInfo }: { now: number; serverInf ) : parsedData.billingDataMod.amount === "0" ? (免费
- ) : ( + ) : parsedData.billingDataMod.amount === "-1" ? (按量收费
- )} + ) : null} > ) : ( <> @@ -231,9 +231,9 @@ export default function ServerCard({ now, serverInfo }: { now: number; serverInf ) : parsedData.billingDataMod.amount === "0" ? (免费
- ) : ( + ) : parsedData.billingDataMod.amount === "-1" ? (按量收费
- )} + ) : null} > ))} {parsedData?.planDataMod && ( diff --git a/src/components/ServerCardInline.tsx b/src/components/ServerCardInline.tsx index ddaccc8..9a79d3c 100644 --- a/src/components/ServerCardInline.tsx +++ b/src/components/ServerCardInline.tsx @@ -93,9 +93,9 @@ export default function ServerCardInline({ ) : parsedData.billingDataMod.amount === "0" ? (免费
- ) : ( + ) : parsedData.billingDataMod.amount === "-1" ? (按量收费
- )} + ) : null} > ) : ( <> @@ -109,9 +109,9 @@ export default function ServerCardInline({ ) : parsedData.billingDataMod.amount === "0" ? (免费
- ) : ( + ) : parsedData.billingDataMod.amount === "-1" ? (按量收费
- )} + ) : null} > ))} {parsedData?.planDataMod && ( @@ -254,9 +254,9 @@ export default function ServerCardInline({ ) : parsedData.billingDataMod.amount === "0" ? (免费
- ) : ( + ) : parsedData.billingDataMod.amount === "-1" ? (按量收费
- )} + ) : null} > ) : ( <> @@ -270,9 +270,9 @@ export default function ServerCardInline({ ) : parsedData.billingDataMod.amount === "0" ? (免费
- ) : ( + ) : parsedData.billingDataMod.amount === "-1" ? (按量收费
- )} + ) : null} > ))} {parsedData?.planDataMod && ( diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 2510011..d04c9be 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -138,8 +138,8 @@ interface PlanData { } interface PublicNoteData { - billingDataMod: BillingData - planDataMod: PlanData + billingDataMod?: BillingData + planDataMod?: PlanData } export function parsePublicNote(publicNote: string): PublicNoteData | null { @@ -148,6 +148,34 @@ export function parsePublicNote(publicNote: string): PublicNoteData | null { return null } const data = JSON.parse(publicNote) + if (!data.billingDataMod && !data.planDataMod) { + return null + } + if (data.billingDataMod && !data.planDataMod) { + return { + billingDataMod: { + startDate: data.billingDataMod.startDate || "", + endDate: data.billingDataMod.endDate, + autoRenewal: data.billingDataMod.autoRenewal || "", + cycle: data.billingDataMod.cycle || "", + amount: data.billingDataMod.amount || "", + }, + } + } + if (!data.billingDataMod && data.planDataMod) { + return { + planDataMod: { + bandwidth: data.planDataMod.bandwidth || "", + trafficVol: data.planDataMod.trafficVol || "", + trafficType: data.planDataMod.trafficType || "", + IPv4: data.planDataMod.IPv4 || "", + IPv6: data.planDataMod.IPv6 || "", + networkRoute: data.planDataMod.networkRoute || "", + extra: data.planDataMod.extra || "", + }, + } + } + return { billingDataMod: { startDate: data.billingDataMod.startDate || "",