From fddd5edef7caa8e46153c94be44e23bbfa1f2227 Mon Sep 17 00:00:00 2001
From: hamster1963 <1410514192@qq.com>
Date: Mon, 9 Dec 2024 11:18:41 +0800
Subject: [PATCH] fix: billing text
---
bun.lockb | Bin 173972 -> 173972 bytes
package.json | 10 +++++-----
src/components/ServerCard.tsx | 2 +-
src/components/ServerCardInline.tsx | 8 ++++++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/bun.lockb b/bun.lockb
index dd801a42e4c2bff72f1af06150af7c9eef9448b9..f353c620640f797488362794c83c55a2b064fd6a 100755
GIT binary patch
delta 5071
zcmeHLX;f547Jl`h6CT=%q7ek#KxAzZkcOzV#Bp3&6vd>~BpwK&Xe2C+32GEHBJQH4
zmTPbixDK|aMFN`WsNe=FJE$?^f}##djL{ICue$p=jB)0i`8PkN&iT%*@7`Ot?yXzh
z@4UC>lI@yHwpprfhn}T>qA1X8%AK9MrpP;N_LK#koi4m}?zs1$HP$+XZDZcZV^(Pu
zJp@4#g!JUtn7HWV6#W=c=Fu@Jf*^Ev6NJ{V{{@o!$^Hedg3t!Mx~Cv?gbZ;Pgtm|+
z;9M41q@tJEZ=Z$FgXHVBn7MuWN{eDrfNxB~^n_%6PdeY)J?)IA*$?WJsqwJ_WOQ3eNMN?IQ@bkjb&A%Xg|i7W^%)_Z5Uz
zkTH6F%FM)AAs!t0MWzR<1i>DL32@{N^1|r}lcM!;g0K*Qm3-lJeJajLh{M704T+z5
z!^x2Cz{f*!zi>Y~OVLGX=pzUnK%@MjHWVsqTiK2IVfV*tK05fG--y#ypSn((LKn63
zFdS`{P7D$DcU|eP@AyfZ(4~G@Wl#HbS4-Ey0%Rt(ccs$?hmvrb8?2FTBP;IMo;JCv
zC0{g+JDQjnXqtk*zMO9CFFE~_sh-PSEv!YGzYQ<3WR72xE
z`$?I6X42<5tI28F5TcRn(b)keT~b%IA_7c9_q+C!R=(8d^-xRax!%08i&|>sAqamm
zu|7y|6j-nvLCOR($HN}dsh2kH+5D0qfYa3{627!3Ce)imLh^TCFK
zy=giUB@6>)CVu8e@4XW$eG4VOC)f`M+H7&ba1PsenChMd6>Ry3u%2fg8BLp_Gsy`0Bc=G{^yL+-GZ18A_T
zAC1ej4DTylLe(1t!<+M5P0vr7XJ
zY5;DjFV?x6~rQ4#Sm?Yv%F9lZA6PvYqn;J0
zuTn{uS7^xwS`8Llh59PBWD{LniTc1EfNh~6Rj98T^;Ky}Hf;bKT7&wkwPYLJP>uS)
zeh1q@ht;6ITGUsgCA;WTuyJ*$uU1RGqPev?gH3&g^}w6%S<|v_YF2q`N2M0L`{jc1
z54u#9?Z^pnroGS3>aBRM@$~E)11_c?-s<;o->A^}hZ^FZDjEZ?te6<}eCk4vd7J2k
z?;X<4O+Oj9ciVjLW%Iw=nR`u0{_gA>-LmZ-b*PMRIZ)bRiR03Ed;Q^Ow~{vI)r@}Z
z_?4rf>!FIBqo?1_E^nQt<#T7AH{xi6+cF(@^(X!@beZlISk!!u1S3UaKZ_Ti=
zA8#mqQQYrx*3;)98|j?Oov%3_3_4is|K;!nFLpLw+j`6G_`CI2tQt=#*j&S$n>l0C
z7LGf!B=r2Qn37I=^NSWeEPk94)y848lbzEc+Tc@Owkb%F=sWLflhf9q+H$8C4(oKw
zG>xm9=c+bZc{DDV>z>*oy@Qy`!#ettW0mQH7Vd5svU>mMW!UnTResGm|It>}F_%iS
zb~r^3(ONAz?dYhwf7$=+uIqbK?b05K*X{4b*53SUVr5>@Fk_*bWJ)YCj6~qEWi57h
zGY$_Uwh|}CoZ-Z761ii{KR~>#dYaA!oAW>AV?Y7$4NwRa0mp$8M(GfFLi+G02LJcq
z|Ev5@`5EvV&gxeYk!dupY?f
zMJ`2Zoa^PmljWy+2sjLw_F+lKNIzy*L~POu
zpyR$=|ElDd=~dkci%!<_ZhZS1KiSSNBcJnO+8g{dV9~q(i$Qk!!y-1m0JqYddqx3?
zv`p&@h|^%MJrBs0bN=eQ6uL`*ya8{=#g=|-z&9jdw4C4xnB*ko;^d{gV0qs1@VKAM
zWxJkz`wg+TBwLLgT;v^UTSTeH+@xoog~Z8IcHxJ>gUVfa8B|`%;tNUFcCx$dmcq6a
zl0lX|Zxs@6N%lxFIu?-x1zBfYe3Jaoo`qf`UD%Hmq_eotm9?oPBSh-TKBy!P&hlIA
z&PT>uvsWh_70EnmF=k{UShE;^Q$EeZpE&G;DXYj1KeC0xRKR};q|`5Q!Shxz5VcijH_
zKV!>ZC0a*ytdYtaeiVrpn#YHt7n@s+b3}gYtI0%ZyQlg4z&`c@A?^Q|?h)o)LmZ_d
z_(?dCGc3G@go~M8Y;z47CVy^tlKy;X#QCVlNWmWsLwOT?SSk0AKR7Jd8dWi%$D4EE
zfrhI3;y=)bS=XYK89t^~+GhBeTZx8^sl}y;_hnnr;vo4`#j;4<&h-a397lw{IArYc
z+V%wU<45d=mKgo(h`$)DVu^JqoA|LMb!4)0IDA^89O-zr%21YZM--kA3u0y1$I}f{E>iQV9V=?x8e*Ek(lN_>1bQZr-+Ko>*}#<
zls~h(MjY7Ho1{Ja_PJ|-@9(v0b`$!yz5aWRV+BHFNof#NE5T`Ru9oHb%+
zqedfokgvnUc}k<#DDkNk31DuK;xverk>Uhq@DaNkZO4kfV_4)wu^T%PCceog?iTG^
K(Dl2;=6?Y4KeEOE
delta 5012
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
diff --git a/package.json b/package.json
index 1474497..0cb36c9 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.1",
- "@tanstack/react-query": "^5.62.2",
- "@tanstack/react-query-devtools": "^5.62.2",
+ "@tanstack/react-query": "^5.62.3",
+ "@tanstack/react-query-devtools": "^5.62.3",
"@tanstack/react-table": "^8.20.5",
"@types/d3-geo": "^3.1.0",
"@types/luxon": "^3.4.2",
@@ -38,15 +38,15 @@
"react-i18next": "^15.1.3",
"react-router-dom": "^7.0.2",
"recharts": "^2.14.1",
- "sonner": "^1.7.0",
+ "sonner": "^1.7.1",
"tailwind-merge": "^2.5.5",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
"@eslint/js": "^9.16.0",
"@types/node": "^22.10.1",
- "@types/react": "^19.0.0",
- "@types/react-dom": "^19.0.0",
+ "@types/react": "^19.0.1",
+ "@types/react-dom": "^19.0.1",
"@vitejs/plugin-react-swc": "^3.7.2",
"autoprefixer": "^10.4.20",
"eslint": "^9.16.0",
diff --git a/src/components/ServerCard.tsx b/src/components/ServerCard.tsx
index ac22bfd..5065b67 100644
--- a/src/components/ServerCard.tsx
+++ b/src/components/ServerCard.tsx
@@ -50,7 +50,7 @@ export default function ServerCard({
} else {
daysLeft = getDaysBetweenDates(
parsedData.billingDataMod.endDate,
- new Date().toISOString(),
+ new Date(now).toISOString(),
);
}
}
diff --git a/src/components/ServerCardInline.tsx b/src/components/ServerCardInline.tsx
index 4f0fc73..0c9e92a 100644
--- a/src/components/ServerCardInline.tsx
+++ b/src/components/ServerCardInline.tsx
@@ -57,7 +57,7 @@ export default function ServerCardInline({
} else {
daysLeft = getDaysBetweenDates(
parsedData.billingDataMod.endDate,
- new Date().toISOString(),
+ new Date(now).toISOString(),
);
}
}
@@ -94,7 +94,11 @@ export default function ServerCardInline({
{parsedData &&
(daysLeft >= 0 ? (
-
+
剩余时间: {isNeverExpire ? "永久" : daysLeft + "天"}
) : (