Merge remote-tracking branch 'origin/hotfix/searchQuery' into gray

@@ -20,7 +20,7 @@ const list = (req, res, next) => {
         cartUrl: helpers.urlFormat('/cart/index/index')
         cartUrl: helpers.urlFormat('/cart/index/index')
     }, req.query);
     }, req.query);
     let title = '';
     let title = '';
-    let query = req.query.query;
+    let query = decodeURIComponent(req.query.query);
     let isQueryFirstClass = false; // 标识用户搜的是不是一级品类
     let isQueryFirstClass = false; // 标识用户搜的是不是一级品类
     let isQuerySecondClass = false; // 标识用户搜的是不是二级品类
     let isQuerySecondClass = false; // 标识用户搜的是不是二级品类
     let domain = null;
     let domain = null;

@@ -71,8 +71,9 @@ chHammer.on('tap', function() {
 // 跳到搜索页
 // 跳到搜索页
 function goSearch(query) {
 function goSearch(query) {
     // 保存搜索的内容
     // 保存搜索的内容
+
     writeSearch.setHistoryValFun(query);
     writeSearch.setHistoryValFun(query);
-    document.location.href = searchUrl + '?query=' + query;
+    document.location.href = searchUrl + '?query=' + encodeURIComponent(query);
 }
 }
 
 
 // 搜索输入联动
 // 搜索输入联动
@@ -175,11 +176,11 @@ $('.search-items .search-group').on('click', 'li', function(event) {
     var query = '';
     var query = '';
 
 
     if (event.target.nodeName === 'A') {
     if (event.target.nodeName === 'A') {
-        query = $(event.target).html();
+        query = $(event.target).text();
     }
     }
 
 
     if (event.target.nodeName === 'LI') {
     if (event.target.nodeName === 'LI') {
-        query = $(event.target).find('a').html();
+        query = $(event.target).find('a').text();
     }
     }
 
 
     if ($(this).parents('.search-group').hasClass('history-search')) {
     if ($(this).parents('.search-group').hasClass('history-search')) {
@@ -210,8 +211,8 @@ $('.search-items .search-group').on('click', 'li', function(event) {
 });
 });
 
 
 $('.hot-term').on('click', function(event) {
 $('.hot-term').on('click', function(event) {
-    var Hotquery = '',
-        POS_ID = 2,
+    var Hotquery = '';
+        POS_ID = 2;
         FLR_INDEX = 2;
         FLR_INDEX = 2;
 
 
     if (event.target.nodeName === 'A') {
     if (event.target.nodeName === 'A') {