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
113c458d
Commit
113c458d
authored
5 years ago
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决会议室跨天查询问题和过期时间判定
parent
72dfd681
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
meetingRoomList.js
pages/meetingRoomList/meetingRoomList.js
+7
-3
No files found.
pages/meetingRoomList/meetingRoomList.js
View file @
113c458d
...
...
@@ -951,8 +951,8 @@ create.Page({
endTimeDate
.
setMinutes
(
endTimeDate
.
getMinutes
()
+
30
);
let
data
=
{
meetingRoomId
:
this
.
data
.
meetingTime
.
meetingRoomId
,
start
Time
:
`
${
startTime
}
:00`
,
end
Time
:
`
${
endTimeDate
.
getFullYear
()}
-
${
end
Time
:
`
${
startTime
}
:00`
,
start
Time
:
`
${
endTimeDate
.
getFullYear
()}
-
${
endTimeDate
.
getMonth
()
+
1
<
10
?
"0"
+
(
endTimeDate
.
getMonth
()
+
1
)
:
endTimeDate
.
getMonth
()
+
1
...
...
@@ -1099,11 +1099,15 @@ create.Page({
startTime
:
meetingDate
};
getReserveRoomList
(
data
).
then
(
res
=>
{
const
isExpired
=
new
Date
().
getTime
()
>
new
Date
(
`
${
meetingDate
.
replace
(
/-/g
,
"/"
)}
23:59:59`
);
let
modalList
=
res
.
data
.
data
[
0
].
timeSlotWithMeetingVOS
.
map
(
item
=>
{
// 判断是否过期
if
(
item
.
reserveStatus
===
"expired"
||
item
.
reserveStatus
===
"occupied"
item
.
reserveStatus
===
"occupied"
||
isExpired
)
{
return
{
...
item
,
...
...
This diff is collapsed.
Click to expand it.
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