Merge branch 'hotfix/brandList'

@@ -173,16 +173,33 @@ const getBrandViewList = (channel, start, length) => {
                 let listTmp = [];
 
                 _.forEach(subValue, ssubValue => {
+                    let extQs = {};
+
                     // 为品牌名称
                     let href;
 
                     if (switchParams.channelType === 1) {
-                        href = helpers.urlFormat('', {gender: '1,3'}, ssubValue.brand_domain);
+                        Object.assign(extQs, {gender: '1,3'});
                     } else if (switchParams.channelType === 2) {
-                        href = helpers.urlFormat('', {gender: '2,3'}, ssubValue.brand_domain);
-                    } else {
-                        href = helpers.urlFormat('', '', ssubValue.brand_domain);
+                        Object.assign(extQs, {gender: '2,3'});
+                    }
+
+                    switch (ssubValue.type * 1) {
+                        case 1:
+                            extQs = {query: ssubValue.brand_domain};
+                            ssubValue.brand_domain = 'search';
+                            break;
+                        case 2:
+                            if (ssubValue.shop_id) {
+                                Object.assign(extQs, {shopId: ssubValue.shop_id});
+                            }
+                            break;
+                        default:
+                            break;
                     }
+
+                    href = helpers.urlFormat('', extQs, ssubValue.brand_domain);
+
                     let brandItem = {
                         name: ssubValue.brand_name,
                         key: ssubValue.id,