Commit 9594fa3d by liang ce

修改bug

parent a4411e87
...@@ -108,4 +108,12 @@ ...@@ -108,4 +108,12 @@
font-size: 24rpx; font-size: 24rpx;
margin-right: 16rpx; margin-right: 16rpx;
color: #191F25; color: #191F25;
}
.treeLabel .iconjianzhu1 {
font-size: 24rpx;
margin-right: 16rpx;
color: #191F25;
}
.labelIsShow{
padding-left: 4rpx;
} }
\ No newline at end of file
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
height: 100%; height: 100%;
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
background: rgba(0,0,0,.1)
} }
.modalContent{ .modalContent{
width: 100%; width: 100%;
......
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
<view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">后天</view> <view class="{{dataNum == '2' ? 'dataNumSelected' : ''}}" onTap="chooseDate" data-num="2">后天</view>
<!-- <view onTap="selectDate">自定义</view> --> <!-- <view onTap="selectDate">自定义</view> -->
</view> </view>
<scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot"> <scroll-view scroll-y='{{true}}' class="modalOccupyTimeSlot" onScroll="modalScroll" scroll-into-view="{{modalOccupyTimeSlotTime}}">
<view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime"> <view class="OccupyTimeList" a:for="{{modalList}}" data-index="{{index}}" onTap="onChangeModalTime" id="{{item.reserveStartTime.substr(10,15)}}">
<!-- <view data-status="{{item.reserveStatus}}" data-index="{{index}}"> <!-- <view data-status="{{item.reserveStatus}}" data-index="{{index}}">
<timecheckmodal <timecheckmodal
startTime="{{meetingTime.startTime}}" startTime="{{meetingTime.startTime}}"
......
...@@ -33,7 +33,8 @@ create.Page({ ...@@ -33,7 +33,8 @@ create.Page({
meetingRoomId: '', meetingRoomId: '',
meetingRoomName: '' meetingRoomName: ''
}, },
canScroll: true canScroll: true,
modalOccupyTimeSlotTime: '123'
}, },
onLoad(query) { onLoad(query) {
let date = new Date(this.store.data.startTime.replace(/-/g, "/")) let date = new Date(this.store.data.startTime.replace(/-/g, "/"))
...@@ -121,6 +122,9 @@ create.Page({ ...@@ -121,6 +122,9 @@ create.Page({
let that = this let that = this
let roomId = e.currentTarget.dataset.roomid; let roomId = e.currentTarget.dataset.roomid;
let dateTime = this.data.search.time let dateTime = this.data.search.time
let modalDate = new Date();
let modalMins = modalDate.getMinutes();
let modalHour = modalMins<30 ? modalDate.getHours()<10? '0'+modalDate.getHours():modalDate.getHours() : (modalDate.getHours() + 1)<10? '0'+ (modalDate.getHours() + 1):(modalDate.getHours() + 1)
let data = { let data = {
meetingRoomId: roomId, meetingRoomId: roomId,
startTime: dateTime startTime: dateTime
...@@ -151,10 +155,17 @@ create.Page({ ...@@ -151,10 +155,17 @@ create.Page({
}) })
that.setData({ that.setData({
modalList: modalList, modalList: modalList,
isShowModal: true isShowModal: true,
// modalOccupyTimeSlotTime: `${modalHour}:${modalMins<30? '30' : '00'}`
modalOccupyTimeSlotTime: '10:30'
}) })
}) })
}, },
modalScroll(){
this.setData({
modalOccupyTimeSlotTime: '12312312'
})
},
// 修改弹框checkBox // 修改弹框checkBox
onChangeModalTime(e){ onChangeModalTime(e){
let that = this; let that = this;
...@@ -412,6 +423,9 @@ create.Page({ ...@@ -412,6 +423,9 @@ create.Page({
// 点击今天明天后天 // 点击今天明天后天
chooseDate(e){ chooseDate(e){
let that = this; let that = this;
let modalDate = new Date();
let modalMins = modalDate.getMinutes();
let modalHour = modalMins<30 ? modalDate.getHours()<10? '0'+modalDate.getHours():modalDate.getHours() : (modalDate.getHours() + 1)<10? '0'+ (modalDate.getHours() + 1):(modalDate.getHours() + 1)
let num = parseInt(e.currentTarget.dataset.num); let num = parseInt(e.currentTarget.dataset.num);
let selectDate = new Date(this.data.meetingTime.date); let selectDate = new Date(this.data.meetingTime.date);
selectDate.setDate(selectDate.getDate() + num) selectDate.setDate(selectDate.getDate() + num)
...@@ -465,12 +479,14 @@ create.Page({ ...@@ -465,12 +479,14 @@ create.Page({
}) })
that.setData({ that.setData({
modalList: modalList2, modalList: modalList2,
dataNum: num dataNum: num,
modalOccupyTimeSlotTime: `${modalHour}:${modalMins<30? '30' : '00'}`
}) })
} else { } else {
that.setData({ that.setData({
modalList: modalList, modalList: modalList,
dataNum: num dataNum: num,
modalOccupyTimeSlotTime: `${modalHour}:${modalMins<30? '30' : '00'}`
}) })
} }
}) })
...@@ -484,7 +500,8 @@ create.Page({ ...@@ -484,7 +500,8 @@ create.Page({
endTime: '', endTime: '',
date: '', date: '',
meetingRoomId: '' meetingRoomId: ''
} },
dataNum: 0
}) })
}, },
onDetermine(){ onDetermine(){
......
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