Commit fdc5386e by fengzhaoyu

11

parents 6bda4710 8cb18ee4
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<text a:if="{{aheadTimes.includes(30)}}">30分钟前</text> <text a:if="{{aheadTimes.includes(30)}}">30分钟前</text>
<text a:if="{{aheadTimes.includes(60)}}">1小时前</text> <text a:if="{{aheadTimes.includes(60)}}">1小时前</text>
<text a:if="{{aheadTimes.includes(1440)}}">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 a:if="{{aheadTimes.includes(10080)}}">1周前</text>
提醒 提醒
</text> </text>
...@@ -112,8 +112,8 @@ ...@@ -112,8 +112,8 @@
<view class="iconfont iconshanchu" data-icon="iconchongfu" catchTap="closeEditList"> <view class="iconfont iconshanchu" data-icon="iconchongfu" catchTap="closeEditList">
</view> </view>
</view> </view>
<view class="terminationTime" onTap="selectTerminal"> <view class="terminationTime" onTap="selectTerminal" a:if="{{ recurrenceModel.model !== 'no_repeat' }}">
<text a:if="{{isMeetingNeverStop}}">永不截止</text> <text a:if="{{recurrenceModel.forever == '1'}}">永不截止</text>
<text a:else>截止至{{recurrenceModel.terminateTime}}</text> <text a:else>截止至{{recurrenceModel.terminateTime}}</text>
</view> </view>
</view>. </view>.
......
...@@ -49,8 +49,8 @@ create.Page({ ...@@ -49,8 +49,8 @@ create.Page({
var h = date.getHours() var h = date.getHours()
var min = date.getMinutes(); var min = date.getMinutes();
this.setData({ this.setData({
time1: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 30 ? '00' : '30'}`, 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'}`, 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, week1: w,
week2: w, week2: w,
type: event.type, type: event.type,
...@@ -105,8 +105,8 @@ create.Page({ ...@@ -105,8 +105,8 @@ create.Page({
var h = date.getHours() var h = date.getHours()
var min = date.getMinutes(); var min = date.getMinutes();
this.setData({ this.setData({
time1: e.time, time1: `${e.time}:00`,
time2: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 10 ? "0" + min : min}`, time2: `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 10 ? "0" + min : min}:00`,
isShowModal: false, isShowModal: false,
week1: w1, week1: w1,
week2: w2 week2: w2
...@@ -115,7 +115,7 @@ create.Page({ ...@@ -115,7 +115,7 @@ create.Page({
} else { } else {
this.setData({ this.setData({
time1: e.time, time1: `${e.time}:00`,
isShowModal: false, isShowModal: false,
week1: w1 week1: w1
}) })
...@@ -132,7 +132,7 @@ create.Page({ ...@@ -132,7 +132,7 @@ create.Page({
}); });
} else { } else {
this.setData({ this.setData({
time2: e.time, time2: `${e.time}:00`,
isShowModal: false, isShowModal: false,
week2: w1 week2: w1
}) })
......
...@@ -41,7 +41,7 @@ create.Page({ ...@@ -41,7 +41,7 @@ create.Page({
this.store.data.recurrenceModel = { model: "day_in_week", weekDayList: weekDayList, terminateTime: '' } this.store.data.recurrenceModel = { model: "day_in_week", weekDayList: weekDayList, terminateTime: '' }
break; break;
} }
this.store.data.isMeetingNeverStop = true this.store.data.recurrenceModel.forever = '1'
this.update() this.update()
dd.navigateBack({ dd.navigateBack({
delta: 1 delta: 1
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</view> </view>
<view class="timeView"> <view class="timeView">
<view> <view>
<text>永不截止</text><switch checked="{{isNeverStop}}" onChange="switchChange"/> <text>永不截止</text><switch checked="{{recurrenceModel.forever == '1'}}" onChange="switchChange"/>
</view> </view>
<view> <view>
<picker-view value="{{pickerValue}}" class="parent" onChange="onChange"> <picker-view value="{{pickerValue}}" class="parent" onChange="onChange">
......
...@@ -81,20 +81,17 @@ create.Page({ ...@@ -81,20 +81,17 @@ create.Page({
return d.getDate() return d.getDate()
}, },
switchChange(e) { switchChange(e) {
this.setData({ this.store.data.recurrenceModel.forever = e.detail.value ? '1' : '0'
isNeverStop: e.detail.value this.update()
})
}, },
save(){ save(){
if(this.data.isBeOverdue) { if(this.data.isBeOverdue) {
return false; return false;
} else { } else {
if (this.data.isNeverStop) { if (this.store.data.recurrenceModel.forever != '1') {
let data = this.getTwoYearToday(); let data = this.getTwoYearToday();
this.store.data.isMeetingNeverStop = true;
this.store.data.recurrenceModel.terminateTime = data this.store.data.recurrenceModel.terminateTime = data
} else { } 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.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(); this.update();
......
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