Authored by zhangxiaoru

还原 逛url

... ... @@ -17,14 +17,13 @@ const indexModel = require('../models/brand');
* @param int channel 1表示男生频道, 2表示女生频道, 3表示潮童频道, 4表示创意生活频道
*/
let index = (req, res, next) => {
let genders = req.cookies._Channel || 'boys';
let responseData = {
module: 'channel',
page: 'brand',
// title: '品牌一览 | Yoho!Buy有货 | 潮流购物逛不停',
showFooterTab: footerModel.getUrlData('category', genders)
showFooterTab: footerModel.getUrlData('category')
};
let param = {
... ...
... ... @@ -7,7 +7,6 @@ const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab
const helpers = global.yoho.helpers;
let index = (req, res, next) => {
let gender = req.cookies._Channel || 'boys';
cateModel.getCateData(req.yoho.channel).then((result) => {
res.render('cate', {
... ... @@ -20,7 +19,7 @@ let index = (req, res, next) => {
list: result.list,
searchUrl: helpers.urlFormat('/search', null, 'search')
},
showFooterTab: footerModel.getUrlData('category', gender)
showFooterTab: footerModel.getUrlData('category')
});
}).catch(next);
};
... ...
... ... @@ -11,19 +11,16 @@ const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab
const helpers = global.yoho.helpers;
let _renderData = (gender) => {
return {
module: 'channel',
page: 'home',
homeHeader: {
searchUrl: helpers.urlFormat('/search', null, 'search')
},
maybeLike: true,
showFooterTab: footerModel.getUrlData('home', gender),
pageFooter: true
};
}
let _renderData = {
module: 'channel',
page: 'home',
homeHeader: {
searchUrl: helpers.urlFormat('/search', null, 'search')
},
maybeLike: true,
showFooterTab: footerModel.getUrlData('home'),
pageFooter: true
};
/**
* 频道页生成函数
... ... @@ -39,8 +36,7 @@ let _channelPage = (req, res, data) => {
uid: _.toString(req.user.uid),
limit: 6// 首屏先获取前6个楼层,其余用ajax获取
}).then(result => {
let links = _renderData(gender);
links.homeHeader.defaultTerms = result.defaultTerms;
_renderData.homeHeader.defaultTerms = result.defaultTerms;
if (!result.content.length || !result.sideNav.length) {
res.set('Cache-Control', 'no-cache');
... ... @@ -57,7 +53,7 @@ let _channelPage = (req, res, data) => {
// }
// }].concat(result.content);
// console.log(result.content[9]);
res.render('channel', Object.assign({}, links, data, result, {
res.render('channel', Object.assign({}, _renderData, data, result, {
localCss: true
}));
});
... ...
... ... @@ -8,18 +8,11 @@
const helpers = global.yoho.helpers;
let channels = {
boys: '1,3',
girls: '2,3',
kids: '1,2,3',
lifestyle: '1,2,3'
};
exports.getUrlData = function(type, gender) {
exports.getUrlData = function(type) {
const urlData = {
indexUrl: helpers.urlFormat('/?go=1'), // 首页
categoryUrl: helpers.urlFormat('/cate'), // 分类
guangUrl: helpers.urlFormat('', {'gender': channels[gender]}, 'guang'), // 逛首页
guangUrl: helpers.urlFormat('', null, 'guang'), // 逛首页
shoppingCartUrl: helpers.urlFormat('/cart/index/index'), // 购物车
mineUrl: helpers.urlFormat('/home') // 个人中心
};
... ...
... ... @@ -8,7 +8,7 @@
<p class="iconfont tab-icon">&#xe62d;</p>
<p class="tab-name">分类</p>
</a>
<a class="tab-item {{#if guangHome}}current{{/if}}" href="{{guangUrl}}">
<a class="tab-item {{#if guangHome}}current{{/if}}" id="guangUrl" href="{{guangUrl}}">
<p class="iconfont tab-icon">&#xe627;</p>
<p class="tab-name"></p>
</a>
... ...