暂存

pages/index/index.js

@@ -28,7 +28,6 @@ Page({
         let year = now.getFullYear();
         let scheduleList = [];
         for (let i = 0; i<= year - 2019; i++) {
-          console.log(2019 + i)
           scheduleList.push(that.returnScheduleList(2019 + i))
         }
         const today = new Date()	
@@ -90,12 +89,14 @@ Page({
       let date2 = this.data.AllScheduleList[y].endTime.slice(0, 10).replace(/-/g, '/')
       let count = this.count(date1, date2)
       if (count == 0) {
-        DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime.replace(/-/g, '/')).toLocaleDateString()}`).scheduleList.push({
-          ...this.data.AllScheduleList[y],
-          thisDayStartTime: this.data.AllScheduleList[y].startTime.slice(11, 16),
-          thisDayEndTime: this.data.AllScheduleList[y].endTime.slice(11, 16),
-          isBeOverdue: new Date().getTime() > new Date(this.data.AllScheduleList[y].endTime.replace(/-/g, '/')).getTime() ? true : false
-        })
+        if (DateMap.get(new Date(time.getFullYear(), time.getMonth(), time.getDate()).toLocaleDateString())){
+          DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime.replace(/-/g, '/')).toLocaleDateString()}`).scheduleList.push({
+            ...this.data.AllScheduleList[y],
+            thisDayStartTime: this.data.AllScheduleList[y].startTime.slice(11, 16),
+            thisDayEndTime: this.data.AllScheduleList[y].endTime.slice(11, 16),
+            isBeOverdue: new Date().getTime() > new Date(this.data.AllScheduleList[y].endTime.replace(/-/g, '/')).getTime() ? true : false
+          })
+        }
       } else {
         for (let j = 0; j <= count; j++) {
           let time = new Date(date1);
@@ -121,7 +122,6 @@ Page({
       type: 'year',
       value: year
     })
-    console.log(DateMap)
     DateMap.forEach(function (value, key, map) {
       if (new Date(key).getDay() === 0 && that.count(key, new Date(year, 0, isLeapYear ? 366 : 365).toLocaleDateString()) >7) {
         listWeek = listWeek + 1