Merge branch 'gray' into 'master'

Gray



See merge request !239

@@ -104,7 +104,7 @@ module.exports = class favorite extends global.yoho.BaseModel {
                 url: '/home/favorite/reduction'
             };
 
-            if (data.data.num) {
+            if (data.data && data.data.num) {
                 result.count = +data.data.num;
                 result.phone = data.data.mobile;
             }

@@ -155,6 +155,7 @@ const searchHistory = (req, res) => {
     if (q) {
         history.unshift(q);
         res.cookie('_History', _.take(history, 9).join(','), {
+            path: '/',
             domain: config.cookieDomain,
             maxAge: 60 * 60 * 24 * 1000 * 30 // 一月
         });

@@ -514,7 +514,7 @@ function getSalebreakingYardsData(params, channel) {
                 // 处理筛选条件数据
                 if (subResult[0].code === 200) {
                     finalResult.leftContent =
-                        publicHandler.handleSaleSortData(subResult[0].data.filter.group_sort,
+                        publicHandler.handleSaleSortData(_.get(subResult[0], 'data.filter.group_sort', []),
                             params, '', baseUrl);
                 }
 

@@ -1818,7 +1818,7 @@ exports.handleSuggestData = (origin, query) => {
     }];
 
     _.forEach(origin, value => {
-        if (query === value.keyword || value.keyword.length <= 2) {
+        if (!value.keyword || query === value.keyword || value.keyword.length <= 2) {
             return;
         }
 

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

@@ -966,7 +966,10 @@ function searchSuggestHistory() {
 
             // 历史记录清空
             $('.search-suggest-title .search-del').click(function() {
-                window.setCookie('_History', '', {domain: '.yohobuy.com'});
+                window.setCookie('_History', '', {
+                    domain: '.yohobuy.com',
+                    path: '/'
+                });
                 $searchHistory.empty();
                 $searchKey.attr('alt', true);
                 return false;

 User-Agent: *
 Disallow: /passport/
-Disallow: signin.html  
-Disallow: reg.html   
-Disallow: /cart/   
+Disallow: /signin.html
+Disallow: /reg.html
+Disallow: /cart/
 Disallow: /home/
 Disallow: /shopping/
 Disallow: /service/
 Disallow: /settled/
-Disallow: /3party/ 
\ No newline at end of file
+Disallow: /3party/
+Disallow: /coupon/
+Disallow: /japanKorean/
+Disallow: /guang/tags/
+Disallow: /help/
+Disallow: /search/
+Disallow: /*?*