Authored by 周少峰

Merge branch 'hotfix/baseShopSort'

@@ -269,7 +269,10 @@ const getBrandData = (params, extra, channel) => { @@ -269,7 +269,10 @@ const getBrandData = (params, extra, channel) => {
269 269
270 if (params.shopId) { 270 if (params.shopId) {
271 // 店铺以店铺ID查询商品 271 // 店铺以店铺ID查询商品
272 - queryBase.shop_id = params.shopId; 272 + Object.assign(queryBase, {
  273 + shop_id: params.shopId,
  274 + shop: params.shopId
  275 + });
273 } else { 276 } else {
274 // 品牌以品牌ID查询商品 277 // 品牌以品牌ID查询商品
275 queryBase.brand = extra.brandId; 278 queryBase.brand = extra.brandId;