Skip to content

S
schedule
Commit 0016e485 by fengzhaoyu
Options

合并冲突

parents 2030e424 a67cb584
Showing with 270 additions and 232 deletions
app.acss
page {
font-family: PingFangSC-Regular;
background: #F6F6F6;
}
picker-view {
background: #F6F6F6;
}
\ No newline at end of file
app.json
...@@ -14,5 +14,8 @@ ...@@ -14,5 +14,8 @@
"pages/participantsDetail/participantsDetail", "pages/participantsDetail/participantsDetail",
"pages/editFile/editFile", "pages/editFile/editFile",
"pages/createOrEditSchedule/createOrEditSchedule" "pages/createOrEditSchedule/createOrEditSchedule"
] ],
"window": {
"titleBarColor": "#FFFFFF"
}
} }
pages/createOrEditSchedule/createOrEditSchedule.axml
<view class="createOrEditSchedule"> <block a:if="{{showPage}}">
<!-- 主题 --> <view class="createOrEditSchedule">
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}"> <!-- 主题 -->
<view class="theme"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<input placeholder="添加主题" type="text" onInput="getTitle" value="{{title}}"/> <view class="theme">
</view> <input placeholder="添加主题" type="text" onInput="getTitle" value="{{title}}"/>
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}"> </view>
</view> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view> </view>
<!-- 时间 -->
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}" >
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view> </view>
<view class="time"> <!-- 时间 -->
<view class="startTime {{timeStaus === '0' ? 'selectTime' : ''}}" data-timeStaus="0" onTap="selectTime"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}" >
<view class="timeContainer"> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
<view class="yearTime"> </view>
{{time1.slice(5,7)}}月{{time1.slice(8,10)}}日 <view class="time">
<view class="startTime {{timeStaus === '0' ? 'selectTime' : ''}}" data-timeStaus="0" onTap="selectTime">
<view class="timeContainer">
<view class="yearTime">
{{time1.slice(5,7)}}月{{time1.slice(8,10)}}日
</view>
<view class="dayTime">
{{time1.slice(11,16)}}
</view>
</view> </view>
<view class="dayTime"> <view class="weekTime">
{{time1.slice(11,16)}} {{week1}}
</view> </view>
<!--<view class="line {{!!timeStaus ? 'selectLine' : ''}}"> -->
</view> </view>
<view class="weekTime"> <view class="endTime {{timeStaus === '1' ? 'selectTime' : ''}}" data-timeStaus="1" onTap="selectTime">
{{week1}} <view class="timeContainer">
</view> <view class="yearTime">
<!--<view class="line {{!!timeStaus ? 'selectLine' : ''}}"> --> {{time2.slice(5,7)}}月{{time2.slice(8,10)}}日
</view> </view>
<view class="endTime {{timeStaus === '1' ? 'selectTime' : ''}}" data-timeStaus="1" onTap="selectTime"> <view class="dayTime">
<view class="timeContainer"> {{time2.slice(11,16)}}
<view class="yearTime"> </view>
{{time2.slice(5,7)}}月{{time2.slice(8,10)}}日
</view> </view>
<view class="dayTime"> <view class="weekTime">
{{time2.slice(11,16)}} {{week2}}
</view> </view>
</view> </view>
<view class="weekTime">
{{week2}}
</view>
</view> </view>
</view> </view>
</view> </view>
</view> <!-- 地点 -->
<!-- 地点 --> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}"> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="place" a:if="{{!!scheduleItem?!!locationName:true}}">
<view class="icon iconfont icondingwei">
</view> </view>
<view class="text" data-nextPage="place" onTap="nextPage"> <view class="place" a:if="{{!!scheduleItem?!!locationName:true}}">
<view class="selectPlace" a:if="{{!!locationName}}"> <view class="icon iconfont icondingwei">
<text>{{locationName}}</text> </view>
<text class="iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="icondingwei" catchTap="closeEditList"></text> <view class="text" data-nextPage="place" onTap="nextPage">
<view class="selectPlace" a:if="{{!!locationName}}">
<text>{{locationName}}</text>
<text class="iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="icondingwei" catchTap="closeEditList"></text>
</view>
<text a:else>
添加地点
</text>
</view> </view>
<text a:else>
添加地点
</text>
</view> </view>
</view> </view>
</view> <!-- 参会人 -->
<!-- 参会人 --> <view class="participants">
<view class="participants"> <view class="icon iconfont iconcanhuiren1">
<view class="icon iconfont iconcanhuiren1"> </view>
</view> <view class="text">
<view class="text"> <view a:if="{{participatorList.length}}">
<view a:if="{{participatorList.length}}"> <view class="people">
<view class="people"> <view class="scrollPeople" catchTap="nextPage" data-nextPage="participantsDetail">
<view class="scrollPeople" catchTap="nextPage" data-nextPage="participantsDetail"> <text class="imageGroup" a:for="{{participatorList}}" a:for-item="item">
<text class="imageGroup" a:for="{{participatorList}}" a:for-item="item"> <text>
<text> <image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/>
<image a:if="{{!!item.headUrl}}" mode="scaleToFill" src="{{item.headUrl}}"/> <text a:else class="name">{{item.username.substring(item.username.length - 2, item.username.length)}}</text>
<text a:else class="name">{{item.username.substring(item.username.length - 2, item.username.length)}}</text> </text>
<text a:if="{{conflictPeople.includes(item.userId)}}" class="conflictTip"></text>
</text> </text>
<text a:if="{{conflictPeople.includes(item.userId)}}" class="conflictTip"></text> </view>
</text> <view class="addPeople iconfont icontianjia" onTap="addParticipants">
</view> </view>
<view class="addPeople iconfont icontianjia" onTap="addParticipants"> <view class="rightPeople" catchTap="nextPage" data-nextPage="participantsDetail">
<text>{{participatorList.length}}人</text>
<text class="iconfont iconyoujinru"></text>
</view>
</view> </view>
<view class="rightPeople" catchTap="nextPage" data-nextPage="participantsDetail"> <view class="tip">
<text>{{participatorList.length}}人</text> <text class="noConflict" a:if="{{!conflictPeople.length}}">
<text class="iconfont iconyoujinru"></text> 所有参与者都有空
</text>
<text class="conflict" a:else>
<text class="conflict" a:if="{{conflictPeople.includes(item.userId)}}" a:for="{{participatorList}}" a:for-item="item">{{item.username}}</text> 会议冲突
</text>
</view> </view>
</view> </view>
<view class="tip"> <text class="addParticipants" a:else data-nextPage="participantsDetail" onTap="addParticipants">添加参会人</text>
<text class="noConflict" a:if="{{!conflictPeople.length}}">
所有参与者都有空
</text>
<text class="conflict" a:else>
<text class="conflict" a:if="{{conflictPeople.includes(item.userId)}}" a:for="{{participatorList}}" a:for-item="item">{{item.username}}</text> 会议冲突
</text>
</view>
</view> </view>
<text class="addParticipants" a:else data-nextPage="participantsDetail" onTap="addParticipants">添加参会人</text>
</view>
</view>
<!-- 提醒 -->
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view> </view>
<view class="remind" a:if="{{aheadTimes.length}}"> <!-- 提醒 -->
<view class="icon iconfont iconfont iconhuiqiantixing"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
</view> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
<view class="text" data-nextPage="remind" onTap="nextPage">
<text class="blank">
<text a:if="{{aheadTimes.includes(0)}}">立即提醒</text>
<text a:if="{{aheadTimes.includes(5)}}">5分钟前</text>
<text a:if="{{aheadTimes.includes(15)}}">15分钟前</text>
<text a:if="{{aheadTimes.includes(30)}}">30分钟前</text>
<text a:if="{{aheadTimes.includes(60)}}">1小时前</text>
<text a:if="{{aheadTimes.includes(1440)}}">1天前</text>
<text a:if="{{aheadTimes.includes(2880)}}">2天前</text>
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
提醒
</text>
<text class="close iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="iconhuiqiantixing" catchTap="closeEditList"></text>
</view>
</view>
</view>
<!-- 重复 -->
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="repeat" a:if="{{!!scheduleItem&&!!repeatable}}">
<view class="iconfont iconchongfu">
</view> </view>
<view class="repeatContaint"> <view class="remind" a:if="{{aheadTimes.length}}">
<view class="repeatTime" data-nextPage="repeatMechanism" onTap="nextPage"> <view class="icon iconfont iconfont iconhuiqiantixing">
<text>{{recurrenceModel.model=='day_in_week'?(recurrenceModel.weekDayList.length==1?repeatWeek:'每周的工作日重复'):recurrenceModel.model=='every_day'?'每天重复': '不重复'}}</text>
<view class="iconfont iconshanchu" data-icon="iconchongfu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
</view>
</view> </view>
<view class="terminationTime" onTap="selectTerminal" a:if="{{ recurrenceModel.model !== 'no_repeat' }}"> <view class="text" data-nextPage="remind" onTap="nextPage">
<text a:if="{{recurrenceModel.forever == '1'}}">永不截止</text> <text class="blank">
<text a:else>截止至{{recurrenceModel.terminateTime}}</text> <text a:if="{{aheadTimes.includes(0)}}">立即提醒</text>
<text a:if="{{aheadTimes.includes(5)}}">5分钟前</text>
<text a:if="{{aheadTimes.includes(15)}}">15分钟前</text>
<text a:if="{{aheadTimes.includes(30)}}">30分钟前</text>
<text a:if="{{aheadTimes.includes(60)}}">1小时前</text>
<text a:if="{{aheadTimes.includes(1440)}}">1天前</text>
<text a:if="{{aheadTimes.includes(2880)}}">2天前</text>
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
提醒
</text>
<text class="close iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}" data-icon="iconhuiqiantixing" catchTap="closeEditList"></text>
</view> </view>
</view> </view>
</view> </view>
</view> <!-- 重复 -->
<!-- 描述 --> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}"> <view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="describe" a:if="{{!!remark}}">
<view class="iconfont icondidianmiaoshu">
</view>
<view class="describeText" data-nextPage="addRemark" onTap="nextPage">
{{remark}}
</view>
<view class="iconfont iconshanchu" data-icon="icondidianmiaoshu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
</view>
</view>
</view>
<!-- 编辑列表 -->
<view class="editList">
<view a:if="{{!!scheduleItem?organizer==permissions&&!locationName:false}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei">
<view class="listIcon iconfont icondingwei">
</view> </view>
<view class="listText"> <view class="repeat" a:if="{{!!scheduleItem&&!!repeatable}}">
地点 <view class="iconfont iconchongfu">
</view>
<view class="repeatContaint">
<view class="repeatTime" data-nextPage="repeatMechanism" onTap="nextPage">
<text>{{recurrenceModel.model=='day_in_week'?(recurrenceModel.weekDayList.length==1?repeatWeek:'每周的工作日重复'):recurrenceModel.model=='every_day'?'每天重复': '不重复'}}</text>
<view class="iconfont iconshanchu" data-icon="iconchongfu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
</view>
</view>
<view class="terminationTime" onTap="selectTerminal" a:if="{{ recurrenceModel.model !== 'no_repeat' }}">
<text a:if="{{recurrenceModel.forever == '1'}}">永不截止</text>
<text a:else>截止至{{recurrenceModel.terminateTime}}</text>
</view>
</view>
</view> </view>
</view> </view>
<view a:if="{{!!scheduleItem?!aheadTimes.length&&organizer==permissions:!aheadTimes.length}}" class="listGroup" onTap="editSchedule" data-icon="iconhuiqiantixing"> <!-- 描述 -->
<view class="listIcon iconfont iconhuiqiantixing"> <view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view> </view>
<view class="listText"> <view class="describe" a:if="{{!!remark}}">
提醒 <view class="iconfont icondidianmiaoshu">
</view>
<view class="describeText" data-nextPage="addRemark" onTap="nextPage">
{{remark}}
</view>
<view class="iconfont iconshanchu" data-icon="icondidianmiaoshu" catchTap="closeEditList" a:if="{{!!scheduleItem?(organizer==permissions?true:false):true}}">
</view>
</view> </view>
</view> </view>
<view a:if="{{!repeatable&&!!scheduleItem&&organizer==permissions}}" class="listGroup" onTap="editSchedule" data-icon="iconchongfu"> <!-- 编辑列表 -->
<view class="listIcon iconfont iconchongfu"> <view class="editList">
<view a:if="{{!!scheduleItem?organizer==permissions&&!locationName:false}}" class="listGroup" onTap="editSchedule" data-icon="icondingwei">
<view class="listIcon iconfont icondingwei">
</view>
<view class="listText">
地点
</view>
</view> </view>
<view class="listText"> <view a:if="{{!!scheduleItem?!aheadTimes.length&&organizer==permissions:!aheadTimes.length}}" class="listGroup" onTap="editSchedule" data-icon="iconhuiqiantixing">
重复 <view class="listIcon iconfont iconhuiqiantixing">
</view>
<view class="listText">
提醒
</view>
</view> </view>
</view> <view a:if="{{!repeatable&&!!scheduleItem&&organizer==permissions}}" class="listGroup" onTap="editSchedule" data-icon="iconchongfu">
<view a:if="{{!remark&&!!scheduleItem&&organizer==permissions}}" class="listGroup" onTap="editSchedule" data-icon="icondidianmiaoshu"> <view class="listIcon iconfont iconchongfu">
<view class="listIcon iconfont icondidianmiaoshu"> </view>
<view class="listText">
重复
</view>
</view> </view>
<view class="listText"> <view a:if="{{!remark&&!!scheduleItem&&organizer==permissions}}" class="listGroup" onTap="editSchedule" data-icon="icondidianmiaoshu">
描述 <view class="listIcon iconfont icondidianmiaoshu">
</view>
<view class="listText">
描述
</view>
</view> </view>
</view> <view a:if="{{isRepeat==0&&!!scheduleItem}}" class="listGroup" onTap="editSchedule" data-icon="iconshanchu">
<view a:if="{{isRepeat==0&&!!scheduleItem}}" class="listGroup" onTap="editSchedule" data-icon="iconshanchu"> <view class="listIcon iconfont iconshanchu">
<view class="listIcon iconfont iconshanchu"> </view>
<view class="listText">
删除
</view>
</view> </view>
<view class="listText"> <view a:if="{{!!scheduleItem&&isRepeat==1}}">
删除 <picker range="{{['仅删除此次会议', '删除以后会议', '删除所有会议']}}" onChange="deleteRepeatSchedule">
<view class="listGroup" data-icon="iconshanchu">
<view class="listIcon iconfont iconshanchu">
</view>
<view class="listText">
删除
</view>
</view>
</picker>
</view> </view>
</view> </view>
<view a:if="{{!!scheduleItem&&isRepeat==1}}"> <!-- 编辑重复的时候的保存 -->
<picker range="{{['仅删除此次会议', '删除以后会议', '删除所有会议']}}" onChange="deleteRepeatSchedule"> <picker a:if="{{isRepeat=='1'}}" value="{{0}}" range="{{['仅更新此会议', '更新以后会议', '更新所有会议']}}" onChange="saveRepeat">
<view class="listGroup" data-icon="iconshanchu"> <view>
<view class="listIcon iconfont iconshanchu"> <view class="save">
<view>
{{buttonText}}
</view> </view>
<view class="listText">
删除
</view>
</view>
</picker>
</view>
</view>
<!-- 编辑重复的时候的保存 -->
<picker a:if="{{isRepeat=='1'}}" value="{{0}}" range="{{['仅更新此会议', '更新以后会议', '更新所有会议']}}" onChange="saveRepeat">
<view>
<view class="save">
<view>
{{buttonText}}
</view> </view>
</view> </view>
</picker>
<!-- 保存 -->
<view class="save" a:else>
<view onTap="saveCreate">
{{buttonText}}
</view>
</view> </view>
</picker>
<!-- 保存 -->
<view class="save" a:else>
<view onTap="saveCreate">
{{buttonText}}
</view> </view>
</view> <mw-modal isShowModal="{{isShowModal}}" time="{{propsTime}}" onChange="changeSelectTime">
</view> </mw-modal>
<mw-modal isShowModal="{{isShowModal}}" time="{{propsTime}}" onChange="changeSelectTime"> </block>
</mw-modal> \ No newline at end of file
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule.js
...@@ -28,7 +28,8 @@ create.Page({ ...@@ -28,7 +28,8 @@ create.Page({
requireUsersInfo: [], requireUsersInfo: [],
organizer: '', organizer: '',
isRepeat: '', isRepeat: '',
permissions: '' permissions: '',
showPage: false
}, },
onLoad(event) { onLoad(event) {
let index = new Date().getDay() let index = new Date().getDay()
...@@ -43,9 +44,12 @@ create.Page({ ...@@ -43,9 +44,12 @@ create.Page({
this.store.data.conflictPeople = [] this.store.data.conflictPeople = []
this.store.data.participatorList = [] this.store.data.participatorList = []
this.store.data.locationName = '' this.store.data.locationName = ''
this.store.data.participatorUserId = // <<<<<<< HEAD
this.update() // this.store.data.participatorUserId = []
// this.update()
this.store.data.participatorUserId = [getApp().globalData.userid]
this.update()
var date = new Date(); var date = new Date();
var y = date.getFullYear(); var y = date.getFullYear();
var m = (date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1) : (date.getMonth() + 1);//获取当前月份的日期，不足10补0 var m = (date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1) : (date.getMonth() + 1);//获取当前月份的日期，不足10补0
...@@ -85,6 +89,9 @@ create.Page({ ...@@ -85,6 +89,9 @@ create.Page({
this.store.data.week2 = this.data.week2 this.store.data.week2 = this.data.week2
this.store.data.aheadTimes = [15] this.store.data.aheadTimes = [15]
this.update() this.update()
this.setData({
showPage: true
})
} }
}, },
onShow() { onShow() {
...@@ -451,7 +458,8 @@ create.Page({ ...@@ -451,7 +458,8 @@ create.Page({
time1: res.data.data.startTime.replace(/-/g, '/'), time1: res.data.data.startTime.replace(/-/g, '/'),
time2: res.data.data.endTime.replace(/-/g, '/'), time2: res.data.data.endTime.replace(/-/g, '/'),
week1: this.data.weekList[new Date(res.data.data.startTime.replace(/-/g, "/")).getDay()], week1: this.data.weekList[new Date(res.data.data.startTime.replace(/-/g, "/")).getDay()],
week2: this.data.weekList[new Date(res.data.data.endTime.replace(/-/g, "/")).getDay()] week2: this.data.weekList[new Date(res.data.data.endTime.replace(/-/g, "/")).getDay()],
showPage: true
}) })
this.update() this.update()
this.conflict() this.conflict()
......
pages/index/index.axml
<!-- <mw-select></mw-select> --> <!-- <mw-select></mw-select> -->
版本号：108版 版本号：108版
<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" style="height: 100vh;" scroll-into-view="{{todayStr}}"> <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList"> <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}"> <block a:for="{{scheduleYearList}}">
<block a:if="{{item.type == 'year'}}"> <block a:if="{{item.type == 'year'}}">
......
pages/index/index.js
...@@ -13,6 +13,11 @@ Page({ ...@@ -13,6 +13,11 @@ Page({
}, },
onReady() { onReady() {
}, },
onScroll() {
this.setData({
todayStr: '00000'
})
},
onShow() { onShow() {
// 页面显示 // 页面显示
let data = { let data = {
...@@ -31,8 +36,9 @@ Page({ ...@@ -31,8 +36,9 @@ Page({
scheduleList.push(that.returnScheduleList(2019 + i)) scheduleList.push(that.returnScheduleList(2019 + i))
} }
const today = new Date() const today = new Date()
const finalDate = new Date(today) const finalDate = new Date(today)
finalDate.setDate(today.getDate() - today.getDay()) finalDate.setDate(today.getDate() - today.getDay())
console.log(finalDate.toLocaleDateString())
that.setData({ that.setData({
scheduleList: scheduleList, scheduleList: scheduleList,
todayStr: finalDate.toLocaleDateString(), todayStr: finalDate.toLocaleDateString(),
......
pages/meetingRoomList/meetingRoomList.acss
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
box-sizing: border-box; box-sizing: border-box;
background: #fff; background: #fff;
width: 100%; width: 100%;
position: fixed;
left: 0;
top: 0;
} }
.searchHeader1 { .searchHeader1 {
border-bottom: 1px solid rgba(25,31,37,0.12); border-bottom: 1px solid rgba(25,31,37,0.12);
...@@ -314,4 +317,9 @@ ...@@ -314,4 +317,9 @@
} }
.dataNumSelected { .dataNumSelected {
color: #3296FA; color: #3296FA;
} }
\ No newline at end of file .roomScrollView{
height: 100vh;
padding-top: 192rpx;
box-sizing: border-box;
}
pages/meetingRoomList/meetingRoomList.axml
...@@ -31,47 +31,49 @@ ...@@ -31,47 +31,49 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<view class="reserveMeeting"> <scroll-view scroll-y="{{canScroll}}" class="roomScrollView">
<scroll-view scroll-y='{{true}}' scroll-into-view='searchList' class="reserveMeetingScrollView"> <view class="reserveMeeting">
<view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime"> <scroll-view scroll-y='{{true}}' scroll-into-view='searchList' class="reserveMeetingScrollView">
<view class="roomMessage"> <view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
<view class="reserveRoomMsg"> <view class="roomMessage">
<view class="reserveRoomTitle"> <view class="reserveRoomMsg">
{{item.name}} <view class="reserveRoomTitle">
</view> {{item.name}}
<view class="reserveRoomEquipFacility"> </view>
设备：<text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text> <view class="reserveRoomEquipFacility">
</view> 设备：<text a:for="{{item.equipFacilityNames}}" a:if="{{item2 !== null}}" a:for-item="item2" a:for-index="index2">{{item2}}{{index2 === item.equipFacilityNames.length-1 ? '' : '/'}}</text>
<view class="reserveRoomNumAndLocation">
<view class="reserveRoomNum">
<text class="locationIcon iconfont icondingwei"></text>{{item.capacityNum}}
</view> </view>
<view class="reserveRoomLocation"> <view class="reserveRoomNumAndLocation">
<text class="locationIcon iconfont iconbeifangren"></text>{{item.locationName}} <view class="reserveRoomNum">
<text class="locationIcon iconfont icondingwei"></text>{{item.capacityNum}}
</view>
<view class="reserveRoomLocation">
<text class="locationIcon iconfont iconbeifangren"></text>{{item.locationName}}
</view>
</view> </view>
</view> </view>
</view> </view>
</view> <view class="reserveRoomTimeBar">
<view class="reserveRoomTimeBar"> <view class="reserveRoomTimeBarBg">
<view class="reserveRoomTimeBarBg"> <block a:for="{{item.timeSlotWithMeetingVOS}}" a:for-item="item2" a:for-index="index2">
<block a:for="{{item.timeSlotWithMeetingVOS}}" a:for-item="item2" a:for-index="index2"> <view class="expired" a:if="{{item2.reserveStatus === 'expired'}}">
<view class="expired" a:if="{{item2.reserveStatus === 'expired'}}"> </view>
</view> <view class="occupied" a:if="{{item2.reserveStatus === 'occupied'}}">
<view class="occupied" a:if="{{item2.reserveStatus === 'occupied'}}"> </view>
<view class="reservation" a:if="{{item2.reserveStatus === 'reservation'}}">
</view>
</block>
</view>
<view class="reserveRoomTimeBarNum">
<view a:for="{{timeListStr}}" a:for-item="item2" a:for-index="index2">
{{item2}}
</view> </view>
<view class="reservation" a:if="{{item2.reserveStatus === 'reservation'}}">
</view>
</block>
</view>
<view class="reserveRoomTimeBarNum">
<view a:for="{{timeListStr}}" a:for-item="item2" a:for-index="index2">
{{item2}}
</view> </view>
</view> </view>
</view> </view>
</view> </scroll-view>
</scroll-view> </view>
</view> </scroll-view>
<view a:if="{{isShowModal}}" class="modal"> <view a:if="{{isShowModal}}" class="modal">
<view class="modalContent"> <view class="modalContent">
<view class="modalHeader"> <view class="modalHeader">
...@@ -118,7 +120,7 @@ ...@@ -118,7 +120,7 @@
已过期 已过期
</view> </view>
<view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}"> <view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}">
已被{{item.scheduleList[0].participatorList[0].username}}预定 已被{{item.scheduleList[0].organizerName}}预定
</view> </view>
</view> </view>
</view> </view>
......
pages/meetingRoomList/meetingRoomList.js
...@@ -32,11 +32,12 @@ create.Page({ ...@@ -32,11 +32,12 @@ create.Page({
date: '', date: '',
meetingRoomId: '', meetingRoomId: '',
meetingRoomName: '' meetingRoomName: ''
} },
canScroll: true
}, },
onLoad(query) { onLoad(query) {
// let date = new Date(this.store.data.startTime.replace(/-/g, "/")) let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
let date = new Date() // let date = new Date()
let year = date.getFullYear() let year = date.getFullYear()
let month = `${date.getMonth() + 1}` let month = `${date.getMonth() + 1}`
let day = `${date.getDate()}` let day = `${date.getDate()}`
......
pages/meetingRoomList/meetingRoomList.json
...@@ -2,5 +2,6 @@ ...@@ -2,5 +2,6 @@
"usingComponents": { "usingComponents": {
"timecheckmodal": "../../components/timeCheckModal/timeCheckModal", "timecheckmodal": "../../components/timeCheckModal/timeCheckModal",
"lable-tree": "../../components/selectArea/selectArea" "lable-tree": "../../components/selectArea/selectArea"
} },
"defaultTitle": "所有会议室"
} }
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.js
...@@ -31,9 +31,6 @@ create.Page({ ...@@ -31,9 +31,6 @@ create.Page({
scheduleItem: scheduleItem, scheduleItem: scheduleItem,
pemissions: getApp().globalData.userid pemissions: getApp().globalData.userid
}) })
dd.setNavigationBar({
title: '会议详情'
})
}, },
onShow() { onShow() {
this.setData({ this.setData({
......
pages/scheduleDetail/scheduleDetail.json
{} {
\ No newline at end of file "defaultTitle": "会议详情"
}
\ 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