Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
U
uni-pdtravel
Project
Project
Details
Activity
Releases
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
panyongping
uni-pdtravel
Commits
6be75965
Commit
6be75965
authored
Jun 26, 2024
by
qipeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取消orderType!=10的限制
parent
bd97ca59
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
orderList.vue
pages/my/order/orderList/orderList.vue
+11
-7
No files found.
pages/my/order/orderList/orderList.vue
View file @
6be75965
...
@@ -564,17 +564,19 @@ export default {
...
@@ -564,17 +564,19 @@ export default {
this
.
lists
.
push
(
item
)
this
.
lists
.
push
(
item
)
}
}
}
else
if
(
this
.
orderStatus
==
'2'
){
//待评价和待使用不能显示组合订单
}
else
if
(
this
.
orderStatus
==
'2'
){
//待评价和待使用不能显示组合订单
if
(
item
.
orderType
!=
10
&&
item
.
orderType
!=
4
){
//item.orderType!=10&&
if
(
item
.
orderType
!=
4
){
this
.
lists
.
push
(
item
)
this
.
lists
.
push
(
item
)
}
}
}
else
if
(
this
.
orderStatus
==
'3'
){
//待收货和待使用不能显示组合订单
}
else
if
(
this
.
orderStatus
==
'3'
){
//待收货和待使用不能显示组合订单
if
(
item
.
orderType
!=
10
&&
item
.
orderType
==
4
){
//item.orderType!=10&&
if
(
item
.
orderType
==
4
){
this
.
lists
.
push
(
item
)
this
.
lists
.
push
(
item
)
}
}
}
else
if
(
this
.
orderStatus
==
'5'
){
//待评价不能显示组合订单
}
else
if
(
this
.
orderStatus
==
'5'
){
//待评价不能显示组合订单
if
(
item
.
orderType
!=
10
){
// if(item.orderType!=10){
this
.
lists
.
push
(
item
)
// }
}
this
.
lists
.
push
(
item
)
}
else
{
}
else
{
if
(
item
.
isDelete
!=
1
){
//( 0 未删除 1 已删除)
if
(
item
.
isDelete
!=
1
){
//( 0 未删除 1 已删除)
this
.
lists
.
push
(
item
)
this
.
lists
.
push
(
item
)
...
@@ -590,10 +592,12 @@ export default {
...
@@ -590,10 +592,12 @@ export default {
// 主订单显示待支付子订单显示除了待支付
// 主订单显示待支付子订单显示除了待支付
this
.
lists
.
forEach
((
item
)
=>
{
this
.
lists
.
forEach
((
item
)
=>
{
if
(
item
.
subOrderType
!=
9
){
if
(
item
.
subOrderType
!=
9
){
if
(
item
.
orderType
==
10
&&
item
.
orderStatus
==
0
){
//item.orderType==10&&
if
(
item
.
orderStatus
==
0
){
item
.
showList
=
true
item
.
showList
=
true
}
}
if
(
item
.
orderType
!=
10
&&
item
.
orderStatus
!=
0
){
//item.orderType!=10&&
if
(
item
.
orderStatus
!=
0
){
item
.
showList
=
true
item
.
showList
=
true
}
}
}
}
...
...
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