Skip to content

S
schedule
Commit 54f4b3f5 by fengzhaoyu
Options

fix:conflict

parent ac379102
Showing with 1 additions and 2 deletions
pages/index/index.js
...@@ -741,7 +741,7 @@ create.Page({ ...@@ -741,7 +741,7 @@ create.Page({
if (maxClickCount == 0) { if (maxClickCount == 0) {
dd.alert({ dd.alert({
content: "版本号207" content: "版本号207"
}); })
maxClickCount = 5; maxClickCount = 5;
} }
} }
......
pages/meetingDetail/meetingDetail.js
...@@ -1073,7 +1073,6 @@ create.Page({ ...@@ -1073,7 +1073,6 @@ create.Page({
this.update() this.update()
this.resetRepeatList() this.resetRepeatList()
if (this.data.recurrenceModel.model === 'weekly' && this.data.recurrenceModel.weekDayList.length === 1) { if (this.data.recurrenceModel.model === 'weekly' && this.data.recurrenceModel.weekDayList.length === 1) {
let dataRepeat4 = { let dataRepeat4 = {
startTime: this.$store.data.startTime.replace(/\//g, "-"), startTime: this.$store.data.startTime.replace(/\//g, "-"),
endTime: this.$store.data.endTime.replace(/\//g, "-"), endTime: this.$store.data.endTime.replace(/\//g, "-"),
......
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