Merge branch 'feature/searchTerms' into release/5.5

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

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