修改编辑会议时间选择

pages/createOrEditSchedule/createOrEditSchedule.axml

@@ -106,8 +106,8 @@
       </view>
     </view>
     <view class="terminationTime" onTap="selectTerminal">
-      <text a:if="{{!recurrenceModel.terminateTime}}">永不截止</text>
-      <text a:else>截止至{{recurrenceModel.terminateTime.substring(0,10)}}</text>
+      <text a:if="{{isMeetingNeverStop}}">永不截止</text>
+      <text a:else>截止至{{recurrenceModel.terminateTime}}</text>
     </view>
   </view>.
   <!--<view class="repeatTime"><view class="iconfont iconchongfu "></view><view class="repeatText">

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -213,9 +213,23 @@ create.Page({
     }
     return Object.values(containt)
   },
+  // 获取两年后的今天
+  getTwoYearToday(){
+    let date = new Date()
+    date.setYear(date.getFullYear() + 2)
+    let year = date.getFullYear();
+    let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
+    let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+    return year + '-' + month + '-' + day
+  },
   // 保存
   saveCreate() {
     if (!!this.data.scheduleItem) {
+      if (this.store.data.isMeetingNeverStop) {
+        this.store.data.recurrenceModel.terminateTime = this.getTwoYearToday();
+        this.store.data.recurrenceModel.forever = '1';
+        this.update()
+      }
       let data = {
         shcheduleType: 'common',
         deleteUserList: this.data.deleteUserList,
@@ -387,18 +401,19 @@ create.Page({
   },
   // 选择终止时间
   selectTerminal() {
-    let time2 = this.data.time2
-    dd.datePicker({
-      format: 'yyyy-MM-dd',
-      currentDate: '',
-      success: (res) => {
-        this.store.data.recurrenceModel.terminateTime = `${res.date} `
-        this.update()
-      },
-      error: (err) => {
-        console.log(JSON.stringify(err))
-      }
-    })
+    // let time2 = this.data.time2
+    // dd.datePicker({
+    //   format: 'yyyy-MM-dd',
+    //   currentDate: '',
+    //   success: (res) => {
+    //     this.store.data.recurrenceModel.terminateTime = `${res.date} `
+    //     this.update()
+    //   },
+    //   error: (err) => {
+    //     console.log(JSON.stringify(err))
+    //   }
+    // })
+    dd.navigateTo(({ url: `./../repetitionTime/repetitionTime` }))
   },
   // 数组取差值 原先的数组与现在的比较 增加与减少
   arrayPoor(origin, now) {

pages/repeatMechanism/repeatMechanism.js

@@ -41,6 +41,7 @@ create.Page({
         this.store.data.recurrenceModel = { model: "day_in_week", weekDayList: weekDayList, terminateTime: '' }
         break;
     }
+    this.store.data.isMeetingNeverStop = true
     this.update()
     dd.navigateBack({
       delta: 1

pages/repetitionTime/repetitionTime.js

-Page({
+import create from 'dd-store'
+import exampleStore from '/stores/exampleStore'
+create.Page({
+  store: exampleStore,
+  useAll: true,
   data: {
     timeYear: [],
     timeMonth: ['01','02','03','04','05','06','07','08','09','10','11','12'],
@@ -12,31 +16,60 @@ Page({
     isBeOverdue: false,
   },
   onLoad() {
-    let date = new Date();
-    let year = date.getFullYear();
-    let timeYear = [`${year}年`, `${year + 1}年`]
-    let timeMonth = []
-    let timeDay = []
-    let thisDate = date.getDate()
-    let weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
-    for (let i = 1; i <= 12;i++) {
-      timeMonth.push(`${i}月`)
-    }
-    let day = this.getMonthLength(year,date.getMonth(),1)
-    for (let i = 1;i <= day;i++) {
-      let thisweek = weekList[new Date(year,date.getMonth(),i).getDay()]
-      timeDay.push(`${i}日 ${thisweek}`)
+    if (!this.store.data.recurrenceModel.terminateTime || this.store.data.recurrenceModel.forever == '1') {
+      let date = new Date();
+      let year = date.getFullYear();
+      let timeYear = [`${year}年`, `${year + 1}年`]
+      let timeMonth = []
+      let timeDay = []
+      let thisDate = date.getDate()
+      let weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+      for (let i = 1; i <= 12;i++) {
+        timeMonth.push(`${i}月`)
+      }
+      let day = this.getMonthLength(year,date.getMonth(),1)
+      for (let i = 1;i <= day;i++) {
+        let thisweek = weekList[new Date(year,date.getMonth(),i).getDay()]
+        timeDay.push(`${i}日 ${thisweek}`)
+      }
+      this.setData({
+        timeYear: timeYear,
+        timeMonth: timeMonth,
+        timeDay: timeDay,
+        year: year,
+        month: date.getMonth()+1,
+        day: thisDate,
+        week: weekList[date.getDay()],
+        pickerValue: [timeYear.indexOf(`${date.getFullYear()}年`),timeMonth.indexOf(`${date.getMonth()+1}月`),timeDay.indexOf(`${date.getDate()}日 ${weekList[date.getDay()]}`)]
+      })
+    } else {
+      let date = new Date();
+      let date2 = new Date(this.store.data.recurrenceModel.terminateTime.replace(/-/g, '/'))
+      let year = date.getFullYear();
+      let timeYear = [`${year}年`, `${year + 1}年`]
+      let timeMonth = []
+      let timeDay = []
+      let thisDate = date2.getDate()
+      let weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+      for (let i = 1; i <= 12;i++) {
+        timeMonth.push(`${i}月`)
+      }
+      let day = this.getMonthLength(year,date2.getMonth(),1)
+      for (let i = 1;i <= day;i++) {
+        let thisweek = weekList[new Date(year,date2.getMonth(),i).getDay()]
+        timeDay.push(`${i}日 ${thisweek}`)
+      }
+      this.setData({
+        timeYear: timeYear,
+        timeMonth: timeMonth,
+        timeDay: timeDay,
+        year: year,
+        month: date2.getMonth()+1,
+        day: thisDate,
+        week: weekList[date2.getDay()],
+        pickerValue: [timeYear.indexOf(`${date2.getFullYear()}年`),timeMonth.indexOf(`${date2.getMonth()+1}月`),timeDay.indexOf(`${date2.getDate()}日 ${weekList[date2.getDay()]}`)]
+      })
     }
-    this.setData({
-      timeYear: timeYear,
-      timeMonth: timeMonth,
-      timeDay: timeDay,
-      year: year,
-      month: date.getMonth()+1,
-      day: thisDate,
-      week: weekList[date.getDay()],
-      pickerValue: [timeYear.indexOf(`${date.getFullYear()}年`),timeMonth.indexOf(`${date.getMonth()+1}月`),timeDay.indexOf(`${date.getDate()}日 ${weekList[date.getDay()]}`)]
-    })
   },
   getMonthLength(year, month ,day) {
     let d = new Date(year, month ,day)
@@ -57,10 +90,17 @@ Page({
       return false;
     } else {
       if (this.data.isNeverStop) {
-        console.log(this.getTwoYearToday())
+        let data = this.getTwoYearToday();
+        this.store.data.isMeetingNeverStop = true;
+        this.store.data.recurrenceModel.terminateTime = data
       } else {
-
+        this.store.data.isMeetingNeverStop = false;
+        this.store.data.recurrenceModel.terminateTime = `${this.data.year}-${this.data.month<10 ? '0' + this.data.month: this.data.month}-${this.data.day<10 ? '0'+ this.data.day : this.data.day}`
       }
+      this.update();
+      dd.navigateBack({
+        delta: 1
+      })
     }
   },
   getTwoYearToday(){

stores/exampleStore.js

@@ -13,7 +13,8 @@ class Store {
         editList: [{ icon: 'icondingwei', text: '地点' }, { icon: 'iconhuiqiantixing', text: '提醒' }, { icon: 'iconchongfu', text: '重复' }, { icon: 'icondidianmiaoshu', text: '描述' }, { icon: 'iconshanchu', text: '删除' }],
         remark: '', // 会议描述
         aheadTimes: [],
-        requireUserList: []
+        requireUserList: [],
+        isMeetingNeverStop: true
     }
 
 }