Commit 9594fa3d by liang ce

修改bug

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