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-12-22 17:17:56 +0800
Commit
9c30c6eb0c323b5322b31c49a87e23f5ce340ae2
2 parents
6ea33b47
fe4b8c70
Merge branch 'release/wap-im' of git.yoho.cn:fe/yohobuywap-node into release/wap-im
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
apps/product/controllers/new-shop.js
apps/product/controllers/new-shop.js
View file @
9c30c6e
...
...
@@ -45,14 +45,14 @@ const shop = {
params
.
brand
=
brandId
;
let
searchParam
=
{
let
searchParam
=
Object
.
assign
(
{
isApp
:
req
.
yoho
.
isApp
,
brand
:
brandId
,
type
:
'newest'
,
order
:
'1'
,
page
:
1
,
limit
:
4
};
limit
:
4
,
},
params
);
if
(
req
.
query
.
from
!==
'search'
&&
brandLogo
.
type
===
'2'
&&
brandLogo
.
shopId
)
{
req
.
query
.
shop_id
=
brandLogo
.
shopId
;
...
...
Please
register
or
login
to post a comment