Merge remote-tracking branch 'origin/develop' into develop

@@ -69,7 +69,7 @@ const handleBrandList = origin => {
 
     // 如果有数字，单独处理
     if (hasNum) {
-        let brands = {};
+        let brands = [];
 
         _.forEach(numTemp, (subValue) => {
             brands.push({

@@ -151,8 +151,17 @@ const getBrandShopGoodsData = params => {
         return shopApi.getBrandInfoByDomain({
             domain: params.domain
         }).then(result => {
-            if (result.data && result.data.shop_id) {
-                Object.assign(params, {shopId: result.data.shop_id});
+            if (result.data) {
+                if (result.data.shop_id) {
+                    Object.assign(params, {
+                        shopId: result.data.shop_id
+                    });
+                }
+                if (result.data.id) {
+                    Object.assign(params, {
+                        brand: result.data.id
+                    });
+                }
             }
             return _getGoodsList(params);
         });