Authored by 郝肖肖

Merge branch 'feature/searchOptimi' into release/5.5

@@ -60,7 +60,7 @@ const list = (req, res, next) => { @@ -60,7 +60,7 @@ const list = (req, res, next) => {
60 ]).then(result => { 60 ]).then(result => {
61 61
62 // 推荐词条件判断 redmine: 18567 62 // 推荐词条件判断 redmine: 18567
63 - if (result[2].suggestion && result[2].suggestion.termsSuggestion && 63 + if (result[2].suggestion && result[2].suggestion.isNeedSuggestion &&
64 result[2].suggestion.termsSuggestion.length) { 64 result[2].suggestion.termsSuggestion.length) {
65 params.query = result[2].suggestion.termsSuggestion[0].name; 65 params.query = result[2].suggestion.termsSuggestion[0].name;
66 } 66 }
@@ -981,7 +981,7 @@ $listNav.on('touchend touchcancel', function(e) { @@ -981,7 +981,7 @@ $listNav.on('touchend touchcancel', function(e) {
981 } 981 }
982 if (nav.reload) { 982 if (nav.reload) {
983 $(document).trigger('shouldSendBpData', [bpIdData]); 983 $(document).trigger('shouldSendBpData', [bpIdData]);
984 - search(); 984 + search({filtering: true});
985 } 985 }
986 } 986 }
987 }); 987 });