Skip to content

S
schedule
Commit 9c5c3013 by fengzhaoyu
Options

问题修改

parent a31e1cb1
Showing with 77 additions and 85 deletions
PageComponents/scheduleList/scheduleList.js
...@@ -37,10 +37,11 @@ create.Component({ ...@@ -37,10 +37,11 @@ create.Component({
this.update(); this.update();
this.getDate(); this.getDate();
} }
}, },
didUnmount() {}, didUnmount() { },
methods: { methods: {
getDate: throttle(function(e) { getDate: throttle(function (e) {
let data = { let data = {
startTime: "2020-01-01 00:00:00", startTime: "2020-01-01 00:00:00",
endTime: "2025-12-30 23:59:59" endTime: "2025-12-30 23:59:59"
...@@ -59,30 +60,24 @@ create.Component({ ...@@ -59,30 +60,24 @@ create.Component({
scheduleList.push(that.returnScheduleList(2019 + i)); scheduleList.push(that.returnScheduleList(2019 + i));
} }
// 第一次加载 // 第一次加载
const today = new Date();
// finalDate 是用来定位到今天的 // finalDate 是用来定位到今天的
const finalDate = new Date(); const finalDate = new Date(today);
// finalDate.setDate(today.getDate() - today.getDay()) // finalDate.setDate(today.getDate() - today.getDay())
that.setData( that.setData({
{ scheduleList: scheduleList,
scheduleList: scheduleList, todayStr: finalDate.toLocaleDateString(),
todayStr: finalDate.toLocaleDateString(), thisYear: year,
thisYear: year, maxYear: year,
maxYear: year, canClick: true,
startPageOnShow: true, startPageOnShow: true,
isFirstLoad: false isFirstLoad: false
} });
// ,
// () => {
// that.setData({
// });
// }
);
} }
); );
}); });
}, 1000), }, 1000),
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: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify( url: `./../meetingDetail/meetingDetail?scheduleItem=${JSON.stringify(
...@@ -134,35 +129,23 @@ create.Component({ ...@@ -134,35 +129,23 @@ create.Component({
// TO DO 判断所获取的时间区间 // TO DO 判断所获取的时间区间
// 将会议的年，月，日拆分，时分拆分，生成rrules规则 // 将会议的年，月，日拆分，时分拆分，生成rrules规则
let initialTime = item.initialTime.split("-"); // let initialTime = item.initialTime.split("-"); //
let initialTimeDate = new Date( let initialTimeDate = new Date(parseInt(initialTime[0]), parseInt(initialTime[1]) - 1, parseInt(initialTime[2]));
parseInt(initialTime[0]), initialTimeDate.setDate(initialTimeDate.getDate() - 1)
parseInt(initialTime[1]) - 1, console.log(initialTimeDate.toLocaleDateString())
parseInt(initialTime[2]) let initialTimeDateyear = initialTimeDate.getFullYear()
); let initialTimeDatemonth = initialTimeDate.getMonth() + 1 < 10 ? '0' + (initialTimeDate.getMonth() + 1) : initialTimeDate.getMonth() + 1
initialTimeDate.setDate(initialTimeDate.getDate() - 1); let initialTimeDateday = initialTimeDate.getDate() < 10 ? '0' + initialTimeDate.getDate() : initialTimeDate.getDate()
console.log(initialTimeDate.toLocaleDateString());
let initialTimeDateyear = initialTimeDate.getFullYear();
let initialTimeDatemonth =
initialTimeDate.getMonth() + 1 < 10
? "0" + (initialTimeDate.getMonth() + 1)
: initialTimeDate.getMonth() + 1;
let initialTimeDateday =
initialTimeDate.getDate() < 10
? "0" + initialTimeDate.getDate()
: initialTimeDate.getDate();
let startTimeList = item.startTime.split(":"); let startTimeList = item.startTime.split(":");
let DTSTART = `${initialTimeDateyear}${initialTimeDatemonth}${initialTimeDateday}T${startTimeList[0]}${startTimeList[1]}00Z`; let DTSTART = `${initialTimeDateyear}${initialTimeDatemonth}${initialTimeDateday}T${startTimeList[0]}${startTimeList[1]}00Z`;
console.log(DTSTART);
let rule = RRule.fromString( let rule = RRule.fromString(
`${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}` `${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
); );
// console.log(rule, 'rule') // rule.options.tzid = "Asia/Hong_Kong";
rule.options.tzid = "Asia/Hong_Kong";
// 改变时区 // 改变时区
let rullAll = rule.all() // let rullAll = rule.all()
rule.all().map(item => { // rule.all().map(item => {
console.log(item.toLocaleDateString()) // console.log(item.toLocaleDateString())
}) // })
// 判断是否需要剔除某一天 // 判断是否需要剔除某一天
if (item.excludePlanDates) { if (item.excludePlanDates) {
...@@ -208,8 +191,8 @@ create.Component({ ...@@ -208,8 +191,8 @@ create.Component({
item.recurrenceModel.startTime; item.recurrenceModel.startTime;
let endTime = new Date( let endTime = new Date(
getFormatDate(item2, "yyyyMMdd") + getFormatDate(item2, "yyyyMMdd") +
" " + " " +
item.recurrenceModel.startTime item.recurrenceModel.startTime
); );
endTime.setMinutes( endTime.setMinutes(
endTime.getMinutes() + item.recurrenceModel.duration endTime.getMinutes() + item.recurrenceModel.duration
...@@ -244,7 +227,7 @@ create.Component({ ...@@ -244,7 +227,7 @@ create.Component({
); );
} }
}); });
scheduleMap.forEach(function(value, key, map) { scheduleMap.forEach(function (value, key, map) {
scheduleList.push(value); scheduleList.push(value);
}); });
return scheduleList; return scheduleList;
...@@ -326,9 +309,9 @@ create.Component({ ...@@ -326,9 +309,9 @@ create.Component({
thisDayEndTime: AllScheduleList[y].endTime.slice(11, 16), thisDayEndTime: AllScheduleList[y].endTime.slice(11, 16),
isBeOverdue: isBeOverdue:
new Date().getTime() > new Date().getTime() >
new Date( new Date(
AllScheduleList[y].endTime.replace(/-/g, "/") AllScheduleList[y].endTime.replace(/-/g, "/")
).getTime() ).getTime()
? true ? true
: false : false
}); });
...@@ -363,9 +346,9 @@ create.Component({ ...@@ -363,9 +346,9 @@ create.Component({
duration: count + 1, duration: count + 1,
isBeOverdue: isBeOverdue:
new Date().getTime() > new Date().getTime() >
new Date( new Date(
AllScheduleList[y].endTime.replace(/-/g, "/") AllScheduleList[y].endTime.replace(/-/g, "/")
).getTime() ).getTime()
? true ? true
: false : false
}); });
...@@ -382,7 +365,7 @@ create.Component({ ...@@ -382,7 +365,7 @@ create.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(
...@@ -408,7 +391,7 @@ create.Component({ ...@@ -408,7 +391,7 @@ create.Component({
type: "week", type: "week",
value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${ value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月" rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`, }${rangeDay2}日`,
dayStr: key dayStr: key
}); });
} }
...@@ -424,7 +407,7 @@ create.Component({ ...@@ -424,7 +407,7 @@ create.Component({
type: "week", type: "week",
value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${ value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月" rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`, }${rangeDay2}日`,
dayStr: key dayStr: key
}); });
} }
...@@ -446,7 +429,7 @@ create.Component({ ...@@ -446,7 +429,7 @@ create.Component({
type: "week", type: "week",
value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${ value: `第${listWeek}周，${rangeMonth1 + 1}月${rangeDay1}日 - ${
rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月" rangeMonth2 == rangeMonth1 ? "" : rangeMonth2 + 1 + "月"
}${rangeDay2}日`, }${rangeDay2}日`,
dayStr: key dayStr: key
}); });
} }
......
pages/createMeeting/createMeeting.axml
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<!-- title remark 标题 描述 --> <!-- title remark 标题 描述 -->
<view class="createTitle"> <view class="createTitle">
<view class="title"> <view class="title">
<input placeholder-class="placeholder" placeholder="请输入主题" class="text" focus="{{true}}" onInput="onInput" data-type="title" value="{{title}}" /> <input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" value="{{title}}" focus="{{true}}"/>
<view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark"> <view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark">
</view> </view>
</view> </view>
<view class="remark" a:if="{{isShowRemark}}"> <view class="remark" a:if="{{isShowRemark}}">
<input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" /> <input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" focus="{{false}}" />
</view> </view>
</view> </view>
<!-- $data.$data.roomId locationName 地点 --> <!-- $data.$data.roomId locationName 地点 -->
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
<view> <view>
<view class="timeText" catchTap="showPopup" data-type='time'> <view class="timeText" catchTap="showPopup" data-type='time'>
<text a:if="{{isAcrossDay}}"> <text a:if="{{isAcrossDay}}">
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}} - {{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}} {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
</text> </text>
<text a:else> <text a:else>
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}- ${$data.endTime.substring(11, 16)}`}} {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}}
</text> </text>
<!-- 3月1日 周日 14:00-16:00 --> <!-- 3月1日 周日 14:00-16:00 -->
</view> </view>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</view> </view>
<view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view> <view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
</view> </view>
<view class="participatorListBottom"> <view class="participatorListBottom" catchTap="nextPage" data-nextPage="participantsDetail">
<view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}"> <view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
<view class="headUrl"> <view class="headUrl">
<image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" /> <image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</view> </view>
<view class="name">{{item.name}}</view> <view class="name">{{item.name}}</view>
</view> </view>
<view class="addPeople" catchTap="showPopup" data-type='participator'></view> <view class="addPeople iconfont iconicon_add1" catchTap="showPopup" data-type='participator'></view>
</view> </view>
</view> </view>
</view> </view>
......
pages/createMeeting/createMeeting.js
...@@ -44,6 +44,7 @@ create.Page({ ...@@ -44,6 +44,7 @@ create.Page({
week: '', week: '',
isAcrossDay: false, isAcrossDay: false,
conflictPeople: [], conflictPeople: [],
placeholder: ''
}, },
showPop(event) { showPop(event) {
...@@ -65,7 +66,7 @@ create.Page({ ...@@ -65,7 +66,7 @@ create.Page({
title: `创建会议` title: `创建会议`
}) })
this.setData({ this.setData({
title: `${getApp().globalData.name}创建的会议` placeholder: `${getApp().globalData.name}创建的会议`
}) })
this.reset() this.reset()
}, },
...@@ -246,7 +247,7 @@ create.Page({ ...@@ -246,7 +247,7 @@ create.Page({
return year + '-' + month + '-' + day return year + '-' + month + '-' + day
}, },
// 添加参会人 // 添加参会人
addParticipator() { addParticipator: throttle(function () {
const _that = this const _that = this
let require = [] let require = []
let select = [] let select = []
...@@ -284,7 +285,8 @@ create.Page({ ...@@ -284,7 +285,8 @@ create.Page({
fail: function (err) { fail: function (err) {
} }
}) })
},
}),
// 已选用户去中去掉必选用户 // 已选用户去中去掉必选用户
selectedelRequired(req, pic) { selectedelRequired(req, pic) {
for (let i = 0; i < req.length; i++) { for (let i = 0; i < req.length; i++) {
...@@ -314,12 +316,14 @@ create.Page({ ...@@ -314,12 +316,14 @@ create.Page({
this.$store.data.endTime = `${event.endTime}:00` this.$store.data.endTime = `${event.endTime}:00`
this.update() this.update()
this.acrossDay(this.$store.data.startTime, this.$store.data.endTime) this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
this.setData({ this.setData({
popupShow: false popupShow: false,
week: this.data.weekList[new Date(this.$store.data.startTime).getDay()],
}) })
this.conflictPeople() this.conflictPeople()
}, },
addSchedule() { addSchedule: throttle(function () {
let data = { let data = {
title: this.data.title || `${getApp().globalData.name}创建的会议`, title: this.data.title || `${getApp().globalData.name}创建的会议`,
location: { location: {
...@@ -347,7 +351,8 @@ create.Page({ ...@@ -347,7 +351,8 @@ create.Page({
}) })
} }
}) })
},
}),
// 获取时间参数 // 获取时间参数
getTimes(time = new Date()) { getTimes(time = new Date()) {
let date = getInterTime(new Date(time)) let date = getInterTime(new Date(time))
......
pages/index/index.axml
版：174
<view a:if="{{tabBarIndex === '0'}}"> <view a:if="{{tabBarIndex === '0'}}">
<my-dynamic> <my-dynamic>
</my-dynamic> </my-dynamic>
......
pages/meetingDetail/meetingDetail.axml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</view> </view>
<view class="hideTime"> <view class="hideTime">
<text a:if="{{isAcrossDay}}"> <text a:if="{{isAcrossDay}}">
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}`}}-{{`${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}} {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(5, 7)}月${$data.endTime.substring(8, 10)}日 ${$data.endTime.substring(11, 16)}`}}
</text> </text>
<text a:else> <text a:else>
{{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}} {{`${$data.startTime.substring(5, 7)}月${$data.startTime.substring(8, 10)}日 ${week} ${$data.startTime.substring(11, 16)}-${$data.endTime.substring(11, 16)}`}}
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<view class="permissionContant"> <view class="permissionContant">
<view class="createTitle"> <view class="createTitle">
<view class="title"> <view class="title">
<input placeholder-class="placeholder" placeholder="请输入主题" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm"/> <input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm" focus="{{true}}"/>
<view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark"> <view class="icon iconfont iconicon_description1 {{remark ? '' : 'noValueIcon'}}" onTap="addRemark">
</view> </view>
</view> </view>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<view class="participatorListTop"> <view class="participatorListTop">
<view class="participatorText"> <view class="participatorText">
<view> <view>
{{$data.participatorList.length}}位参会人 {{$data.participatorList.length}}位参会人
</view> </view>
<view class="conflictStatus" a:if="{{conflictPeople.length}}"> <view class="conflictStatus" a:if="{{conflictPeople.length}}">
{{conflictPeople.length}}人会议安排冲突 {{conflictPeople.length}}人会议安排冲突
...@@ -100,12 +100,11 @@ ...@@ -100,12 +100,11 @@
</view> </view>
<view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view> <view class="iconicon_open iconfont icon" style=" vertical-align: middle" catchTap="nextPage" data-nextPage="participantsDetail"></view>
</view> </view>
<view class="participatorListBottom"> <view class="participatorListBottom" catchTap="nextPage" data-nextPage="participantsDetail">
<view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}"> <view class="people" a:for="{{$data.participatorList.length > 10 ? [...$data.participatorList].splice(0, 11) : $data.participatorList}}">
<view class="headUrl"> <view class="headUrl">
<image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" /> <image a:if="{{item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}" />
<text <text a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
a:else>{{item.platform==="outlook" ? item.username.substring(0, 2) : item.username.substring(item.username.length-2, item.username.length)}}
</text> </text>
<view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}"> <view class="conflict iconicon_conflict iconfont" a:if="{{conflictPeople.includes(item.userId)}}">
</view> </view>
...@@ -142,7 +141,7 @@ ...@@ -142,7 +141,7 @@
</view> </view>
<!-- 底部导航栏 --> <!-- 底部导航栏 -->
<view class="footNav"> <view class="footNav">
<view class="footNavTop"> <view class="footNavTop" a:if="{{!isExpand}}">
<view class="originStaus" a:if="{{confirmAttendance === null}}"> <view class="originStaus" a:if="{{confirmAttendance === null}}">
<view catchTap="participate"> <view catchTap="participate">
<text class="iconfont iconicon_Agreed1"></text> <text class="iconfont iconicon_Agreed1"></text>
......
pages/meetingDetail/meetingDetail.js
...@@ -105,11 +105,10 @@ create.Page({ ...@@ -105,11 +105,10 @@ create.Page({
editType: '', editType: '',
confirmAttendance: null, confirmAttendance: null,
isExpand: false, isExpand: false,
forbiddenScroll: false forbiddenScroll: false,
placeholder: ''
}, },
onShow() { onShow() {
console.log(this)
this.conflictPeople() this.conflictPeople()
setTimeout(() => { setTimeout(() => {
this.update() this.update()
...@@ -124,6 +123,7 @@ create.Page({ ...@@ -124,6 +123,7 @@ create.Page({
title: `会议详情` title: `会议详情`
}) })
this.setData({ this.setData({
placeholder: `${getApp().globalData.name}创建的会议`,
scheduleItem: JSON.parse(event.scheduleItem), scheduleItem: JSON.parse(event.scheduleItem),
currentPeople: getApp().globalData.userid currentPeople: getApp().globalData.userid
}) })
...@@ -182,7 +182,7 @@ create.Page({ ...@@ -182,7 +182,7 @@ create.Page({
remark: res.data.data.remark, remark: res.data.data.remark,
isExpand: res.data.data.confirmAttendance === 1 ? true : false, isExpand: res.data.data.confirmAttendance === 1 ? true : false,
isShowRemark: res.data.data.remark ? true : false, isShowRemark: res.data.data.remark ? true : false,
week: this.data.weekList[new Date(res.data.data.startTime.replace(/'-'/g, "\/")).getDay()], week: this.data.weekList[new Date(res.data.data.startTime.replace(/-/g, "/")).getDay()],
getData: true getData: true
}) })
if (res.data.data.repeatable) { if (res.data.data.repeatable) {
...@@ -541,6 +541,7 @@ create.Page({ ...@@ -541,6 +541,7 @@ create.Page({
this.acrossDay(this.$store.data.startTime, this.$store.data.endTime) this.acrossDay(this.$store.data.startTime, this.$store.data.endTime)
this.setData({ this.setData({
popupShow: false, popupShow: false,
week: this.data.weekList[new Date(this.$store.data.startTime).getDay()],
editType: '', editType: '',
forbiddenScroll: false forbiddenScroll: false
}) })
......
pages/outLookContact/outLookContact.axml
<view class="outLookContact"> <view class="outLookContact">
<!-- 输入邮箱联系人 --> <!-- 输入邮箱联系人 -->
<view class="addContact"> <view class="addContact">
<input placeholder="请输入邮箱" focus="{{true}}" onInput="onInput" value="{{value}}" /> <input placeholder="请输入邮箱" onInput="onInput" value="{{value}}" />
<view class="icon iconfont iconicon_add " onTap="addEmail"> <view class="icon iconfont iconicon_add " onTap="addEmail">
</view> </view>
</view> </view>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<view class="contactText"> <view class="contactText">
{{item.username}} {{item.username}}
</view> </view>
<view a:if="{{!!scheduleItem ? !(item.userId == $data.originalData || $data.originUsersId.includes(item.userId)) : !(item.userId == $data.originalData)}}" class="contactClose icon iconfont iconicon_close" onTap="close" data-item="{{item}}"> <view a:if="{{(!scheduleItem || currentPeople === $data.originalData.organizer) ? !(item.userId == currentPeople) : !($data.originUsersId.includes(item.userId))}}" class="contactClose icon iconfont iconicon_close" onTap="close" data-item="{{item}}">
</view> </view>
</view> </view>
</view> </view>
......
pages/outLookContact/outLookContact.js
...@@ -41,6 +41,7 @@ create.Page({ ...@@ -41,6 +41,7 @@ create.Page({
showToast: false, showToast: false,
title: '保存成功' title: '保存成功'
}, },
currentPeople: ''
}, },
onLoad(event) { onLoad(event) {
const _that = this const _that = this
...@@ -57,7 +58,8 @@ create.Page({ ...@@ -57,7 +58,8 @@ create.Page({
} }
} }
this.setData({ this.setData({
outlookContact: outlookContact outlookContact: outlookContact,
currentPeople: getApp().globalData.userid
}) })
observer.register({ observer.register({
notice(scheduleItem) { notice(scheduleItem) {
...@@ -185,7 +187,7 @@ create.Page({ ...@@ -185,7 +187,7 @@ create.Page({
}) })
if (event.currentTarget.dataset.item.id > -1) { if (event.currentTarget.dataset.item.id > -1) {
let addUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userList).addUserList let addUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userList).addUserList
let deleteUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userListId).deleteUserList let deleteUserList = this.arrayPoor(this.$store.data.originUsers, this.data.userList).deleteUserList
let dataUser = { let dataUser = {
addUserList: addUserList, addUserList: addUserList,
deleteUserList: deleteUserList, deleteUserList: deleteUserList,
......
pages/participantsDetail/participantsDetail.axml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</view> </view>
<view class="info"> <view class="info">
<text class="name">{{item.username}}</text> <text class="name">{{item.username}}</text>
<text a:if="{{!!scheduleItem ? !(item.userId == $data.originalData || $data.originUsersId.includes(item.userId)) : !(item.userId == currentPeople)}}" class="close iconicon_close iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text> <text a:if="{{(!scheduleItem || currentPeople === $data.originalData.organizer) ? !(item.userId == currentPeople) : false}}" class="close iconicon_close iconfont" data-userId="{{item.userId}}" onTap="delParticipants"></text>
</view> </view>
</view> </view>
</view> </view>
......
stores/exampleStore.js
...@@ -8,7 +8,7 @@ class Store { ...@@ -8,7 +8,7 @@ class Store {
originUsers: [], originUsers: [],
originUsersId: [], originUsersId: [],
originalData: null, originalData: null,
indexNeedUpdate: false, indexNeedUpdate: false
} }
} }
export default new Store() export default new Store()
\ No newline at end of file
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