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
fafe41f3
Commit
fafe41f3
authored
May 16, 2024
by
zhangzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
c3ac9059
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
order.vue
pages/order/order.vue
+7
-5
No files found.
pages/order/order.vue
View file @
fafe41f3
...
@@ -603,11 +603,11 @@
...
@@ -603,11 +603,11 @@
onCheckPackageUse
(
valData
){
onCheckPackageUse
(
valData
){
let
useStatus
=
true
;
let
useStatus
=
true
;
let
startStr
=
`
${
this
.
dateList
[
this
.
dateIndex
].
readDate
}
${
valData
.
packaStartPeriod
}
:00:00`
let
startStr
=
`
${
this
.
dateList
[
this
.
dateIndex
].
readDate
}
${
Number
(
valData
.
packaStartPeriod
)
>=
10
?
valData
.
packaStartPeriod
:
'0'
+
valData
.
packaStartPeriod
}
:00:00`
let
startDate
=
moment
(
moment
().
format
(
startStr
)).
format
(
"YYYY-MM-DD HH:00:00"
);
let
startDate
=
moment
(
moment
().
format
(
startStr
)).
format
(
"YYYY-MM-DD HH:00:00"
);
let
endStr
=
`
${
this
.
dateList
[
this
.
dateIndex
].
readDate
}
${
valData
.
packaEndPeriod
}
:00:00`
let
endStr
=
`
${
this
.
dateList
[
this
.
dateIndex
].
readDate
}
${
Number
(
valData
.
packaEndPeriod
)
>=
10
?
valData
.
packaEndPeriod
:
'0'
+
valData
.
packaEndPeriod
}
:00:00`
let
endDate
=
moment
(
moment
().
format
(
endStr
)).
format
(
"YYYY-MM-DD HH:00:00"
);
let
endDate
=
moment
(
moment
().
format
(
endStr
)).
format
(
"YYYY-MM-DD HH:00:00"
);
console
.
log
(
start
Date
,
endDate
,
6666
)
console
.
log
(
start
Str
,
endStr
,
6666
)
// 如果是续单,则订单的结束时间必须在套餐的开始时间和结束时间内,否则无法续对应的套餐
// 如果是续单,则订单的结束时间必须在套餐的开始时间和结束时间内,否则无法续对应的套餐
if
(
this
.
orderType
==
2
){
if
(
this
.
orderType
==
2
){
if
(
!
(
moment
(
this
.
orderInfo
.
endDate
).
valueOf
()
>=
moment
(
startDate
).
valueOf
()
&&
moment
(
this
.
orderInfo
.
endDate
).
valueOf
()
<=
moment
(
endDate
).
valueOf
())){
if
(
!
(
moment
(
this
.
orderInfo
.
endDate
).
valueOf
()
>=
moment
(
startDate
).
valueOf
()
&&
moment
(
this
.
orderInfo
.
endDate
).
valueOf
()
<=
moment
(
endDate
).
valueOf
())){
...
@@ -670,10 +670,12 @@
...
@@ -670,10 +670,12 @@
if
(
this
.
modeIndex2
==
index
||
!
val
.
show
)
return
;
if
(
this
.
modeIndex2
==
index
||
!
val
.
show
)
return
;
this
.
tempPackageIndex
=
index
;
this
.
tempPackageIndex
=
index
;
let
startStr
=
`
${
this
.
dateList
[
this
.
dateIndex
].
readDate
}
${
this
.
packageMode
[
this
.
tempPackageIndex
].
packaStartPeriod
}
:00:00`
let
hStartStr
=
this
.
packageMode
[
this
.
tempPackageIndex
].
packaStartPeriod
let
startStr
=
`
${
this
.
dateList
[
this
.
dateIndex
].
readDate
}
${
Number
(
hStartStr
)
>=
10
?
hStartStr
:
'0'
+
hStartStr
}
:00:00`
let
startDate
=
moment
(
moment
().
format
(
startStr
)).
format
(
"YYYY-MM-DD HH:00:00"
);
let
startDate
=
moment
(
moment
().
format
(
startStr
)).
format
(
"YYYY-MM-DD HH:00:00"
);
let
endStr
=
`
${
this
.
dateList
[
this
.
dateIndex
].
readDate
}
${
this
.
packageMode
[
this
.
tempPackageIndex
].
packaEndPeriod
}
:00:00`
let
hEndtStr
=
this
.
packageMode
[
this
.
tempPackageIndex
].
packaEndPeriod
let
endStr
=
`
${
this
.
dateList
[
this
.
dateIndex
].
readDate
}
${
Number
(
hEndtStr
)
>=
10
?
hEndtStr
:
'0'
+
hEndtStr
}
:00:00`
let
endDate
=
moment
(
moment
().
format
(
endStr
)).
format
(
"YYYY-MM-DD HH:00:00"
);
let
endDate
=
moment
(
moment
().
format
(
endStr
)).
format
(
"YYYY-MM-DD HH:00:00"
);
// 如果此套餐的结束时间在11点前,则为通宵套餐,会在当天及明天进行找合适的时间段,否则则没有合适的套餐时段
// 如果此套餐的结束时间在11点前,则为通宵套餐,会在当天及明天进行找合适的时间段,否则则没有合适的套餐时段
...
...
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