Commit 85884871 by fengzhaoyu

会议编辑

parents 3706bdfa 4b6d05c6
{ {
"pages": [ "pages": [
"pages/index/index", "pages/index/index",
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/addRemark/addRemark", "pages/addRemark/addRemark",
"pages/createOrEditSchedule/createOrEditSchedule",
"pages/remind/remind", "pages/remind/remind",
"pages/repeatMechanism/repeatMechanism", "pages/repeatMechanism/repeatMechanism",
"pages/scheduleDetail/scheduleDetail", "pages/scheduleDetail/scheduleDetail",
......
...@@ -6,7 +6,7 @@ create.Page({ ...@@ -6,7 +6,7 @@ create.Page({
data: {}, data: {},
onLoad() { onLoad() {
dd.setNavigationBar({ dd.setNavigationBar({
title: '会前提醒' title: '添加描述'
}) })
}, },
getRemark(event) { getRemark(event) {
......
...@@ -89,7 +89,7 @@ Page({ ...@@ -89,7 +89,7 @@ Page({
let date2 = this.data.AllScheduleList[y].endTime.slice(0, 10).replace(/-/g, '/') let date2 = this.data.AllScheduleList[y].endTime.slice(0, 10).replace(/-/g, '/')
let count = this.count(date1, date2) let count = this.count(date1, date2)
if (count == 0) { if (count == 0) {
if (DateMap.get(new Date(time.getFullYear(), time.getMonth(), time.getDate()).toLocaleDateString())){ if (DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime.replace(/-/g, '/')).toLocaleDateString()}`)){
DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime.replace(/-/g, '/')).toLocaleDateString()}`).scheduleList.push({ DateMap.get(`${new Date(this.data.AllScheduleList[y].startTime.replace(/-/g, '/')).toLocaleDateString()}`).scheduleList.push({
...this.data.AllScheduleList[y], ...this.data.AllScheduleList[y],
thisDayStartTime: this.data.AllScheduleList[y].startTime.slice(11, 16), thisDayStartTime: this.data.AllScheduleList[y].startTime.slice(11, 16),
...@@ -180,7 +180,6 @@ Page({ ...@@ -180,7 +180,6 @@ Page({
}) })
} }
}); });
console.log(DateList)
return DateList return DateList
}, },
count(date1, date2) { count(date1, date2) {
...@@ -217,6 +216,8 @@ Page({ ...@@ -217,6 +216,8 @@ Page({
}, },
nextDetail(e) { nextDetail(e) {
let id = e.target.dataset.id let id = e.target.dataset.id
console.log(11111111)
console.log(id)
dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?id=${id}` }) dd.navigateTo({ url: `./../scheduleDetail/scheduleDetail?id=${id}` })
}, },
lower() { lower() {
......
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