修改重复会议问题

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -112,11 +112,11 @@ create.Page({
     }, 100)
     if (this.store.data.startTime && this.store.data.endTime) {
       var weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
-      var date1 = new Date(this.store.data.startTime);
-      var date2 = new Date(this.store.data.endTime);
+      var date1 = new Date(this.store.data.startTime.replace(/-/g,'/'));
+      var date2 = new Date(this.store.data.endTime.replace(/-/g,'/'));
       this.setData({
-        time1: this.store.data.startTime,
-        time2: this.store.data.endTime,
+        time1: this.store.data.startTime.replace(/-/g,'/'),
+        time2: this.store.data.endTime.replace(/-/g,'/'),
         week1: weekList[date1.getDay()],
         week2: weekList[date2.getDay()]
       })

pages/meetingRoomList/meetingRoomList.js

@@ -612,8 +612,8 @@ create.Page({
     if (this.data.meetingTime.endTime) {
       var endTimeDate = new Date(this.data.meetingTime.endTime.replace(/-/g, '/'))
       endTimeDate.setMinutes(endTimeDate.getMinutes() + 30)
-      this.store.data.startTime = `${startTime}:00`
-      this.store.data.endTime = `${endTimeDate.getFullYear()}-${endTimeDate.getMonth()+1<10 ? '0'+ (endTimeDate.getMonth()+1) : endTimeDate.getMonth()+1}-${endTimeDate.getDate()<10?'0'+endTimeDate.getDate():endTimeDate.getDate()} ${endTimeDate.getHours()<10? '0'+endTimeDate.getHours():endTimeDate.getHours()}:${endTimeDate.getMinutes()<10? '0'+endTimeDate.getMinutes():endTimeDate.getMinutes()}:00`
+      this.store.data.startTime = `${startTime.replace(/-/g,'/')}:00`
+      this.store.data.endTime = `${endTimeDate.getFullYear()}/${endTimeDate.getMonth()+1<10 ? '0'+ (endTimeDate.getMonth()+1) : endTimeDate.getMonth()+1}/${endTimeDate.getDate()<10?'0'+endTimeDate.getDate():endTimeDate.getDate()} ${endTimeDate.getHours()<10? '0'+endTimeDate.getHours():endTimeDate.getHours()}:${endTimeDate.getMinutes()<10? '0'+endTimeDate.getMinutes():endTimeDate.getMinutes()}:00`
       this.store.data.locationName = this.data.meetingTime.meetingRoomName
       this.store.data.roomId = this.data.meetingTime.meetingRoomId
       this.update()

pages/repetitionTime/repetitionTime.js

@@ -92,7 +92,7 @@ create.Page({
     if(this.data.isBeOverdue) {
       return false;
     } else {
-      if (this.store.data.recurrenceModel.forever == '1') {
+      if (this.data.forever == '1') {
         let data = this.getTwoYearToday();
         this.store.data.recurrenceModel.terminateTime = data;
       } else {