11

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -125,10 +125,10 @@ create.Page({
           this.conflict()
         }
       } else {
-        if (new Date(e.time).getTime() < new Date(this.data.time1).getTime()) {
+        if (new Date(e.time).getTime() <= new Date(this.data.time1).getTime()) {
           dd.alert({
             title: '提示',
-            content: '会议结束时间不能小于开始时间',
+            content: '会议结束时间不能小于等于开始时间',
             buttonText: '我知道了',
             success: () => {
             },
@@ -382,8 +382,8 @@ create.Page({
         title: res.data.data.title,
         time1: res.data.data.startTime.replace(/-/g, '/'),
         time2: res.data.data.endTime.replace(/-/g, '/'),
-        week1: this.data.weekList[new Date(res.data.data.startTime).getDay()],
-        week2: this.data.weekList[new Date(res.data.data.endTime).getDay()]
+        week1: this.data.weekList[new Date(res.data.data.startTime.replace(/\//g, "-")).getDay()],
+        week2: this.data.weekList[new Date(res.data.data.endTime.replace(/\//g, "-")).getDay()]
       })
       console.log(2222222)
       // this.store(JSON.stringify())

pages/repetitionTime/repetitionTime.js

@@ -115,7 +115,7 @@ create.Page({
     let month = data[1];
     let day = data[2] + 1;
     let date = new Date(year, month, day);
-    let count = this.getMonthLength(year, month, day);
+    let count = this.getMonthLength(year, month, 1);
     let timeDay = [];
     for (let i = 1; i <= count; i++) {
       let week = weekList[new Date(year,month,i).getDay()]
@@ -133,7 +133,8 @@ create.Page({
       month: month + 1,
       day: day,
       week: weekList[date.getDay()],
-      isBeOverdue: isBeOverdue
+      isBeOverdue: isBeOverdue,
+      pickerValue: [data[0],data[1],data[2]]
     })
     // let weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
     // if (this.data.timeYear[data[0]] == this.data.year && this.data.timeMonth[data[1]] == this.data.month) {