Skip to content

S
schedule
Commit a2d14732 by liang ce
Options

首页修改

parent a075e286
Showing with 8 additions and 8 deletions
pages/index/index.js
...@@ -28,7 +28,6 @@ Page({ ...@@ -28,7 +28,6 @@ Page({
let year = now.getFullYear(); let year = now.getFullYear();
let scheduleList = []; let scheduleList = [];
for (let i = 0; i<= year - 2019; i++) { for (let i = 0; i<= year - 2019; i++) {
console.log(2019 + i)
scheduleList.push(that.returnScheduleList(2019 + i)) scheduleList.push(that.returnScheduleList(2019 + i))
} }
const today = new Date() const today = new Date()
...@@ -90,12 +89,14 @@ Page({ ...@@ -90,12 +89,14 @@ Page({
let date2 = this.data.AllScheduleList[y].endTime.slice(0, 10).replace(/-/g, '/') let date2 = this.data.AllScheduleList[y].endTime.slice(0, 10).replace(/-/g, '/')
let count = this.count(date1, date2) let count = this.count(date1, date2)
if (count == 0) { if (count == 0) {
DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime.replace(/-/g, '/')).toLocaleDateString()}`).scheduleList.push({ if (DateMap.get(new Date(time.getFullYear(), time.getMonth(), time.getDate()).toLocaleDateString())){
...this.data.AllScheduleList[y], DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime.replace(/-/g, '/')).toLocaleDateString()}`).scheduleList.push({
thisDayStartTime: this.data.AllScheduleList[y].startTime.slice(11, 16), ...this.data.AllScheduleList[y],
thisDayEndTime: this.data.AllScheduleList[y].endTime.slice(11, 16), thisDayStartTime: this.data.AllScheduleList[y].startTime.slice(11, 16),
isBeOverdue: new Date().getTime() > new Date(this.data.AllScheduleList[y].endTime.replace(/-/g, '/')).getTime() ? true : false 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 { } else {
for (let j = 0; j <= count; j++) { for (let j = 0; j <= count; j++) {
let time = new Date(date1); let time = new Date(date1);
...@@ -121,7 +122,6 @@ Page({ ...@@ -121,7 +122,6 @@ Page({
type: 'year', type: 'year',
value: year value: year
}) })
console.log(DateMap)
DateMap.forEach(function (value, key, map) { DateMap.forEach(function (value, key, map) {
if (new Date(key).getDay() === 0 && that.count(key, new Date(year, 0, isLeapYear ? 366 : 365).toLocaleDateString()) >7) { if (new Date(key).getDay() === 0 && that.count(key, new Date(year, 0, isLeapYear ? 366 : 365).toLocaleDateString()) >7) {
listWeek = listWeek + 1 listWeek = listWeek + 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment