Merge branch 'release/newSearch' of git.yoho.cn:fe/yohobuy-node into release/newSearch

@@ -105,11 +105,11 @@ exports.brand = (req, res, next) => {
                 // 品牌
                 return list.getBrandData(req.query, Object.assign({uid: req.user.id}, brandInfo),
                     req.yoho.channel).then(result => {
-                    Object.assign(resData, result, {
-                        page: 'search'
+                        Object.assign(resData, result, {
+                            page: 'search'
+                        });
+                        res.render('list/brand', resData);
                     });
-                    res.render('list/brand', resData);
-                });
         }
     }).catch(next);
 };

@@ -248,6 +248,7 @@ const getBrandShop = (query) => {
                     cache.set(cKey, ret.data, 3600);
                     return ret.data;
                 }
+                return null;
             });
         }
     });
@@ -285,6 +286,7 @@ const getShopsByBrandId = bid => {
                     cache.set(cKey, ret.data, 3600);
                     return ret.data;
                 }
+                return null;
             });
         }
     });

@@ -16,10 +16,12 @@ module.exports = () => {
                 case 'item':// 商品详情页
                     break;
                 case 'search': // 搜索
-                    if (!req.path) {
-                        req.url = '/product/search/index';
+                    if (req.path === '/product/search/suggest') {
+                        req.url = '/product/search/suggest';
                     } else if (req.path === '/api/suggest') {
                         req.url = '/product/api/suggest';
+                    } else {
+                        req.url = '/product/search/index';
                     }
                     break;
                 case 'list': // 商品列表