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

@@ -326,14 +326,18 @@ const checkFav = (req, res) => {
     co(function * () {
 
         let uid = req.user.uid;
-        let pids = req.body.pidList.split(',');
         let ret = {
-            code: 200,
+            code: 400,
             message: '是否收藏',
             data: {}
         };
 
-        ret.data = yield service.checkUserIsFav(uid, pids);
+        if (uid && req.body.pidList) {
+            let pids = req.body.pidList.split(',');
+
+            Object.assign(ret, {code: 200,
+                data: yield service.checkUserIsFav(uid, pids)});
+        }
 
         return res.send(ret);
     })();

@@ -72,7 +72,7 @@
                     {{#unless changedQuery}}

 
                     <div class="search-suggest-less">

-                        "<em>{{name}}</em>"&nbsp;搜索结果太少了，试试{{#suggest}}&nbsp;"<a href="/?query={{.}}&is_rec=Y">{{.}}</a>"&nbsp;{{/suggest}}关键词搜索
+                        <em>"{{name}}"</em>&nbsp;搜索结果太少了，试试{{#suggest}}&nbsp;"<a href="/?query={{.}}&is_rec=Y">{{.}}</a>"&nbsp;{{/suggest}}关键词搜索
                     </div>
                     {{/unless}}

                 
{{/if}}
@@ -80,7 +80,7 @@
 
             {{#if changedQuery}}

                 <div class="search-suggest-less">

-                    没有找到&nbsp;"<em>{{name}}</em>"&nbsp;相关的商品，
+                    没有找到&nbsp;<em>"{{name}}"</em>&nbsp;相关的商品，
                     为您推荐&nbsp;"<a href="/?query={{suggestFirst}}&is_rec=Y">{{suggestFirst}}</a>"&nbsp;的搜索结果。{{#if suggestSecond}}或者试试{{#suggestSecond}}&nbsp;"<a href="/?query={{.}}&is_rec=Y">{{.}}</a>"&nbsp;{{/suggestSecond}}{{/if}}
                 </div>
             {{/if}}

 {
   "name": "yohobuy-node",
-  "version": "5.5.3",
+  "version": "5.5.4",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -85,6 +85,10 @@ function isCheckFav() {
         pidArray.push($(this).data('pid'));
     });
 
+    if (!pidArray.length) {
+        return false;
+    }
+
     $.ajax({
         type: 'POST',
         url: '/cart/cart/checkFav',

-.search-suggest-less{
+.search-suggest-less {
     box-sizing: border-box;
     width: 100%;
     line-height: 22px;
@@ -9,16 +9,23 @@
     padding-bottom: 10px;
     padding-left: 9px;
     margin-bottom: 10px;
+
     em {
+        display: inline-block;
+        max-width: 950px;
+        word-break: break-all;
+        word-wrap: break-word;
         font-weight: normal;
         font-style: normal;
     }
+
     a {
         color: #d0021b;
         cursor: pointer;
         text-decoration: underline;
     }
 }
+
 .filter-box {
     border: 1px solid #dfdfdf;