Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
姜枫
2016-10-27 20:15:59 +0800
Commit
d3960f7c3cbebbe392a25106fc9f8881301420db
2 parents
b66d3030
bfa5fe21
Merge branch 'feature/11.11' of
http://git.yoho.cn/fe/yohobuywap-node
into feature/11.11
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
apps/channel/models/channel.js
apps/channel/models/channel.js
View file @
d3960f7
...
...
@@ -204,10 +204,14 @@ const _getChannelList = () => {
}
});
return
Object
.
keys
(
list
).
length
?
list
:
channelList
;
return
Object
.
keys
(
list
).
length
?
list
:
{
channelList
:
channelList
};
}
else
{
logger
.
error
(
'channel select code is not 200'
);
return
channelList
;
return
{
channelList
:
channelList
};
}
});
};
...
...
Please
register
or
login
to post a comment