Merge remote-tracking branch 'origin/feature/searchDefaultUid' into gray

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

@@ -406,7 +406,7 @@ function search(opt) {
     if (nav.reload) {
         page = 1;
     } else if (nav.end) {
-
+        $('.search-divide').remove();
         // 不需要重新加载并且数据请求结束
         return;
     }
@@ -583,7 +583,6 @@ function search(opt) {
 
             if (data === '' || (data.list && data.list.length <= 0)) {
                 nav.end = true;
-                $('.search-divide').remove();
                 if (nav.reload) {
                     if (data.total === 0) {
                         $container.html(noResult);