Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
9594fa3d
Commit
9594fa3d
authored
Feb 27, 2020
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
a4411e87
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
7 deletions
+34
-7
selectArea.acss
components/selectArea/selectArea.acss
+9
-0
meetingRoomList.acss
pages/meetingRoomList/meetingRoomList.acss
+1
-0
meetingRoomList.axml
pages/meetingRoomList/meetingRoomList.axml
+2
-2
meetingRoomList.js
pages/meetingRoomList/meetingRoomList.js
+22
-5
No files found.
components/selectArea/selectArea.acss
View file @
9594fa3d
...
...
@@ -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
pages/meetingRoomList/meetingRoomList.acss
View file @
9594fa3d
...
...
@@ -177,6 +177,7 @@
height: 100%;
display: flex;
align-items: flex-end;
background: rgba(0,0,0,.1)
}
.modalContent{
width: 100%;
...
...
pages/meetingRoomList/meetingRoomList.axml
View file @
9594fa3d
...
...
@@ -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}}"
...
...
pages/meetingRoomList/meetingRoomList.js
View file @
9594fa3d
...
...
@@ -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
(){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment