Merge branch 'feature/prod-list-opt' into release/wap-optim

@@ -43,6 +43,8 @@ const list = (req, res, next) => {
                 limit: 6,
             };
 
+            query = query.toLowerCase();
+
             /* 判断是不是品牌, 是品牌跳到品牌列表页(显示搜索框),判断是不是品类, 是品类加导航标题(不显示搜索框) */
             return Promise.all([
                 searchModel.getBrandDomain(query),
@@ -50,8 +52,6 @@ const list = (req, res, next) => {
                 searchModel.getSearchData(initialData)
             ]).then(result => {
                 if (query) {
-                    query = query.toLowerCase();
-
                     domain = result[0];
 
                     // 跳转到品牌商品列表页

@@ -43,8 +43,8 @@ const _processBrandNames = (list) => {
                 brandName: obj.brandDomain && obj.brandName.toLowerCase()
             });
 
-            brandDomainMap[obj.brandDomain] = obj.brandDomain;
-            brandNameMap[obj.brandName] = obj.brandDomain;
+            brandDomainMap[obj.brandDomain.toLowerCase()] = obj.brandDomain.toLowerCase();
+            brandNameMap[obj.brandName.toLowerCase()] = obj.brandDomain.toLowerCase();
         });
     });
 
@@ -320,10 +320,13 @@ const searchKeyActivity = (params) => {
  * @returns {*|Promise.<TResult>}
  */
 const getBrandDomain = (query) => {
-    const brandDomainMap = cache.get('brandDomainMap');
-    const brandNameMap = cache.get('brandNameMap');
+    let brandDomainMap = cache.get('brandDomainMap');
+    let brandNameMap = cache.get('brandNameMap');
 
     const fn = () => {
+        brandDomainMap = cache.get('brandDomainMap');
+        brandNameMap = cache.get('brandNameMap');
+
         let ret = null;
 
         if (!_.isEmpty(brandDomainMap) && brandDomainMap.hasOwnProperty(query)) {