Authored by 郝肖肖

Merge branch 'release/wap-im' of git.yoho.cn:fe/yohobuywap-node into release/wap-im

... ... @@ -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;
... ...