fix: getDaysBetweenDatesWithAutoRenewal

This commit is contained in:
hamster1963 2024-12-20 01:12:24 +08:00
parent b8f991a80b
commit 3c7640cc82
3 changed files with 13 additions and 2 deletions

BIN
bun.lockb

Binary file not shown.

View File

@ -1,5 +1,5 @@
import { useQuery } from "@tanstack/react-query" import { useQuery } from "@tanstack/react-query"
import React, { useEffect } from "react" import React, { useEffect, useState } from "react"
import { useTranslation } from "react-i18next" import { useTranslation } from "react-i18next"
import { Route, BrowserRouter as Router, Routes } from "react-router-dom" import { Route, BrowserRouter as Router, Routes } from "react-router-dom"
@ -21,10 +21,12 @@ const App: React.FC = () => {
refetchOnWindowFocus: true, refetchOnWindowFocus: true,
}) })
const { i18n } = useTranslation() const { i18n } = useTranslation()
const [isCustomCodeInjected, setIsCustomCodeInjected] = useState(false)
useEffect(() => { useEffect(() => {
if (settingData?.data?.custom_code) { if (settingData?.data?.custom_code) {
InjectContext(settingData?.data?.custom_code) InjectContext(settingData?.data?.custom_code)
setIsCustomCodeInjected(true)
} }
}, [settingData?.data?.custom_code]) }, [settingData?.data?.custom_code])
@ -36,6 +38,10 @@ const App: React.FC = () => {
return null return null
} }
if (!isCustomCodeInjected) {
return null
}
if (settingData?.data?.language && !localStorage.getItem("language")) { if (settingData?.data?.language && !localStorage.getItem("language")) {
i18n.changeLanguage(settingData?.data?.language) i18n.changeLanguage(settingData?.data?.language)
} }

View File

@ -18,7 +18,12 @@ export default function BillingInfo({ parsedData }: { parsedData: PublicNoteData
if (parsedData.billingDataMod.endDate.startsWith("0000-00-00")) { if (parsedData.billingDataMod.endDate.startsWith("0000-00-00")) {
isNeverExpire = true isNeverExpire = true
} else { } else {
daysLeftObject = getDaysBetweenDatesWithAutoRenewal(parsedData.billingDataMod) try {
daysLeftObject = getDaysBetweenDatesWithAutoRenewal(parsedData.billingDataMod)
} catch (error) {
console.error(error)
return <div className={cn("text-[10px] text-muted-foreground text-red-600")}>剩余时间: 计算出错</div>
}
} }
} }