Commit f5f88d00 by fengzhaoyu

修改首页传参数

parent 0d665535
...@@ -117,10 +117,10 @@ Component({ ...@@ -117,10 +117,10 @@ Component({
); );
}); });
}, },
didUpdate() {}, didUpdate() { },
didUnmount() {}, didUnmount() { },
methods: { methods: {
nextDetail: throttle(function(e) { nextDetail: throttle(function (e) {
let item = e.target.dataset.item; let item = e.target.dataset.item;
dd.navigateTo({ dd.navigateTo({
url: `./../editMeeting/editMeeting?scheduleItem=${JSON.stringify(item)}` url: `./../editMeeting/editMeeting?scheduleItem=${JSON.stringify(item)}`
...@@ -185,16 +185,9 @@ Component({ ...@@ -185,16 +185,9 @@ Component({
); );
rule.all().map(item2 => { rule.all().map(item2 => {
let excludeDate = getFormatDate(item2, "yyyyMMdd"); let excludeDate = getFormatDate(item2, "yyyyMMdd");
let hasExclude = let hasExclude = excludeDateList.scheduleList.indexOf(excludeDate) === -1;
excludeDateList.scheduleList.indexOf(excludeDate) === -1; if (new Date(item2).getTime() < excludeDateList.templateList && hasExclude) {
if ( let startTime = getFormatDate(item2, "yyyyMMdd") + " " + item.recurrenceModel.startTime;
new Date(item2).getTime() < excludeDateList.templateList &&
hasExclude
) {
let startTime =
getFormatDate(item2, "yyyyMMdd") +
" " +
item.recurrenceModel.startTime;
let endTime = new Date(startTime); let endTime = new Date(startTime);
endTime.setMinutes( endTime.setMinutes(
endTime.getMinutes() + item.recurrenceModel.duration endTime.getMinutes() + item.recurrenceModel.duration
...@@ -204,11 +197,11 @@ Component({ ...@@ -204,11 +197,11 @@ Component({
{ {
confirmAttendance: item.confirmAttendance, confirmAttendance: item.confirmAttendance,
endTime: getFormatDate(endTime, "yyyyMMdd HH:mm:ss"), endTime: getFormatDate(endTime, "yyyyMMdd HH:mm:ss"),
id: item.id, // id: item.id,
scheduleTemplateId: item.scheduleTemplateId, scheduleTemplateId: item.id,
startTime: startTime, startTime: startTime,
title: item.title, title: item.title,
planDate: getFormatDate(item2, "yyyyMMdd") planDate: getFormatDate(item2, "yyyyMMdd", '-')
} }
); );
} }
...@@ -232,11 +225,10 @@ Component({ ...@@ -232,11 +225,10 @@ Component({
{ {
confirmAttendance: item.confirmAttendance, confirmAttendance: item.confirmAttendance,
endTime: getFormatDate(endTime, "yyyyMMdd HH:mm:ss"), endTime: getFormatDate(endTime, "yyyyMMdd HH:mm:ss"),
id: item.id, scheduleTemplateId: item.id,
scheduleTemplateId: item.scheduleTemplateId,
startTime: startTime, startTime: startTime,
title: item.title, title: item.title,
planDate: getFormatDate(item2, "yyyyMMdd") planDate: getFormatDate(item2, "yyyyMMdd", '-')
} }
); );
}); });
...@@ -258,7 +250,7 @@ Component({ ...@@ -258,7 +250,7 @@ Component({
); );
} }
}); });
scheduleMap.forEach(function(value, key, map) { scheduleMap.forEach(function (value, key, map) {
scheduleList.push(value); scheduleList.push(value);
}); });
return scheduleList; return scheduleList;
...@@ -396,7 +388,7 @@ Component({ ...@@ -396,7 +388,7 @@ Component({
value: year value: year
}); });
let thisDay = new Date().toLocaleDateString(); let thisDay = new Date().toLocaleDateString();
DateMap.forEach(function(value, key, map) { DateMap.forEach(function (value, key, map) {
if ( if (
new Date(key).getDay() === 0 && new Date(key).getDay() === 0 &&
that.count( that.count(
......
...@@ -50,6 +50,9 @@ input { ...@@ -50,6 +50,9 @@ input {
.createTitle { .createTitle {
padding: 14rpx 36rpx 16rpx; padding: 14rpx 36rpx 16rpx;
position: relative;
min-height: 90rpx;
overflow: hidden;
} }
.title { .title {
...@@ -84,12 +87,17 @@ input { ...@@ -84,12 +87,17 @@ input {
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
font-size: 40rpx; font-size: 40rpx;
color: #1B263D; color: #1B263D;
position: relative;
} }
.remark .placeholder { .remark .placeholder {
font-size: 28rpx font-size: 28rpx
} }
.meetingWay {
position: relative;
}
.place, .time, .participator, .meetingWay { .place, .time, .participator, .meetingWay {
display: flex; display: flex;
padding: 0 36rpx; padding: 0 36rpx;
...@@ -371,3 +379,13 @@ input { ...@@ -371,3 +379,13 @@ input {
.footNavTop .devider { .footNavTop .devider {
margin: 0; margin: 0;
} }
.permissions {
background: rgba(0, 0, 0, 0);
position: fixed;
top: 0;
z-index: 10;
height: 100%;
width: 100%;
background: red;
}
\ No newline at end of file
...@@ -139,7 +139,7 @@ create.Page({ ...@@ -139,7 +139,7 @@ create.Page({
let data = { let data = {
id: this.data.scheduleItem.id, id: this.data.scheduleItem.id,
scheduleTemplateId: this.data.scheduleItem.scheduleTemplateId, scheduleTemplateId: this.data.scheduleItem.scheduleTemplateId,
planDate: this.data.scheduleItem.planDate planDate: this.data.scheduleItem.planDate.replace(/\//g, '-')
} }
getScheduleDetail(data).then(res => { getScheduleDetail(data).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
...@@ -152,6 +152,9 @@ create.Page({ ...@@ -152,6 +152,9 @@ create.Page({
participatorUserId.push(value.participator.userId) participatorUserId.push(value.participator.userId)
originUsers.push(value.participator) originUsers.push(value.participator)
if (value.participator.userId === getApp().globalData.userid) { if (value.participator.userId === getApp().globalData.userid) {
// this.setData({
// aheadTimes: value.
// })
} }
} }
......
...@@ -181,8 +181,8 @@ create.Page({ ...@@ -181,8 +181,8 @@ create.Page({
'centerPopup.showCenterPopup': false 'centerPopup.showCenterPopup': false
}) })
if (event.currentTarget.dataset.item.id > -1) { if (event.currentTarget.dataset.item.id > -1) {
let addUserList = _that.arrayPoor(_that.store.data.originUsers, _that.store.data.participatorList).addUserList let addUserList = this.arrayPoor(this.store.data.originUsers, this.store.data.participatorList).addUserList
let deleteUserList = _that.arrayPoor(_that.store.data.originUsers, _that.store.data.participatorList).deleteUserList let deleteUserList = this.arrayPoor(this.store.data.originUsers, this.store.data.participatorList).deleteUserList
let dataUser = { let dataUser = {
addUserList: addUserList, addUserList: addUserList,
deleteUserList: deleteUserList, deleteUserList: deleteUserList,
......
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