Commit 4c81ff4a by liang ce

修改日期bug

parent 6b03a3b5
{
"pages": [
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/index/index",
"pages/uploadFile/uploadFile",
"pages/meetingRoomList/meetingRoomList",
"pages/repetitionTime/repetitionTime",
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/repeatMechanism/repeatMechanism",
"pages/attendingSituation/attendingSituation",
"pages/addRemark/addRemark",
......
......@@ -81,8 +81,6 @@ create.Page({
})
this.store.data.startTime = this.data.time1
this.store.data.endTime = this.data.time2
this.store.data.week1 = this.data.week1
this.store.data.week2 = this.data.week2
this.store.data.aheadTimes = [15]
this.update()
setTimeout(() => {
......@@ -121,6 +119,7 @@ create.Page({
},
// 选择时间组件回调
changeSelectTime(e) {
let that = this
if (e.status === 1) {
var date1 = new Date(e.time);
var weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
......@@ -141,20 +140,17 @@ create.Page({
isShowModal: false,
week1: w1,
week2: w2
},() => {
that.conflict()
})
this.conflict()
this.store.data.startTime = `${e.time}:00`
this.store.data.endTime = `${y}/${m}/${d} ${h < 10 ? "0" + date.getHours() : date.getHours()}:${min < 10 ? "0" + min : min}:00`
this.update()
} else {
this.setData({
time1: `${e.time}:00`,
isShowModal: false,
week1: w1
},() => {
that.conflict()
})
this.store.data.startTime = `${e.time}:00`
this.update()
this.conflict()
}
} else {
if (new Date(e.time).getTime() <= new Date(this.data.time1).getTime()) {
......@@ -170,10 +166,9 @@ create.Page({
time2: `${e.time}:00`,
isShowModal: false,
week2: w1
},() => {
that.conflict()
})
this.store.data.endTime = `${e.time}:00`
this.update()
this.conflict()
}
}
} else {
......
......@@ -22,7 +22,7 @@ page {
font-size: 26rpx;
color: rgba(25, 31, 37, 0.56);
height: 37rpx;
padding-left: 146rpx;
padding-left: 120rpx;
line-height: 37rpx;
margin: 48rpx 0;
}
......@@ -35,11 +35,16 @@ page {
.dateTime {
margin-right: 34rpx;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.dateTime>view {
font-size: 22rpx;
line-height: 24rpx;
font-weight: bolder;
color: #191F25;
/* margin-bottom: 8rpx; */
}
......@@ -77,7 +82,7 @@ page {
}
.dataSchedule>view>view {
margin-left: 32rpx;
margin-left: 16rpx;
}
.dataScheduleName {
......
......@@ -6,7 +6,8 @@ Page({
todayStr: '',
thisYear: '',
maxYear: '',
minYear: ''
minYear: '',
canClick: true
},
onLoad(query) {
// 页面加载
......@@ -43,7 +44,8 @@ Page({
scheduleList: scheduleList,
todayStr: finalDate.toLocaleDateString(),
thisYear: year,
maxYear: year
maxYear: year,
canClick: true
})
})
})
......@@ -218,11 +220,21 @@ Page({
};
},
nextPage() {
dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
if(this.data.canClick) {
this.setData({
canClick: false
})
dd.navigateTo({ url: './../createOrEditSchedule/createOrEditSchedule' })
}
},
nextDetail(e) {
let item = e.target.dataset.item
dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?scheduleItem=${JSON.stringify(item)}` })
if(this.data.canClick) {
this.setData({
canClick: false
})
let item = e.target.dataset.item
dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?scheduleItem=${JSON.stringify(item)}` })
}
},
lower() {
let year = this.data.maxYear + 1
......
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