Merge remote-tracking branch 'origin/feature/back' into feature/passport

+/**
+ * 找回密码
+ * Created by yoho on 2016/6/12.
+ */
+
+'use strict';
+
+const library = '../../../library';
+const helpers = require(`${library}/helpers`);
+
+/**
+ * 通过邮箱找回密码
+ * @param req
+ * @param res
+ */
+module.exports.byEmail = (req, res) => {
+
+    let data = {
+        backUrl: helpers.urlFormat('/signin.html'),
+        headerText: '找回密码',
+        isPassportPage: true,
+        backEmail: true
+    };
+
+    res.render('back/by-email', {
+        result: data,
+        module: 'passport',
+        page: 'back',
+        title: data.backUrl
+    });
+};

+/**
+ * Created by yoho on 2016/6/12.
+ */
+
+module.exports.email = (email) => {
+    email;
+
+};
+

@@ -15,5 +15,6 @@ const router = express.Router(); // eslint-disable-line
 router.get('/login', login.local.loginPage);
 router.get('/login', login.local.loginPage);
 router.get('/login/wechat', login.wechat.beforeLogin, login.wechat.login); // 登录
 router.get('/login/wechat', login.wechat.beforeLogin, login.wechat.login); // 登录
 router.get('/login/wechat/callback', login.wechat.callback);
 router.get('/login/wechat/callback', login.wechat.callback);
+router.get('/ ');
 
 
 module.exports = router;
 module.exports = router;