Merge branch 'feature/brandsTree' into 'release/5.4.1'

品牌跳转链接改为搜索



See merge request !317

@@ -45,7 +45,10 @@ const handleBrandList = origin => {
         }
         }
 
 
         _.forEach(value, function(subValue) {
         _.forEach(value, function(subValue) {
-            subValue.brandUrl = '//m.yohobuy.com/product/index/brand?domain=' + subValue.brand_domain + '&app_type=1';
+            subValue.brandUrl = helpers.urlFormat('/', {
+                query: subValue.brand_domain,
+                app_type: 1
+            }, 'search');
             subValue.name = subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name;
             subValue.name = subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name;
             subValue.domain = subValue.brand_domain;
             subValue.domain = subValue.brand_domain;
         });
         });

@@ -22,6 +22,7 @@ const shop = {
         let brandLogo = {};
         let brandLogo = {};
         let title = '';
         let title = '';
         let uid = req.user.uid || 0;
         let uid = req.user.uid || 0;
+        let shopEnter;
 
 
         if (req.query.shop_id) {
         if (req.query.shop_id) {
             return shop.shop(req, res, next);
             return shop.shop(req, res, next);
@@ -73,7 +74,14 @@ const shop = {
                     if (brandId === 0) {
                     if (brandId === 0) {
                         params.query = domain;
                         params.query = domain;
                     }
                     }
-                    if (brandShop.length > 0 || brandLogo) {
+
+                    if (req.query.app_type && parseInt(req.query.app_type, 10) === 1) {
+                        shopEnter = false;
+                    } else {
+                        shopEnter = true;
+                    }
+
+                    if (brandShop.length > 0 || brandLogo && shopEnter) {
                         params = _.assign({
                         params = _.assign({
                             brandWay: _.isEmpty(brandShop) ? brandLogo : brandShop,
                             brandWay: _.isEmpty(brandShop) ? brandLogo : brandShop,
                             search: {
                             search: {

@@ -69,11 +69,18 @@ const list = (req, res, next) => {
 
 
                     // 跳转到品牌商品列表页
                     // 跳转到品牌商品列表页
                     if (domain !== null && !params.shop_id) {
                     if (domain !== null && !params.shop_id) {
-                        let url = helpers.urlFormat('', {
+                        let urlPro = {
                             from: 'search',
                             from: 'search',
                             query: query
                             query: query
+                        }
+
+                        if (req.query.app_type) {
+                            urlPro = _.assign(urlPro, {
+                                app_type: req.query.app_type
+                            })
+                        }
 
 
-                        }, domain);
+                        let url = helpers.urlFormat('', urlPro, domain);
 
 
                         return res.redirect(url);
                         return res.redirect(url);
                     }
                     }

@@ -212,7 +212,7 @@
         }
         }
 
 
         .want {
         .want {
-            max-height: 300px;
+            max-height: 250px;
             overflow: hidden;
             overflow: hidden;
         }
         }
     }
     }