Merge remote-tracking branch 'origin/release/newSearch'

@@ -232,7 +232,7 @@ const brand = (req, res, next) => {
         }, params);
         }, params);
 
 
         // 无店铺：0--->品牌页 无单品店有多品店：1--->搜索页 有单品店：2--->店铺页面
         // 无店铺：0--->品牌页 无单品店有多品店：1--->搜索页 有单品店：2--->店铺页面
-        if (brandLogo.type === '2' && brandLogo.shopId) {
+        if (req.query.from !== 'search' && brandLogo.type === '2' && brandLogo.shopId) {
             _shop(req, res, brandLogo.shopId);
             _shop(req, res, brandLogo.shopId);
         } else { // 获取品牌店铺信息
         } else { // 获取品牌店铺信息
             listModel.getBrandShops(brandId).then(brandShop => {
             listModel.getBrandShops(brandId).then(brandShop => {
@@ -362,12 +362,14 @@ const favoriteBrand = (req, res, next) => {
             }
             }
         });
         });
 
 
-        refer = refererSplit[0] + '?' + shopId;
+        if (shopId) {
+            refer = refererSplit[0] + '?' + shopId;
+        }
     }
     }
 
 
     let url = helpers.urlFormat('/signin.html') + '?refer=' + refer;
     let url = helpers.urlFormat('/signin.html') + '?refer=' + refer;
 
 
-    if (appVersion) {
+    if (appVersion && appVersion !== 'false') {
         uid = req.query.uid ? crypto.decrypt('', req.query.uid) : req.cookies.appUid;
         uid = req.query.uid ? crypto.decrypt('', req.query.uid) : req.cookies.appUid;
 
 
         if (!uid || uid === 'undefined') {
         if (!uid || uid === 'undefined') {

@@ -46,12 +46,12 @@ const list = (req, res, next) => {
             query = query.toLowerCase();
             query = query.toLowerCase();
             _.forEach(result[0], obj => {
             _.forEach(result[0], obj => {
 
 
-                if (query === obj.brandDomain && /^[a-z0-9]+$/i.test(obj.brandName)) { // 精确查品牌域名
+                if (query === obj.brandDomain) { // 精确查品牌域名
                     domain = query;
                     domain = query;
                     return false;
                     return false;
                 }
                 }
 
 
-                if (query === obj.brandName || query === obj.brandName || query === obj.brandName && /^[a-z0-9]+$/i.test(obj.brandName)) { // 精确查品牌名称
+                if (query === obj.brandName || query === obj.brandName || query === obj.brandName) { // 精确查品牌名称
                     domain = obj.brandDomain;
                     domain = obj.brandDomain;
                     return false;
                     return false;
                 }
                 }

@@ -34,8 +34,8 @@ const _processBrandShops = (list) => {
                 url: helpers.urlFormat('/product/index/brand/', {
                 url: helpers.urlFormat('/product/index/brand/', {
                     shop_id: item.shop_id
                     shop_id: item.shop_id
                 }),
                 }),
-                thumb: helpers.image(item.brandIco, 75, 40),
-                name: item.brandName
+                thumb: helpers.image(item.brand_ico, 75, 40),
+                name: item.brand_name
             });
             });
         }
         }
     });
     });