Authored by yyq

Merge branch 'feature/recList2.0' of git.yoho.cn:fe/yohobuywap-node into feature/recList2.0

@@ -563,7 +563,7 @@ const getSearchKeywordDataById = (id, params, uid) => { @@ -563,7 +563,7 @@ const getSearchKeywordDataById = (id, params, uid) => {
563 563
564 Object.assign(value, { 564 Object.assign(value, {
565 name: value.keyword, 565 name: value.keyword,
566 - href: helpers.urlFormat(`/canpin/${value.id}.html`, null) 566 + link: helpers.urlFormat(`/canpin/${value.id}.html`, null)
567 }); 567 });
568 }); 568 });
569 569
@@ -136,7 +136,7 @@ router.get('/search/index', search.index); @@ -136,7 +136,7 @@ router.get('/search/index', search.index);
136 136
137 // 推广落地页 137 // 推广落地页
138 router.get('/search/keyword/:query', rewrite.sortParams, search.keyword); 138 router.get('/search/keyword/:query', rewrite.sortParams, search.keyword);
139 -router.get('/search/chanpin/:id', rewrite.sortParams, search.keyword); 139 +router.get('/search/chanpin/:id', rewrite.sortParams, search.keyId);
140 140
141 // 搜索落地页 141 // 搜索落地页
142 router.get('/search/list', rewrite.sortParams, search.list); 142 router.get('/search/list', rewrite.sortParams, search.list);
@@ -12,7 +12,7 @@ try { @@ -12,7 +12,7 @@ try {
12 bluebird.promisifyAll(redis.Multi.prototype); 12 bluebird.promisifyAll(redis.Multi.prototype);
13 13
14 client.all = args => { 14 client.all = args => {
15 - if (!client.connected) { 15 + if (!client.ready) {
16 if (Array.isArray(args)) { 16 if (Array.isArray(args)) {
17 return Promise.resolve(_.fill(args, false)); 17 return Promise.resolve(_.fill(args, false));
18 } else { 18 } else {