Merge branch 'feature/captcha' into release/5.3
Showing
3 changed files
with
1 additions
and
3 deletions
@@ -15,7 +15,6 @@ var multipartMiddleware = multipart(); | @@ -15,7 +15,6 @@ var multipartMiddleware = multipart(); | ||
15 | const uploadApi = require(cRoot + '/upload.js'); | 15 | const uploadApi = require(cRoot + '/upload.js'); |
16 | 16 | ||
17 | const hotfix = require(`${cRoot}/hotfix`); | 17 | const hotfix = require(`${cRoot}/hotfix`); |
18 | -// const captcha = require(`${cRoot}/captcha`); | ||
19 | 18 | ||
20 | // routers | 19 | // routers |
21 | 20 |
@@ -218,7 +218,7 @@ const sendCodeToMobileAPI = (req, res, next) => { | @@ -218,7 +218,7 @@ const sendCodeToMobileAPI = (req, res, next) => { | ||
218 | } | 218 | } |
219 | req.session.backupCaptch.useTime = req.session.backupCaptch.useTime - 1; | 219 | req.session.backupCaptch.useTime = req.session.backupCaptch.useTime - 1; |
220 | } else { | 220 | } else { |
221 | - req.session.backupCaptch.useTime = 5; | 221 | + _.set(req.session, 'backupCaptch.useTime', 5); |
222 | } | 222 | } |
223 | 223 | ||
224 | if (verifyCode) { | 224 | if (verifyCode) { |
@@ -199,7 +199,6 @@ let codeAction = (req, res, next) => { | @@ -199,7 +199,6 @@ let codeAction = (req, res, next) => { | ||
199 | res.render('reg/code', { | 199 | res.render('reg/code', { |
200 | page: 'code', | 200 | page: 'code', |
201 | title: '注册-验证码', | 201 | title: '注册-验证码', |
202 | - backUrl: '/?go=1', // eslint-disable-line | ||
203 | headerText: '注册', // 头部信息 | 202 | headerText: '注册', // 头部信息 |
204 | isPassportPage: true, // 模板中模块标识 | 203 | isPassportPage: true, // 模板中模块标识 |
205 | areaCode: area, // 默认的区号 | 204 | areaCode: area, // 默认的区号 |
-
Please register or login to post a comment