Authored by biao

add set page info middleware

@@ -83,10 +83,13 @@ try { @@ -83,10 +83,13 @@ try {
83 const user = require('./doraemon/middleware/user'); 83 const user = require('./doraemon/middleware/user');
84 const setChannel = require('./doraemon/middleware/set-channel'); 84 const setChannel = require('./doraemon/middleware/set-channel');
85 const errorHanlder = require('./doraemon/middleware/error-handler'); 85 const errorHanlder = require('./doraemon/middleware/error-handler');
  86 + const setPageInfo = require('./doraemon/middleware/set-pageinfo');
  87 +
86 88
87 // YOHO 前置中间件 89 // YOHO 前置中间件
88 app.use(user()); 90 app.use(user());
89 app.use(setChannel()); 91 app.use(setChannel());
  92 + app.use(setPageInfo());
90 93
91 require('./dispatch')(app); 94 require('./dispatch')(app);
92 95
@@ -8,11 +8,6 @@ @@ -8,11 +8,6 @@
8 const outletModel = require('../models/outlet'); 8 const outletModel = require('../models/outlet');
9 const headerModel = require('../../../doraemon/models/header'); 9 const headerModel = require('../../../doraemon/models/header');
10 10
11 -const renderData = {  
12 - module: 'product'  
13 -};  
14 -  
15 -  
16 // 奥莱首页控制器 11 // 奥莱首页控制器
17 exports.index = (req, res, next) => { 12 exports.index = (req, res, next) => {
18 let headerData = headerModel.setNav({ 13 let headerData = headerModel.setNav({
@@ -26,9 +21,8 @@ exports.index = (req, res, next) => { @@ -26,9 +21,8 @@ exports.index = (req, res, next) => {
26 21
27 outletModel.getContent(categoryId, yhChannel, contentcode).then(result => { 22 outletModel.getContent(categoryId, yhChannel, contentcode).then(result => {
28 res.render('outlet', Object.assign({ 23 res.render('outlet', Object.assign({
29 - page: 'outlet',  
30 pageHeader: headerData 24 pageHeader: headerData
31 - }, renderData, result)); 25 + }, result));
32 }).catch(next); 26 }).catch(next);
33 }; 27 };
34 28
@@ -44,7 +38,7 @@ exports.activityDetail = (req, res, next) => { @@ -44,7 +38,7 @@ exports.activityDetail = (req, res, next) => {
44 page: 'outlet-detail', 38 page: 'outlet-detail',
45 pageHeader: headerData, 39 pageHeader: headerData,
46 pageFooter: true 40 pageFooter: true
47 - }, renderData, result)); 41 + }, result));
48 }).catch(next); 42 }).catch(next);
49 }; 43 };
50 44
@@ -68,6 +62,6 @@ exports.activityList = (req, res, next) => { @@ -68,6 +62,6 @@ exports.activityList = (req, res, next) => {
68 page: page, 62 page: page,
69 pageHeader: headerData, 63 pageHeader: headerData,
70 pageFooter: true 64 pageFooter: true
71 - }, renderData, result)); 65 + }, result));
72 }).catch(next); 66 }).catch(next);
73 }; 67 };
@@ -260,4 +260,4 @@ module.exports = { @@ -260,4 +260,4 @@ module.exports = {
260 getContent: getContent, 260 getContent: getContent,
261 getActivity: getActivity, 261 getActivity: getActivity,
262 getRecentActivity: getRecentActivity 262 getRecentActivity: getRecentActivity
263 -} 263 +};
  1 +/**
  2 + * 设置页面的module,page默认值
  3 + * @author: 赵彪<bill.zhao@yoho.cn>
  4 + * @date: 2016/6/22
  5 + */
  6 +
  7 +'use strict';
  8 +
  9 +module.exports = () => {
  10 + return (req, res, next) => {
  11 + if (!req.xhr) {
  12 + const arr = req.path.substring(1).split('/');
  13 +
  14 + Object.assign(res.locals, {
  15 + module: arr[0],
  16 + page: arr[1]
  17 + });
  18 + }
  19 +
  20 + next();
  21 + };
  22 +};