Authored by OF1706

Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

... ... @@ -60,11 +60,14 @@ const setShoppingCookie = (req, res) => {
return service.getCartCount(uid, shoppingKey).then(ret => {
if (ret && ret.data && ret.data.cart_goods_count) {
res.cookie('_g', {
res.cookie('_g', JSON.stringify({
_k: shoppingKey,
_nac: ret.data.cart_goods_count,
_ac: 0,
_r: 1
}), {
domain: '.yohobuy.com',
path: '/'
});
}
});
... ... @@ -368,10 +371,10 @@ const getRecommendProductAction = (req, res) => {
let channel = req.yoho.channel;
let uid = req.user.uid;
let udid = ghelper.getUdid(req, res);
let page = req.query.page || 1;
let page = Number(req.query.page || 1);
let ret;
if (page === '6') {
if (page <= 0 || page >= 6) {
page = 1;
}
... ...