|
@@ -18,7 +18,6 @@ let _renderData = { |
|
@@ -18,7 +18,6 @@ let _renderData = { |
18
|
searchUrl: helpers.urlFormat('/search', null, 'search')
|
18
|
searchUrl: helpers.urlFormat('/search', null, 'search')
|
19
|
},
|
19
|
},
|
20
|
maybeLike: true,
|
20
|
maybeLike: true,
|
21
|
- showFooterTab: footerModel.getUrlData('home'),
|
|
|
22
|
pageFooter: true
|
21
|
pageFooter: true
|
23
|
};
|
22
|
};
|
24
|
|
23
|
|
|
@@ -30,7 +29,6 @@ let _renderData = { |
|
@@ -30,7 +29,6 @@ let _renderData = { |
30
|
* @return {[type]}
|
29
|
* @return {[type]}
|
31
|
*/
|
30
|
*/
|
32
|
let _channelPage = (req, res, data) => {
|
31
|
let _channelPage = (req, res, data) => {
|
33
|
- let gender = req.cookies._Channel || 'boys';
|
|
|
34
|
return channelModel.getChannelData({
|
32
|
return channelModel.getChannelData({
|
35
|
gender: data.gender,
|
33
|
gender: data.gender,
|
36
|
uid: _.toString(req.user.uid),
|
34
|
uid: _.toString(req.user.uid),
|
|
@@ -53,8 +51,19 @@ let _channelPage = (req, res, data) => { |
|
@@ -53,8 +51,19 @@ let _channelPage = (req, res, data) => { |
53
|
// }
|
51
|
// }
|
54
|
// }].concat(result.content);
|
52
|
// }].concat(result.content);
|
55
|
// console.log(result.content[9]);
|
53
|
// console.log(result.content[9]);
|
|
|
54
|
+ let gender;
|
|
|
55
|
+
|
|
|
56
|
+ if (data.gender === 'boys') {
|
|
|
57
|
+ gender = '1,3';
|
|
|
58
|
+ } else if (data.gender === 'girls') {
|
|
|
59
|
+ gender = '2,3';
|
|
|
60
|
+ } else {
|
|
|
61
|
+ gender = '1,2,3';
|
|
|
62
|
+ }
|
|
|
63
|
+
|
56
|
res.render('channel', Object.assign({}, _renderData, data, result, {
|
64
|
res.render('channel', Object.assign({}, _renderData, data, result, {
|
57
|
- localCss: true
|
65
|
+ localCss: true,
|
|
|
66
|
+ showFooterTab: footerModel.getUrlData('home', gender),
|
58
|
}));
|
67
|
}));
|
59
|
});
|
68
|
});
|
60
|
};
|
69
|
};
|