Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
60e79c44
Commit
60e79c44
authored
Jun 19, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
a131fe87
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
xgg-saas-merchant/app/base/api/impl/h5/merchantApi.js
+12
-1
xgg-saas-merchant/app/base/controller/impl/saas/orderCtl.js
+5
-1
No files found.
xgg-saas-merchant/app/base/api/impl/h5/merchantApi.js
View file @
60e79c44
...
@@ -292,11 +292,22 @@ class TestAPI extends APIBase {
...
@@ -292,11 +292,22 @@ class TestAPI extends APIBase {
return
res
;
return
res
;
}
}
let
StatusMap
=
res
.
data
;
let
StatusMap
=
res
.
data
;
// for(let item of listRes.data.rows){
// if(StatusMap[item.id]){
// item.handle_name = StatusMap[item.id]['name3'] || "处理中";
// }else{
// item.handle_name ="订单处理中";
// }
// }
for
(
let
item
of
listRes
.
data
.
rows
){
for
(
let
item
of
listRes
.
data
.
rows
){
if
(
StatusMap
[
item
.
id
]){
if
(
StatusMap
[
item
.
id
]){
item
.
handle_name
=
StatusMap
[
item
.
id
][
'name3'
]
||
"处理中"
;
item
.
handle_name
=
StatusMap
[
item
.
id
][
'name3'
]
||
"处理中"
;
}
else
if
(
item
.
pay_status
==
"10"
){
item
.
handle_name
=
"订单待处理"
;
}
else
if
(
item
.
audit_status
==
"30"
){
item
.
handle_name
=
"订单处理失败"
;
}
else
{
}
else
{
item
.
handle_name
=
"订单处理中"
;
item
.
handle_name
=
"订单处理中"
;
}
}
}
}
return
this
.
returnSuccess
(
listRes
.
data
);
return
this
.
returnSuccess
(
listRes
.
data
);
...
...
xgg-saas-merchant/app/base/controller/impl/saas/orderCtl.js
View file @
60e79c44
...
@@ -52,8 +52,12 @@ class ChannelCtl extends CtlBase {
...
@@ -52,8 +52,12 @@ class ChannelCtl extends CtlBase {
for
(
let
item
of
listRes
.
data
.
rows
){
for
(
let
item
of
listRes
.
data
.
rows
){
if
(
StatusMap
[
item
.
id
]){
if
(
StatusMap
[
item
.
id
]){
item
.
handle_name
=
StatusMap
[
item
.
id
][
'name3'
]
||
"处理中"
;
item
.
handle_name
=
StatusMap
[
item
.
id
][
'name3'
]
||
"处理中"
;
}
else
if
(
item
.
pay_status
==
"10"
){
item
.
handle_name
=
"订单待处理"
;
}
else
if
(
item
.
audit_status
==
"30"
){
item
.
handle_name
=
"订单处理失败"
;
}
else
{
}
else
{
item
.
handle_name
=
"订单处理中"
;
item
.
handle_name
=
"订单处理中"
;
}
}
}
}
return
listRes
;
return
listRes
;
...
...
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