11

pages/createOrEditSchedule/createOrEditSchedule.axml

@@ -95,7 +95,7 @@
       <text a:if="{{aheadTimes.includes(30)}}">30分钟前</text>
       <text a:if="{{aheadTimes.includes(60)}}">1小时前</text>
       <text a:if="{{aheadTimes.includes(1440)}}">1天前</text>
-      <text a:if="{{aheadTimes.includes(2880)}}">两天前</text>
+      <text a:if="{{aheadTimes.includes(2880)}}">2天前</text>
       <text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
       提醒
     </text>
@@ -112,8 +112,8 @@
       <view class="iconfont iconshanchu" data-icon="iconchongfu" catchTap="closeEditList">
       </view>
     </view>
-    <view class="terminationTime" onTap="selectTerminal">
-      <text a:if="{{isMeetingNeverStop}}">永不截止</text>
+    <view class="terminationTime" onTap="selectTerminal" a:if="{{ recurrenceModel.model !== 'no_repeat' }}">
+      <text a:if="{{recurrenceModel.forever == '1'}}">永不截止</text>
       <text a:else>截止至{{recurrenceModel.terminateTime}}</text>
     </view>
   </view>.

pages/createOrEditSchedule/createOrEditSchedule.js

@@ -49,8 +49,8 @@ create.Page({
     var h = date.getHours()
     var min = date.getMinutes();
     this.setData({
-      time1: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 30 ? '00' : '30'}`,
-      time2: `${y}/${m}/${d} ${min < 30 ? h < 10 ? "0" + date.getHours() : date.getHours() : (h + 1) < 10 ? "0" + (date.getHours() + 1) : date.getHours() + 1}:${min < 30 ? '30' : '00'}`,
+      time1: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 30 ? '00' : '30'}:00`,
+      time2: `${y}/${m}/${d} ${min < 30 ? h < 10 ? "0" + date.getHours() : date.getHours() : (h + 1) < 10 ? "0" + (date.getHours() + 1) : date.getHours() + 1}:${min < 30 ? '30' : '00'}:00`,
       week1: w,
       week2: w,
       type: event.type,
@@ -105,8 +105,8 @@ create.Page({
           var h = date.getHours()
           var min = date.getMinutes();
           this.setData({
-            time1: e.time,
-            time2: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 10 ? "0" + min : min}`,
+            time1: `${e.time}:00`,
+            time2: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 10 ? "0" + min : min}:00`,
             isShowModal: false,
             week1: w1,
             week2: w2
@@ -115,7 +115,7 @@ create.Page({
 
         } else {
           this.setData({
-            time1: e.time,
+            time1: `${e.time}:00`,
             isShowModal: false,
             week1: w1
           })
@@ -132,7 +132,7 @@ create.Page({
           });
         } else {
           this.setData({
-            time2: e.time,
+            time2: `${e.time}:00`,
             isShowModal: false,
             week2: w1
           })

pages/repeatMechanism/repeatMechanism.js

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

pages/repetitionTime/repetitionTime.axml

@@ -11,7 +11,7 @@
 </view>
 <view class="timeView">
   <view>
-    <text>永不截止</text><switch checked="{{isNeverStop}}" onChange="switchChange"/>
+    <text>永不截止</text><switch checked="{{recurrenceModel.forever == '1'}}" onChange="switchChange"/>
   </view>
   <view>
     <picker-view value="{{pickerValue}}" class="parent" onChange="onChange">

pages/repetitionTime/repetitionTime.js

@@ -81,20 +81,17 @@ create.Page({
     return d.getDate()
   },
   switchChange(e) {
-    this.setData({
-      isNeverStop: e.detail.value
-    })
+    this.store.data.recurrenceModel.forever = e.detail.value ? '1' : '0'
+    this.update()
   },
   save(){
     if(this.data.isBeOverdue) {
       return false;
     } else {
-      if (this.data.isNeverStop) {
+      if (this.store.data.recurrenceModel.forever != '1') {
         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();