Showing
5 changed files
with
9 additions
and
22 deletions
@@ -17,14 +17,13 @@ const indexModel = require('../models/brand'); | @@ -17,14 +17,13 @@ const indexModel = require('../models/brand'); | ||
17 | * @param int channel 1表示男生频道, 2表示女生频道, 3表示潮童频道, 4表示创意生活频道 | 17 | * @param int channel 1表示男生频道, 2表示女生频道, 3表示潮童频道, 4表示创意生活频道 |
18 | */ | 18 | */ |
19 | let index = (req, res, next) => { | 19 | let index = (req, res, next) => { |
20 | - let genders = req.cookies._Channel || 'boys'; | ||
21 | 20 | ||
22 | let responseData = { | 21 | let responseData = { |
23 | module: 'channel', | 22 | module: 'channel', |
24 | page: 'brand', | 23 | page: 'brand', |
25 | 24 | ||
26 | // title: '品牌一览 | Yoho!Buy有货 | 潮流购物逛不停', | 25 | // title: '品牌一览 | Yoho!Buy有货 | 潮流购物逛不停', |
27 | - showFooterTab: footerModel.getUrlData('category', genders) | 26 | + showFooterTab: footerModel.getUrlData('category') |
28 | }; | 27 | }; |
29 | 28 | ||
30 | let param = { | 29 | let param = { |
@@ -7,7 +7,6 @@ const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab | @@ -7,7 +7,6 @@ const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab | ||
7 | const helpers = global.yoho.helpers; | 7 | const helpers = global.yoho.helpers; |
8 | 8 | ||
9 | let index = (req, res, next) => { | 9 | let index = (req, res, next) => { |
10 | - let gender = req.cookies._Channel || 'boys'; | ||
11 | 10 | ||
12 | cateModel.getCateData(req.yoho.channel).then((result) => { | 11 | cateModel.getCateData(req.yoho.channel).then((result) => { |
13 | res.render('cate', { | 12 | res.render('cate', { |
@@ -20,7 +19,7 @@ let index = (req, res, next) => { | @@ -20,7 +19,7 @@ let index = (req, res, next) => { | ||
20 | list: result.list, | 19 | list: result.list, |
21 | searchUrl: helpers.urlFormat('/search', null, 'search') | 20 | searchUrl: helpers.urlFormat('/search', null, 'search') |
22 | }, | 21 | }, |
23 | - showFooterTab: footerModel.getUrlData('category', gender) | 22 | + showFooterTab: footerModel.getUrlData('category') |
24 | }); | 23 | }); |
25 | }).catch(next); | 24 | }).catch(next); |
26 | }; | 25 | }; |
@@ -11,20 +11,17 @@ const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab | @@ -11,20 +11,17 @@ const footerModel = require('../../../doraemon/models/footer_tab'); // 底部tab | ||
11 | 11 | ||
12 | const helpers = global.yoho.helpers; | 12 | const helpers = global.yoho.helpers; |
13 | 13 | ||
14 | -let _renderData = (gender) => { | ||
15 | - return { | 14 | +let _renderData = { |
16 | module: 'channel', | 15 | module: 'channel', |
17 | page: 'home', | 16 | page: 'home', |
18 | homeHeader: { | 17 | homeHeader: { |
19 | searchUrl: helpers.urlFormat('/search', null, 'search') | 18 | searchUrl: helpers.urlFormat('/search', null, 'search') |
20 | }, | 19 | }, |
21 | maybeLike: true, | 20 | maybeLike: true, |
22 | - showFooterTab: footerModel.getUrlData('home', gender), | 21 | + showFooterTab: footerModel.getUrlData('home'), |
23 | pageFooter: true | 22 | pageFooter: true |
24 | }; | 23 | }; |
25 | 24 | ||
26 | -} | ||
27 | - | ||
28 | /** | 25 | /** |
29 | * 频道页生成函数 | 26 | * 频道页生成函数 |
30 | * @param {[object]} req | 27 | * @param {[object]} req |
@@ -39,8 +36,7 @@ let _channelPage = (req, res, data) => { | @@ -39,8 +36,7 @@ let _channelPage = (req, res, data) => { | ||
39 | uid: _.toString(req.user.uid), | 36 | uid: _.toString(req.user.uid), |
40 | limit: 6// 首屏先获取前6个楼层,其余用ajax获取 | 37 | limit: 6// 首屏先获取前6个楼层,其余用ajax获取 |
41 | }).then(result => { | 38 | }).then(result => { |
42 | - let links = _renderData(gender); | ||
43 | - links.homeHeader.defaultTerms = result.defaultTerms; | 39 | + _renderData.homeHeader.defaultTerms = result.defaultTerms; |
44 | 40 | ||
45 | if (!result.content.length || !result.sideNav.length) { | 41 | if (!result.content.length || !result.sideNav.length) { |
46 | res.set('Cache-Control', 'no-cache'); | 42 | res.set('Cache-Control', 'no-cache'); |
@@ -57,7 +53,7 @@ let _channelPage = (req, res, data) => { | @@ -57,7 +53,7 @@ let _channelPage = (req, res, data) => { | ||
57 | // } | 53 | // } |
58 | // }].concat(result.content); | 54 | // }].concat(result.content); |
59 | // console.log(result.content[9]); | 55 | // console.log(result.content[9]); |
60 | - res.render('channel', Object.assign({}, links, data, result, { | 56 | + res.render('channel', Object.assign({}, _renderData, data, result, { |
61 | localCss: true | 57 | localCss: true |
62 | })); | 58 | })); |
63 | }); | 59 | }); |
@@ -8,18 +8,11 @@ | @@ -8,18 +8,11 @@ | ||
8 | 8 | ||
9 | const helpers = global.yoho.helpers; | 9 | const helpers = global.yoho.helpers; |
10 | 10 | ||
11 | -let channels = { | ||
12 | - boys: '1,3', | ||
13 | - girls: '2,3', | ||
14 | - kids: '1,2,3', | ||
15 | - lifestyle: '1,2,3' | ||
16 | -}; | ||
17 | - | ||
18 | -exports.getUrlData = function(type, gender) { | 11 | +exports.getUrlData = function(type) { |
19 | const urlData = { | 12 | const urlData = { |
20 | indexUrl: helpers.urlFormat('/?go=1'), // 首页 | 13 | indexUrl: helpers.urlFormat('/?go=1'), // 首页 |
21 | categoryUrl: helpers.urlFormat('/cate'), // 分类 | 14 | categoryUrl: helpers.urlFormat('/cate'), // 分类 |
22 | - guangUrl: helpers.urlFormat('', {'gender': channels[gender]}, 'guang'), // 逛首页 | 15 | + guangUrl: helpers.urlFormat('', null, 'guang'), // 逛首页 |
23 | shoppingCartUrl: helpers.urlFormat('/cart/index/index'), // 购物车 | 16 | shoppingCartUrl: helpers.urlFormat('/cart/index/index'), // 购物车 |
24 | mineUrl: helpers.urlFormat('/home') // 个人中心 | 17 | mineUrl: helpers.urlFormat('/home') // 个人中心 |
25 | }; | 18 | }; |
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | <p class="iconfont tab-icon"></p> | 8 | <p class="iconfont tab-icon"></p> |
9 | <p class="tab-name">分类</p> | 9 | <p class="tab-name">分类</p> |
10 | </a> | 10 | </a> |
11 | - <a class="tab-item {{#if guangHome}}current{{/if}}" href="{{guangUrl}}"> | 11 | + <a class="tab-item {{#if guangHome}}current{{/if}}" id="guangUrl" href="{{guangUrl}}"> |
12 | <p class="iconfont tab-icon"></p> | 12 | <p class="iconfont tab-icon"></p> |
13 | <p class="tab-name">逛</p> | 13 | <p class="tab-name">逛</p> |
14 | </a> | 14 | </a> |
-
Please register or login to post a comment