Merge branch 'feature/searchOptimi' into release/5.5

@@ -73,6 +73,12 @@ const shop = {
                     params.newGoods = newGoods.list || [];
                     params.suggestion = newGoods.suggestion || [];
 
+                    // 推荐词条件判断 redmine: 18567
+                    if (params.suggestion && params.suggestion.isNeedSuggestion &&
+                        params.suggestion.termsSuggestion.length) {
+                        params.newquery = params.suggestion.termsSuggestion[0].name;
+                    }
+
                     if (brandId === 0) {
                         params.query = domain;
                     }

@@ -205,7 +205,7 @@ const getSearchData = (params) => {
             }
 
             // 搜索过来的  推荐词条件判断 redmine: 18567
-            if (params.from && params.page === 1 && (result.data.isChangedQuery === 'Y' ||
+            if (params.from === 'search' && params.page === 1 && (result.data.isChangedQuery === 'Y' ||
                 result.data.total <= 20 || params.needSuggestion === 'Y')) {
 
                 params.isChangedQuery = result.data.isChangedQuery === 'Y';