Ver código fonte

refactor(view): 优化时间判断逻辑并移除注释

将结束时间判断逻辑修改为每月20日截止,并移除已过时的注释
张旭伟 1 mês atrás
pai
commit
9df8b3ddfa
1 arquivos alterados com 3 adições e 5 exclusões
  1. 3 5
      src/view/entry/mine.vue

+ 3 - 5
src/view/entry/mine.vue

@@ -477,14 +477,12 @@
     renewalEditRef.value.openDialog('add', row)
   }
 
-// 判断当前时间是否在结束时间之前(没有到期都可以显示)
 const isEndTimeInFirstTenDays = (startTime: string, endTime: string) => {
   if (!startTime || !endTime) return false;
-  const startDate = dayjs(startTime).startOf('day');
-  const endDate = dayjs(endTime).endOf('day');
   const today = dayjs();
-  const todayStart = today.startOf('day');
-  return todayStart.valueOf() >= startDate.valueOf() && todayStart.valueOf() <= endDate.valueOf();
+  const startDate = dayjs(startTime).startOf('day');
+  const endMonth20 = dayjs(endTime).date(20).endOf('day');
+  return today.valueOf() >= startDate.valueOf() && today.valueOf() <= endMonth20.valueOf();
 };
 
   onMounted(() => {