From 4c81ff4a3487ec3a8defb3a053a11affb51959ef Mon Sep 17 00:00:00 2001
From: liangce <394218399@qq.com>
Date: Thu, 27 Feb 2020 17:42:39 +0800
Subject: [PATCH] 修改日期bug
---
app.json | 2 +-
pages/createOrEditSchedule/createOrEditSchedule.js | 19 +++++++------------
pages/index/index.acss | 9 +++++++--
pages/index/index.js | 22 +++++++++++++++++-----
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/app.json b/app.json
index 3460d3f..cca9f88 100644
--- a/app.json
+++ b/app.json
@@ -1,10 +1,10 @@
{
"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",
diff --git a/pages/createOrEditSchedule/createOrEditSchedule.js b/pages/createOrEditSchedule/createOrEditSchedule.js
index 24d7864..84039c7 100644
--- a/pages/createOrEditSchedule/createOrEditSchedule.js
+++ b/pages/createOrEditSchedule/createOrEditSchedule.js
@@ -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 {
diff --git a/pages/index/index.acss b/pages/index/index.acss
index 75b3d16..feb0210 100644
--- a/pages/index/index.acss
+++ b/pages/index/index.acss
@@ -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 {
diff --git a/pages/index/index.js b/pages/index/index.js
index 2927d38..5b9b0a8 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -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
--
libgit2 0.26.0