Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_wechat
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
pseer
gxpt_wechat
Commits
60f094c8
Commit
60f094c8
authored
Jun 09, 2024
by
zhangzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
细节优化
parent
6445240d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
orderResult.vue
pages/orderResult/orderResult.vue
+5
-2
No files found.
pages/orderResult/orderResult.vue
View file @
60f094c8
...
@@ -382,12 +382,15 @@
...
@@ -382,12 +382,15 @@
if
(
start
<
endDateStemp
&&
start
>=
startDateStemp
&&
item
.
status
==
1
){
if
(
start
<
endDateStemp
&&
start
>=
startDateStemp
&&
item
.
status
==
1
){
if
(
this
.
onCheckHourUse
(
item
.
startHoldTime
,
item
.
endHoldTime
)){
if
(
this
.
onCheckHourUse
(
item
.
startHoldTime
,
item
.
endHoldTime
)){
continueStatus
=
false
;
continueStatus
=
false
;
console
.
log
(
1
)
}
else
{
}
else
{
if
(
startDateStemp
>=
moment
(
item
.
startHoldTime
).
valueOf
()
&&
startDateStemp
<
moment
(
item
.
endHoldTime
).
valueOf
()){
if
(
startDateStemp
>=
moment
(
item
.
startHoldTime
).
valueOf
()
&&
startDateStemp
<
moment
(
item
.
endHoldTime
).
valueOf
()){
continueStatus
=
false
;
continueStatus
=
false
;
}
else
if
(
endDateStemp
>
moment
(
item
.
startHoldTime
).
valueOf
()){
console
.
log
(
2
)
}
else
if
(
startDateStemp
<
start
&&
endDateStemp
>=
moment
(
item
.
startHoldTime
).
valueOf
()){
continueStatus
=
false
;
continueStatus
=
false
;
console
.
log
(
3
)
}
}
}
}
...
@@ -417,7 +420,7 @@
...
@@ -417,7 +420,7 @@
if
(
startDateStemp
>=
moment
(
item
.
startHoldTime
).
valueOf
()
&&
startDateStemp
<
moment
(
item
.
endHoldTime
).
valueOf
()){
if
(
startDateStemp
>=
moment
(
item
.
startHoldTime
).
valueOf
()
&&
startDateStemp
<
moment
(
item
.
endHoldTime
).
valueOf
()){
continueStatus
=
false
;
continueStatus
=
false
;
}
else
if
(
endDateStemp
>
moment
(
item
.
startHoldTime
).
valueOf
()){
}
else
if
(
startDateStemp
<
start
&&
endDateStemp
>=
moment
(
item
.
startHoldTime
).
valueOf
()){
continueStatus
=
false
;
continueStatus
=
false
;
}
}
...
...
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