Merge branch 'release/wap-im' of git.yoho.cn:fe/yohobuywap-node into release/wap-im
Showing
1 changed file
with
3 additions
and
3 deletions
@@ -45,14 +45,14 @@ const shop = { | @@ -45,14 +45,14 @@ const shop = { | ||
45 | 45 | ||
46 | params.brand = brandId; | 46 | params.brand = brandId; |
47 | 47 | ||
48 | - let searchParam = { | 48 | + let searchParam = Object.assign({ |
49 | isApp: req.yoho.isApp, | 49 | isApp: req.yoho.isApp, |
50 | brand: brandId, | 50 | brand: brandId, |
51 | type: 'newest', | 51 | type: 'newest', |
52 | order: '1', | 52 | order: '1', |
53 | page: 1, | 53 | page: 1, |
54 | - limit: 4 | ||
55 | - }; | 54 | + limit: 4, |
55 | + }, params); | ||
56 | 56 | ||
57 | if (req.query.from !== 'search' && brandLogo.type === '2' && brandLogo.shopId) { | 57 | if (req.query.from !== 'search' && brandLogo.type === '2' && brandLogo.shopId) { |
58 | req.query.shop_id = brandLogo.shopId; | 58 | req.query.shop_id = brandLogo.shopId; |
-
Please register or login to post a comment