Authored by ccbikai

频道页面数据结构优化

@@ -11,16 +11,27 @@ const log = require('../../../library/logger'); @@ -11,16 +11,27 @@ const log = require('../../../library/logger');
11 const cookie = require('../../../library/cookie'); 11 const cookie = require('../../../library/cookie');
12 12
13 const mod = 'channel'; 13 const mod = 'channel';
14 -let footerTab = { 14 +const renderData = {
  15 + module: mod,
  16 + page: 'home',
  17 + lifestyleHomePage: true,
  18 + homeHeader: {
  19 + searchUrl: helpers.url('/search', null, 'search')
  20 + },
  21 + maybeLike: true,
  22 + showFooterTab: {
15 indexUrl: helpers.url('/?go=1'), // 首页 23 indexUrl: helpers.url('/?go=1'), // 首页
16 categoryUrl: helpers.url('/cate'), // 分类 24 categoryUrl: helpers.url('/cate'), // 分类
17 guangUrl: helpers.url('', null, 'guang'), // 逛首页 25 guangUrl: helpers.url('', null, 'guang'), // 逛首页
18 shoppingCartUrl: helpers.url('/cart/index/index'), // 购物车 26 shoppingCartUrl: helpers.url('/cart/index/index'), // 购物车
19 mineUrl: helpers.url('/home') // 个人中心 27 mineUrl: helpers.url('/home') // 个人中心
  28 + },
  29 + pageFooter: true
20 }; 30 };
21 31
22 -const channelLogger = (err) => {  
23 - log.error(err); 32 +const channelLogger = (err, res) => {
  33 + log.error('频道页面渲染错误:' + JSON.stringify(err));
  34 + res.send('error');
24 }; 35 };
25 36
26 /** 37 /**
@@ -51,19 +62,12 @@ exports.boys = (req, res) => { @@ -51,19 +62,12 @@ exports.boys = (req, res) => {
51 gender: 'boys', 62 gender: 'boys',
52 uid: cookie.getUid(req) 63 uid: cookie.getUid(req)
53 }).then(result => { 64 }).then(result => {
54 - res.render('channel', Object.assign({  
55 - module: mod,  
56 - page: 'home',  
57 - title: '男生首页',  
58 - boysHomePage: true,  
59 - homeHeader: {  
60 - searchUrl: helpers.url('/search', null, 'search')  
61 - },  
62 - maybeLike: true,  
63 - showFooterTab: footerTab,  
64 - pageFooter: true 65 + res.render('channel', Object.assign(renderData, {
  66 + title: '男生首页'
65 }, result)); 67 }, result));
66 - }).catch(channelLogger); 68 + }).catch((err) => {
  69 + channelLogger(err, res);
  70 + });
67 }; 71 };
68 72
69 exports.girls = (req, res) => { 73 exports.girls = (req, res) => {
@@ -71,19 +75,12 @@ exports.girls = (req, res) => { @@ -71,19 +75,12 @@ exports.girls = (req, res) => {
71 gender: 'girls', 75 gender: 'girls',
72 uid: cookie.getUid(req) 76 uid: cookie.getUid(req)
73 }).then(result => { 77 }).then(result => {
74 - res.render('channel', Object.assign({  
75 - module: mod,  
76 - page: 'home',  
77 - title: '女生首页',  
78 - girlsHomePage: true,  
79 - homeHeader: {  
80 - searchUrl: helpers.url('/search', null, 'search')  
81 - },  
82 - maybeLike: true,  
83 - showFooterTab: footerTab,  
84 - pageFooter: true 78 + res.render('channel', Object.assign(renderData, {
  79 + title: '女生首页'
85 }, result)); 80 }, result));
86 - }).catch(channelLogger); 81 + }).catch((err) => {
  82 + channelLogger(err, res);
  83 + });
87 }; 84 };
88 85
89 exports.kids = (req, res) => { 86 exports.kids = (req, res) => {
@@ -91,19 +88,12 @@ exports.kids = (req, res) => { @@ -91,19 +88,12 @@ exports.kids = (req, res) => {
91 gender: 'kids', 88 gender: 'kids',
92 uid: cookie.getUid(req) 89 uid: cookie.getUid(req)
93 }).then(result => { 90 }).then(result => {
94 - res.render('channel', Object.assign({  
95 - module: mod,  
96 - page: 'home',  
97 - title: '潮童首页',  
98 - kidsHomePage: true,  
99 - homeHeader: {  
100 - searchUrl: helpers.url('/search', null, 'search')  
101 - },  
102 - maybeLike: true,  
103 - showFooterTab: footerTab,  
104 - pageFooter: true 91 + res.render('channel', Object.assign(renderData, {
  92 + title: '潮童首页'
105 }, result)); 93 }, result));
106 - }).catch(channelLogger); 94 + }).catch((err) => {
  95 + channelLogger(err, res);
  96 + });
107 }; 97 };
108 98
109 exports.lifestyle = (req, res) => { 99 exports.lifestyle = (req, res) => {
@@ -111,19 +101,12 @@ exports.lifestyle = (req, res) => { @@ -111,19 +101,12 @@ exports.lifestyle = (req, res) => {
111 gender: 'lifestyle', 101 gender: 'lifestyle',
112 uid: cookie.getUid(req) 102 uid: cookie.getUid(req)
113 }).then(result => { 103 }).then(result => {
114 - res.render('channel', Object.assign({  
115 - module: mod,  
116 - page: 'home',  
117 - title: '创意生活首页',  
118 - lifestyleHomePage: true,  
119 - homeHeader: {  
120 - searchUrl: helpers.url('/search', null, 'search')  
121 - },  
122 - maybeLike: true,  
123 - showFooterTab: footerTab,  
124 - pageFooter: true 104 + res.render('channel', Object.assign(renderData, {
  105 + title: '创意生活首页'
125 }, result)); 106 }, result));
126 - }).catch(channelLogger); 107 + }).catch((err) => {
  108 + channelLogger(err, res);
  109 + });
127 }; 110 };
128 111
129 exports.bottomBanner = (req, res) => { 112 exports.bottomBanner = (req, res) => {
@@ -131,5 +114,7 @@ exports.bottomBanner = (req, res) => { @@ -131,5 +114,7 @@ exports.bottomBanner = (req, res) => {
131 114
132 channelModel.getBottomBannerDate(gender).then(result => { 115 channelModel.getBottomBannerDate(gender).then(result => {
133 res.send(result); 116 res.send(result);
134 - }).catch(console.trace); 117 + }).catch((err) => {
  118 + channelLogger(err, res);
  119 + });
135 }; 120 };