From 84974f0e786dc4ba4dfbea458dce311a0fbe7354 Mon Sep 17 00:00:00 2001
From: hamster1963 <1410514192@qq.com>
Date: Tue, 17 Dec 2024 11:13:28 +0800
Subject: [PATCH] fix: amount type

---
 src/components/ServerCard.tsx       | 32 ++++++++++++++++++++---------
 src/components/ServerCardInline.tsx | 32 ++++++++++++++++++++---------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/components/ServerCard.tsx b/src/components/ServerCard.tsx
index b0ad92b..fa73c41 100644
--- a/src/components/ServerCard.tsx
+++ b/src/components/ServerCard.tsx
@@ -72,12 +72,15 @@ export default function ServerCard({ now, serverInfo }: { now: number; serverInf
                 <p className={cn("text-[10px] text-muted-foreground")}>
                   剩余时间: {isNeverExpire ? "永久" : daysLeft + "天"}
                 </p>
-                {parsedData.billingDataMod.amount !== "0" ? (
-                  <p className={cn("text-[10px] text-muted-foreground")}>
+                {parsedData.billingDataMod.amount !== "0" &&
+                parsedData.billingDataMod.amount !== "-1" ? (
+                  <p className={cn("text-[10px] text-muted-foreground ")}>
                     价格: {parsedData.billingDataMod.amount}/{parsedData.billingDataMod.cycle}
                   </p>
+                ) : parsedData.billingDataMod.amount === "0" ? (
+                  <p className={cn("text-[10px] text-green-600 ")}>免费</p>
                 ) : (
-                  <p className={cn("text-[10px] text-green-600")}>免费</p>
+                  <p className={cn("text-[10px] text-pink-600 ")}>按量收费</p>
                 )}
               </>
             ) : (
@@ -85,12 +88,15 @@ export default function ServerCard({ now, serverInfo }: { now: number; serverInf
                 <p className={cn("text-[10px] text-muted-foreground text-red-600")}>
                   已过期: {daysLeft * -1} 天
                 </p>
-                {parsedData.billingDataMod.amount !== "0" ? (
+                {parsedData.billingDataMod.amount !== "0" &&
+                parsedData.billingDataMod.amount !== "-1" ? (
                   <p className={cn("text-[10px] text-muted-foreground ")}>
                     价格: {parsedData.billingDataMod.amount}/{parsedData.billingDataMod.cycle}
                   </p>
-                ) : (
+                ) : parsedData.billingDataMod.amount === "0" ? (
                   <p className={cn("text-[10px] text-green-600 ")}>免费</p>
+                ) : (
+                  <p className={cn("text-[10px] text-pink-600 ")}>按量收费</p>
                 )}
               </>
             ))}
@@ -202,12 +208,15 @@ export default function ServerCard({ now, serverInfo }: { now: number; serverInf
                 <p className={cn("text-[10px] text-muted-foreground")}>
                   剩余时间: {isNeverExpire ? "永久" : daysLeft + "天"}
                 </p>
-                {parsedData.billingDataMod.amount !== "0" ? (
-                  <p className={cn("text-[10px] text-muted-foreground")}>
+                {parsedData.billingDataMod.amount !== "0" &&
+                parsedData.billingDataMod.amount !== "-1" ? (
+                  <p className={cn("text-[10px] text-muted-foreground ")}>
                     价格: {parsedData.billingDataMod.amount}/{parsedData.billingDataMod.cycle}
                   </p>
+                ) : parsedData.billingDataMod.amount === "0" ? (
+                  <p className={cn("text-[10px] text-green-600 ")}>免费</p>
                 ) : (
-                  <p className={cn("text-[10px] text-green-600")}>免费</p>
+                  <p className={cn("text-[10px] text-pink-600 ")}>按量收费</p>
                 )}
               </>
             ) : (
@@ -215,12 +224,15 @@ export default function ServerCard({ now, serverInfo }: { now: number; serverInf
                 <p className={cn("text-[10px] text-muted-foreground text-red-600")}>
                   已过期: {daysLeft * -1} 天
                 </p>
-                {parsedData.billingDataMod.amount !== "0" ? (
+                {parsedData.billingDataMod.amount !== "0" &&
+                parsedData.billingDataMod.amount !== "-1" ? (
                   <p className={cn("text-[10px] text-muted-foreground ")}>
                     价格: {parsedData.billingDataMod.amount}/{parsedData.billingDataMod.cycle}
                   </p>
-                ) : (
+                ) : parsedData.billingDataMod.amount === "0" ? (
                   <p className={cn("text-[10px] text-green-600 ")}>免费</p>
+                ) : (
+                  <p className={cn("text-[10px] text-pink-600 ")}>按量收费</p>
                 )}
               </>
             ))}
diff --git a/src/components/ServerCardInline.tsx b/src/components/ServerCardInline.tsx
index 624cc35..ddaccc8 100644
--- a/src/components/ServerCardInline.tsx
+++ b/src/components/ServerCardInline.tsx
@@ -86,12 +86,15 @@ export default function ServerCardInline({
                   <p className={cn("text-[10px] text-muted-foreground")}>
                     剩余时间: {isNeverExpire ? "永久" : daysLeft + "天"}
                   </p>
-                  {parsedData.billingDataMod.amount !== "0" ? (
-                    <p className={cn("text-[10px] text-muted-foreground")}>
+                  {parsedData.billingDataMod.amount !== "0" &&
+                  parsedData.billingDataMod.amount !== "-1" ? (
+                    <p className={cn("text-[10px] text-muted-foreground ")}>
                       价格: {parsedData.billingDataMod.amount}/{parsedData.billingDataMod.cycle}
                     </p>
+                  ) : parsedData.billingDataMod.amount === "0" ? (
+                    <p className={cn("text-[10px] text-green-600 ")}>免费</p>
                   ) : (
-                    <p className={cn("text-[10px] text-green-600")}>免费</p>
+                    <p className={cn("text-[10px] text-pink-600 ")}>按量收费</p>
                   )}
                 </>
               ) : (
@@ -99,12 +102,15 @@ export default function ServerCardInline({
                   <p className={cn("text-[10px] text-muted-foreground text-red-600")}>
                     已过期: {daysLeft * -1} 天
                   </p>
-                  {parsedData.billingDataMod.amount !== "0" ? (
+                  {parsedData.billingDataMod.amount !== "0" &&
+                  parsedData.billingDataMod.amount !== "-1" ? (
                     <p className={cn("text-[10px] text-muted-foreground ")}>
                       价格: {parsedData.billingDataMod.amount}/{parsedData.billingDataMod.cycle}
                     </p>
-                  ) : (
+                  ) : parsedData.billingDataMod.amount === "0" ? (
                     <p className={cn("text-[10px] text-green-600 ")}>免费</p>
+                  ) : (
+                    <p className={cn("text-[10px] text-pink-600 ")}>按量收费</p>
                   )}
                 </>
               ))}
@@ -241,12 +247,15 @@ export default function ServerCardInline({
                 <p className={cn("text-[10px] text-muted-foreground")}>
                   剩余时间: {isNeverExpire ? "永久" : daysLeft + "天"}
                 </p>
-                {parsedData.billingDataMod.amount !== "0" ? (
-                  <p className={cn("text-[10px] text-muted-foreground")}>
+                {parsedData.billingDataMod.amount !== "0" &&
+                parsedData.billingDataMod.amount !== "-1" ? (
+                  <p className={cn("text-[10px] text-muted-foreground ")}>
                     价格: {parsedData.billingDataMod.amount}/{parsedData.billingDataMod.cycle}
                   </p>
+                ) : parsedData.billingDataMod.amount === "0" ? (
+                  <p className={cn("text-[10px] text-green-600 ")}>免费</p>
                 ) : (
-                  <p className={cn("text-[10px] text-green-600")}>免费</p>
+                  <p className={cn("text-[10px] text-pink-600 ")}>按量收费</p>
                 )}
               </>
             ) : (
@@ -254,12 +263,15 @@ export default function ServerCardInline({
                 <p className={cn("text-[10px] text-muted-foreground text-red-600")}>
                   已过期: {daysLeft * -1} 天
                 </p>
-                {parsedData.billingDataMod.amount !== "0" ? (
+                {parsedData.billingDataMod.amount !== "0" &&
+                parsedData.billingDataMod.amount !== "-1" ? (
                   <p className={cn("text-[10px] text-muted-foreground ")}>
                     价格: {parsedData.billingDataMod.amount}/{parsedData.billingDataMod.cycle}
                   </p>
-                ) : (
+                ) : parsedData.billingDataMod.amount === "0" ? (
                   <p className={cn("text-[10px] text-green-600 ")}>免费</p>
+                ) : (
+                  <p className={cn("text-[10px] text-pink-600 ")}>按量收费</p>
                 )}
               </>
             ))}