Authored by htoooth

Merge branch 'feature/recommend' into release/5.2

@@ -1456,8 +1456,8 @@ const recommendAsync = (skn, page, limit) => { @@ -1456,8 +1456,8 @@ const recommendAsync = (skn, page, limit) => {
1456 1456
1457 if (_.get(recommendData, 'code', 400) !== 200) { 1457 if (_.get(recommendData, 'code', 400) !== 200) {
1458 return { 1458 return {
1459 - code: 400,  
1460 - message: '服务器错误!' 1459 + code: 200,
  1460 + products: []
1461 }; 1461 };
1462 } 1462 }
1463 1463
@@ -1489,13 +1489,7 @@ const recommendAsync = (skn, page, limit) => { @@ -1489,13 +1489,7 @@ const recommendAsync = (skn, page, limit) => {
1489 return { 1489 return {
1490 code: 200, 1490 code: 200,
1491 data: { 1491 data: {
1492 - pager: {  
1493 - total: _.get(recommendData, 'page_total', 0),  
1494 - size: _.get(recommendData, 'page_size', 5),  
1495 - num: _.get(recommendData, 'page', 1)  
1496 - },  
1497 products: products, 1492 products: products,
1498 - total: _.get(recommendData, 'total', 0)  
1499 } 1493 }
1500 }; 1494 };
1501 })(); 1495 })();
1 -// /**  
2 -// * 最近浏览取接口渲染模板  
3 -// * @author: xuhui<xuhui.ge@yoho.cn>  
4 -// 8 @date: 2016/11/09  
5 -// */  
6 -//  
7 -// var $ = require('yoho-jquery');  
8 -// var Handlebars = require('yoho-handlebars');  
9 -// var lazyLoad = require('yoho-jquery-lazyload');  
10 -// var dataLazyLoad = require('../../plugins/lazy-load')(document);  
11 -//  
12 -//  
13 -// function shopRecommend() {  
14 -// var tpl;  
15 -//  
16 -// tpl = Handlebars.compile($('#recommend-shop').html());  
17 -//  
18 -// $.ajax({  
19 -// url: 'product/detail/recommend',  
20 -//  
21 -// success: function(data) {  
22 -// var recommendShop = [],  
23 -// res, i, cur;  
24 -//  
25 -// if (data.code === 200) {  
26 -// res = data.data;  
27 -//  
28 -// for (i = 0; i < res.length; i++) {  
29 -// cur = res[i];  
30 -//  
31 -// recommendShop.push({  
32 -// href: cur.url,  
33 -// img: cur.pic_url,  
34 -// name: cur.product_name,  
35 -// salePrice: cur.price  
36 -// });  
37 -// }  
38 -//  
39 -// if (recommendShop.length > 0) {  
40 -// $('#recommend-shop').html(tpl({  
41 -// recommendShop: recommendShop  
42 -// }));  
43 -//  
44 -// lazyLoad($('#recommend-shop .lazy'));  
45 -// }  
46 -// }  
47 -// }  
48 -// });  
49 -// }  
50 -//  
51 -// window.shopRecommend = shopRecommend;  
52 -//  
53 -// // 数据懒加载  
54 -// dataLazyLoad.init({cls: '.latest-walk-datalazyload', threshold: 700});