Commit bfc0f545 by liang ce

修改bug,时间,进入后兼容问题

parent 6d85036c
...@@ -122,10 +122,10 @@ create.Page({ ...@@ -122,10 +122,10 @@ create.Page({
this.conflict() this.conflict()
} }
} else { } else {
if (new Date(e.time).getTime() < new Date(this.data.time1).getTime()) { if (new Date(e.time).getTime() <= new Date(this.data.time1).getTime()) {
dd.alert({ dd.alert({
title: '提示', title: '提示',
content: '会议结束时间不能小于开始时间', content: '会议结束时间不能小于等于开始时间',
buttonText: '我知道了', buttonText: '我知道了',
success: () => { success: () => {
}, },
...@@ -355,8 +355,8 @@ create.Page({ ...@@ -355,8 +355,8 @@ create.Page({
title: res.data.data.title, title: res.data.data.title,
time1: res.data.data.startTime.replace(/-/g, '/'), time1: res.data.data.startTime.replace(/-/g, '/'),
time2: res.data.data.endTime.replace(/-/g, '/'), time2: res.data.data.endTime.replace(/-/g, '/'),
week1: this.data.weekList[new Date(res.data.data.startTime).getDay()], week1: this.data.weekList[new Date(res.data.data.startTime.replace(/\//g, "-")).getDay()],
week2: this.data.weekList[new Date(res.data.data.endTime).getDay()] week2: this.data.weekList[new Date(res.data.data.endTime.replace(/\//g, "-")).getDay()]
}) })
this.update() this.update()
this.conflict() this.conflict()
......
...@@ -115,7 +115,7 @@ create.Page({ ...@@ -115,7 +115,7 @@ create.Page({
let month = data[1]; let month = data[1];
let day = data[2] + 1; let day = data[2] + 1;
let date = new Date(year, month, day); let date = new Date(year, month, day);
let count = this.getMonthLength(year, month, day); let count = this.getMonthLength(year, month, 1);
let timeDay = []; let timeDay = [];
for (let i = 1; i <= count; i++) { for (let i = 1; i <= count; i++) {
let week = weekList[new Date(year,month,i).getDay()] let week = weekList[new Date(year,month,i).getDay()]
...@@ -133,7 +133,8 @@ create.Page({ ...@@ -133,7 +133,8 @@ create.Page({
month: month + 1, month: month + 1,
day: day, day: day,
week: weekList[date.getDay()], week: weekList[date.getDay()],
isBeOverdue: isBeOverdue isBeOverdue: isBeOverdue,
pickerValue: [data[0],data[1],data[2]]
}) })
// let weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'] // let weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
// if (this.data.timeYear[data[0]] == this.data.year && this.data.timeMonth[data[1]] == this.data.month) { // if (this.data.timeYear[data[0]] == this.data.year && this.data.timeMonth[data[1]] == this.data.month) {
......
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