频道页数据结构优化

@@ -10,11 +10,9 @@ const helpers = require('../../../library/helpers');
 const log = require('../../../library/logger');
 const log = require('../../../library/logger');
 const cookie = require('../../../library/cookie');
 const cookie = require('../../../library/cookie');
 
 
-const mod = 'channel';
 const renderData = {
 const renderData = {
-    module: mod,
+    module: 'channel',
     page: 'home',
     page: 'home',
-    lifestyleHomePage: true,
     homeHeader: {
     homeHeader: {
         searchUrl: helpers.url('/search', null, 'search')
         searchUrl: helpers.url('/search', null, 'search')
     },
     },
@@ -35,7 +33,32 @@ const channelLogger = (err, res) => {
 };
 };
 
 
 /**
 /**
- * 频道选择
+ * 频道页生成函数
+ * @param  {[object]} req
+ * @param  {[object]} res
+ * @param  {[object]} data 自定义数据
+ * @return {[type]}
+ */
+const channelPage = (req, res, data) => {
+    channelModel.getChannelDate({
+        gender: data.gender,
+        uid: cookie.getUid(req)
+    }).then(result => {
+        res.render('channel', Object.assign(renderData, data, result));
+    }).catch((err) => {
+        channelLogger(err, res);
+    });
+};
+
+/**
+ * 频道选择页
+ */
+// exports.index = (req, res) => {
+//
+// };
+
+/**
+ * 频道页，根据查询字符串跳转频道中间件
  * @param  {object} req
  * @param  {object} req
  * @param  {object} res
  * @param  {object} res
  * @param  {Function} next
  * @param  {Function} next
@@ -58,57 +81,53 @@ exports.switchChannel = (req, res, next) => {
  * 男生首页
  * 男生首页
  */
  */
 exports.boys = (req, res) => {
 exports.boys = (req, res) => {
-    channelModel.getChannelDate({
+    channelPage(req, res, {
         gender: 'boys',
         gender: 'boys',
-        uid: cookie.getUid(req)
-    }).then(result => {
-        res.render('channel', Object.assign(renderData, {
-            title: '男生首页'
-        }, result));
-    }).catch((err) => {
-        channelLogger(err, res);
+        title: '男生首页',
+        boysHomePage: true
     });
     });
 };
 };
 
 
+/**
+ * 女生首页
+ */
 exports.girls = (req, res) => {
 exports.girls = (req, res) => {
-    channelModel.getChannelDate({
+    channelPage(req, res, {
         gender: 'girls',
         gender: 'girls',
-        uid: cookie.getUid(req)
-    }).then(result => {
-        res.render('channel', Object.assign(renderData, {
-            title: '女生首页'
-        }, result));
-    }).catch((err) => {
-        channelLogger(err, res);
+        title: '女生首页',
+        girlsHomePage: true
     });
     });
 };
 };
 
 
+/**
+ * 潮童首页
+ */
+
 exports.kids = (req, res) => {
 exports.kids = (req, res) => {
-    channelModel.getChannelDate({
+    channelPage(req, res, {
         gender: 'kids',
         gender: 'kids',
-        uid: cookie.getUid(req)
-    }).then(result => {
-        res.render('channel', Object.assign(renderData, {
-            title: '潮童首页'
-        }, result));
-    }).catch((err) => {
-        channelLogger(err, res);
+        title: '潮童首页',
+        boysHomePage: true
     });
     });
 };
 };
 
 
+/**
+ * 创意生活首页
+ */
 exports.lifestyle = (req, res) => {
 exports.lifestyle = (req, res) => {
-    channelModel.getChannelDate({
+    channelPage(req, res, {
         gender: 'lifestyle',
         gender: 'lifestyle',
-        uid: cookie.getUid(req)
-    }).then(result => {
-        res.render('channel', Object.assign(renderData, {
-            title: '创意生活首页'
-        }, result));
-    }).catch((err) => {
-        channelLogger(err, res);
+        title: '创意生活首页',
+        lifestyleHomePage: true
     });
     });
 };
 };
 
 
+/**
+ * 频道页底部 bannel
+ * @param  {[object]} req
+ * @param  {[object]} res
+ * @return {[type]}
+ */
 exports.bottomBanner = (req, res) => {
 exports.bottomBanner = (req, res) => {
     let gender = req.query.gender || 'boys';
     let gender = req.query.gender || 'boys';