Skip to content

S
schedule
Commit 0016e485 by fengzhaoyu
Options

合并冲突

parents 2030e424 a67cb584
Showing with 88 additions and 52 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 @@
"pages/participantsDetail/participantsDetail",
"pages/editFile/editFile",
"pages/createOrEditSchedule/createOrEditSchedule"
]
],
"window": {
"titleBarColor": "#FFFFFF"
}
}
pages/createOrEditSchedule/createOrEditSchedule.js
......@@ -28,7 +28,8 @@ create.Page({
requireUsersInfo: [],
organizer: '',
isRepeat: '',
permissions: ''
permissions: '',
showPage: false
},
onLoad(event) {
let index = new Date().getDay()
......@@ -43,9 +44,12 @@ create.Page({
this.store.data.conflictPeople = []
this.store.data.participatorList = []
this.store.data.locationName = ''
this.store.data.participatorUserId =
this.update()
// <<<<<<< HEAD
// this.store.data.participatorUserId = []
// this.update()
this.store.data.participatorUserId = [getApp().globalData.userid]
this.update()
var date = new Date();
var y = date.getFullYear();
var m = (date.getMonth() + 1) < 10 ? "0" + (date.getMonth() + 1) : (date.getMonth() + 1);//获取当前月份的日期，不足10补0
......@@ -85,6 +89,9 @@ create.Page({
this.store.data.week2 = this.data.week2
this.store.data.aheadTimes = [15]
this.update()
this.setData({
showPage: true
})
}
},
onShow() {
......@@ -451,7 +458,8 @@ create.Page({
time1: res.data.data.startTime.replace(/-/g, '/'),
time2: res.data.data.endTime.replace(/-/g, '/'),
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.conflict()
......
pages/index/index.axml
<!-- <mw-select></mw-select> -->
版本号：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="{{scheduleYearList}}">
<block a:if="{{item.type == 'year'}}">
......
pages/index/index.js
......@@ -13,6 +13,11 @@ Page({
},
onReady() {
},
onScroll() {
this.setData({
todayStr: '00000'
})
},
onShow() {
// 页面显示
let data = {
......@@ -31,8 +36,9 @@ Page({
scheduleList.push(that.returnScheduleList(2019 + i))
}
const today = new Date()
const finalDate = new Date(today)
const finalDate = new Date(today)
finalDate.setDate(today.getDate() - today.getDay())
console.log(finalDate.toLocaleDateString())
that.setData({
scheduleList: scheduleList,
todayStr: finalDate.toLocaleDateString(),
......
pages/meetingRoomList/meetingRoomList.acss
......@@ -4,6 +4,9 @@
box-sizing: border-box;
background: #fff;
width: 100%;
position: fixed;
left: 0;
top: 0;
}
.searchHeader1 {
border-bottom: 1px solid rgba(25,31,37,0.12);
......@@ -314,4 +317,9 @@
}
.dataNumSelected {
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 @@
</scroll-view>
</view>
</view>
<view class="reserveMeeting">
<scroll-view scroll-y='{{true}}' scroll-into-view='searchList' class="reserveMeetingScrollView">
<view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
<view class="roomMessage">
<view class="reserveRoomMsg">
<view class="reserveRoomTitle">
{{item.name}}
</view>
<view class="reserveRoomEquipFacility">
设备：<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>
<view class="reserveRoomNumAndLocation">
<view class="reserveRoomNum">
<text class="locationIcon iconfont icondingwei"></text>{{item.capacityNum}}
<scroll-view scroll-y="{{canScroll}}" class="roomScrollView">
<view class="reserveMeeting">
<scroll-view scroll-y='{{true}}' scroll-into-view='searchList' class="reserveMeetingScrollView">
<view class="meetingRoomContent" a:for="{{reserveRoomList}}" data-roomid="{{item.meetingRoomId}}" data-roomname="{{item.name}}" onTap="changeRoomTime">
<view class="roomMessage">
<view class="reserveRoomMsg">
<view class="reserveRoomTitle">
{{item.name}}
</view>
<view class="reserveRoomEquipFacility">
设备：<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>
<view class="reserveRoomLocation">
<text class="locationIcon iconfont iconbeifangren"></text>{{item.locationName}}
<view class="reserveRoomNumAndLocation">
<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 class="reserveRoomTimeBar">
<view class="reserveRoomTimeBarBg">
<block a:for="{{item.timeSlotWithMeetingVOS}}" a:for-item="item2" a:for-index="index2">
<view class="expired" a:if="{{item2.reserveStatus === 'expired'}}">
</view>
<view class="occupied" a:if="{{item2.reserveStatus === 'occupied'}}">
<view class="reserveRoomTimeBar">
<view class="reserveRoomTimeBarBg">
<block a:for="{{item.timeSlotWithMeetingVOS}}" a:for-item="item2" a:for-index="index2">
<view class="expired" a:if="{{item2.reserveStatus === 'expired'}}">
</view>
<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 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>
</scroll-view>
</view>
</scroll-view>
</view>
</scroll-view>
<view a:if="{{isShowModal}}" class="modal">
<view class="modalContent">
<view class="modalHeader">
......@@ -118,7 +120,7 @@
已过期
</view>
<view class="occupiedStatus" a:if="{{item.reserveStatus === 'occupied'}}">
已被{{item.scheduleList[0].participatorList[0].username}}预定
已被{{item.scheduleList[0].organizerName}}预定
</view>
</view>
</view>
......
pages/meetingRoomList/meetingRoomList.js
......@@ -32,11 +32,12 @@ create.Page({
date: '',
meetingRoomId: '',
meetingRoomName: ''
}
},
canScroll: true
},
onLoad(query) {
// let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
let date = new Date()
let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
// let date = new Date()
let year = date.getFullYear()
let month = `${date.getMonth() + 1}`
let day = `${date.getDate()}`
......
pages/meetingRoomList/meetingRoomList.json
......@@ -2,5 +2,6 @@
"usingComponents": {
"timecheckmodal": "../../components/timeCheckModal/timeCheckModal",
"lable-tree": "../../components/selectArea/selectArea"
}
},
"defaultTitle": "所有会议室"
}
\ No newline at end of file
pages/scheduleDetail/scheduleDetail.js
......@@ -31,9 +31,6 @@ create.Page({
scheduleItem: scheduleItem,
pemissions: getApp().globalData.userid
})
dd.setNavigationBar({
title: '会议详情'
})
},
onShow() {
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