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-11-02 11:51:19 +0800
Commit
d57e3532b2338655b86575275dbd7d24b73d8b25
2 parents
32fe6e4d
a524dc61
Merge branch 'hotfix/single' of git.yoho.cn:fe/yohobuywap-node into hotfix/single
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
apps/activity/models/shopCollect.js
public/js/activity/shop-collect.page.js
apps/activity/models/shopCollect.js
View file @
d57e353
...
...
@@ -57,7 +57,7 @@ const shopNav = (channelId) => {
code
:
200
}).
then
((
result
)
=>
{
if
(
result
.
data
)
{
if
(
result
.
data
.
length
===
1
&&
result
.
data
[
0
]
===
'NULL'
)
{
if
(
result
.
data
.
length
===
0
||
(
result
.
data
.
length
===
1
&&
result
.
data
[
0
]
===
'NULL'
)
)
{
return
false
;
}
else
{
return
result
.
data
;
...
...
public/js/activity/shop-collect.page.js
View file @
d57e353
...
...
@@ -192,7 +192,8 @@ function shopNavData() {
if
(
data
===
false
)
{
shopListData
(
'null'
);
$
(
'.shop-nav'
).
hide
();
return
;
// return;
}
$
(
'.shop-nav'
).
html
(
navString
);
...
...
Please
register
or
login
to post a comment