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
aa3431dd
Commit
aa3431dd
authored
Mar 07, 2024
by
zhangzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
细节优化
parent
60755f0c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
manifest.json
manifest.json
+1
-1
order.vue
pages/order/order.vue
+2
-2
No files found.
manifest.json
View file @
aa3431dd
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
},
},
"requiredPrivateInfos"
:
[
"getLocation"
],
"requiredPrivateInfos"
:
[
"getLocation"
],
"uniStatistics"
:
{
"uniStatistics"
:
{
"enable"
:
tru
e
"enable"
:
fals
e
}
}
},
},
"mp-alipay"
:
{
"mp-alipay"
:
{
...
...
pages/order/order.vue
View file @
aa3431dd
...
@@ -760,8 +760,8 @@
...
@@ -760,8 +760,8 @@
}
}
// 在时间小时段内,在被占用的情况下,新增订单的开始分钟时间需要占用结束时间后,结束分钟时间需在时间占用开始前
// 在时间小时段内,在被占用的情况下,新增订单的开始分钟时间需要占用结束时间后,结束分钟时间需在时间占用开始前
if
((
this
.
dateIntervalList
[
index
].
status
==
1
&&
index
>
start
&&
index
<
start
+
this
.
duration
)
||
if
((
this
.
dateIntervalList
[
index
].
status
==
1
&&
index
>
start
&&
index
<
start
+
this
.
duration
)
||
(
this
.
dateIntervalList
[
index
].
status
==
1
&&
index
==
end
&&
Number
(
startM
)
>=
Number
(
(
this
.
dateIntervalList
[
index
].
status
==
1
&&
this
.
orderType
==
1
&&
index
==
end
&&
Number
(
startM
)
>=
Number
(
endTimeM
))
||
endTimeM
))
(
this
.
dateIntervalList
[
index
].
status
==
1
&&
this
.
orderType
==
2
&&
index
>
start
&&
Number
(
endM
)
>=
Number
(
endTimeM
))
)
{
)
{
// 表示时间点被占用,无法选择
// 表示时间点被占用,无法选择
this
.
useDateStatus
=
false
this
.
useDateStatus
=
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