Merge branch 'feature/searchTerms' into release/5.5

@@ -201,28 +201,27 @@ exports.getBrands4Filter = (params) => {
  * @return {[type]}        [description]
  */
 exports.getSearchRecommend = (channel, params) => {
-    return searchApi.getSearchRecommend(channel, params).then(result => {
 
-        if (result.code === 200) {
+    let channelNum = 1;
 
-            let channelNum = 1; // -eslint-disable-line
-
-            switch (channel) {
-                case 'boys':
-                    channelNum = 1;
-                    break;
-                case 'girls':
-                    channelNum = 2;
-                    break;
-                case 'kids':
-                    channelNum = 3;
-                    break;
-                case 'lifestyle':
-                    channelNum = 3;
-                    break;
-                default:
-                    break;
-            }
+    switch (channel) {
+        case 'boys':
+            channelNum = 1;
+            break;
+        case 'girls':
+            channelNum = 2;
+            break;
+        case 'kids':
+        case 'lifestyle':
+            channelNum = 3;
+            break;
+        default:
+            break;
+    }
+
+    return searchApi.getSearchRecommend(channelNum, params).then(result => {
+
+        if (result.code === 200) {
 
             let resData = {
                 hotTerms: []

@@ -967,8 +967,10 @@ $('.search-suggest-history').mouseenter(function() {
  * 搜索 热门搜索和默认搜索  api
  * @return {[type]} [description]
  */
-function searchSuggestRecommend(key) {
+function searchSuggestRecommend(channel, key) {
+
     var param = {
+        channel: channel,
         return_type: 'jsonp',
         keyword: key
     };
@@ -978,14 +980,12 @@ function searchSuggestRecommend(key) {
         var searchSuggestRecommendHtml; //eslint-disable-line
 
         if (jsonData.code === 200) {
-            if (jsonData.data && jsonData.data.hotTerms.length) {
 
-                searchSuggestRecommendHtml = handlebars.compile($searchRecommendHbs.html() || '');
-                $searchRecommend.html(searchSuggestRecommendHtml(jsonData)).show();
+            searchSuggestRecommendHtml = handlebars.compile($searchRecommendHbs.html() || '');
+            $searchRecommend.html(searchSuggestRecommendHtml(jsonData)).show();
 
-            } else {
-                $searchRecommend.hide();
-            }
+        } else {
+            $searchRecommend.hide();
         }
 
     });