fix: remaining days

This commit is contained in:
hamster1963
2024-12-19 14:23:16 +08:00
parent bc64628dad
commit 5e6f70ba42
2 changed files with 37 additions and 29 deletions

View File

@@ -109,21 +109,24 @@ export function getDaysBetweenDatesWithAutoRenewal({
}
}
if (nowTime < endTime) {
return {
days: getDaysBetweenDates(endDate, new Date(nowTime).toISOString()),
cycleLabel: cycleLabel,
remainingPercentage:
getDaysBetweenDates(endDate, new Date(nowTime).toISOString()) /
(30 * months) >
1
? 1
: getDaysBetweenDates(endDate, new Date(nowTime).toISOString()) /
(30 * months),
}
}
const nextTime = getNextCycleTime(endTime, months, nowTime)
const diff = dayjs(nextTime).diff(dayjs(), "day") + 1
const remainingPercentage = diff / (30 * months) > 1 ? 1 : diff / (30 * months)
console.log(
"nextTime",
nextTime,
"diff",
diff,
"month",
months,
"remainingPercentage",
remainingPercentage,
)
return {
days: diff,
cycleLabel: cycleLabel,