Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

+/**
+ * 主页
+ * @author: Bi Kai<kai.bi@yoho.cn>
+ * @date: 2016/05/09
+ */
+'use strict';
+const _ = require('lodash');
+const helpers = global.yoho.helpers;
+
+/**
+ * 频道选择页
+ */
+const component = {
+    index: (req, res, next) => {
+        res.render('index', {
+            module: 'example',
+            page: 'home'
+        });
+    }
+};
+
+module.exports = component;

+/**
+ * sub app home
+ * @author: shenzm<zhimin.shen@yoho.cn>
+ * @date: 2016/07/18
+ */
+
+var express = require('express'),
+    path = require('path'),
+    hbs = require('express-handlebars');
+
+var app = express();
+
+// set view engin
+var doraemon = path.join(__dirname, '../../doraemon/views'); //parent view root
+
+app.on('mount', function(parent) {
+    delete parent.locals.settings; // 不继承父 App 的设置
+    Object.assign(app.locals, parent.locals);
+});
+
+app.set('views', path.join(__dirname, 'views/action'));
+app.engine('.hbs', hbs({
+    extname: '.hbs',
+    defaultLayout: 'layout',
+    layoutsDir: doraemon,
+    partialsDir: [path.join(__dirname, 'views/partial'), `${doraemon}/partial`],
+    helpers: global.yoho.helpers
+}));
+
+// router
+app.use(require('./router'));
+
+module.exports = app;

+/**
+ * router of sub app home 
+ * @author: shenzm<zhimin.shen@yoho.cn>
+ * @date: 2016/07/18
+ */
+
+'use strict';
+
+const router = require('express').Router();
+const cRoot = './controllers';
+
+// Your controller here
+
+module.exports = router;

+<h1>test</h1>