reg注册 增加 testCode,并且图形校验码逻辑未校验5次刷新

@@ -13,6 +13,7 @@ const utils = require(global.utils);
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const sign = global.yoho.sign;
 const sign = global.yoho.sign;
 const cookie = global.yoho.cookie;
 const cookie = global.yoho.cookie;
+const config = global.yoho.config;
 const RegService = require('../models/reg-service');
 const RegService = require('../models/reg-service');
 const AuthHelper = require('../models/auth-helper');
 const AuthHelper = require('../models/auth-helper');
 const captchaService = require('../models/captcha-service');
 const captchaService = require('../models/captcha-service');
@@ -84,6 +85,10 @@ let index = (req, res) => {
     // session init
     // session init
     _.set(req.session, 'phoneReg.step', 1);
     _.set(req.session, 'phoneReg.step', 1);
 
 
+    if (req.session.captchaValidCount == null) { // eslint-disable-line
+        req.session.captchaValidCount = 5;
+    }
+
     if (req.session.phoneReg.count == null) { // eslint-disable-line
     if (req.session.phoneReg.count == null) { // eslint-disable-line
         req.session.phoneReg.count = 5;
         req.session.phoneReg.count = 5;
     }
     }
@@ -113,26 +118,34 @@ let verifyMobile = (req, res, next) => {
     let mobile = +req.body.phoneNum;
     let mobile = +req.body.phoneNum;
     let area = +(req.body.areaCode || 86);
     let area = +(req.body.areaCode || 86);
     let captcha = (req.body.captcha || '').trim();
     let captcha = (req.body.captcha || '').trim();
+    let testCode = req.body.yohobuy;
+
     let diffCaptcha = _.get(req.session, 'captcha');
     let diffCaptcha = _.get(req.session, 'captcha');
+    let errorCount = _.get(req.session, 'captchaValidCount', 4);
 
 
     // error case： 没有验证码
     // error case： 没有验证码
     if (!diffCaptcha) {
     if (!diffCaptcha) {
-        return res.json({
-            code: 400,
-            message: '请求失败',
-            refreshCaptcha: true
-        });
+        data.message = '非法请求';
+        data.changeCaptcha = true;
+
+        return res.json(data);
     }
     }
 
 
-    delete req.session.captcha; // captcha 一次性
+    if (req.session.captchaValidCount) {
+        --req.session.captchaValidCount;
+    }
+
+    if (!errorCount) {
+        _.set(req.session, 'captchaValidCount', 4);
+
+        req.session.captcha = null;
+        data.changeCaptcha = true;
+    }
 
 
     // error case: 验证码不匹配
     // error case: 验证码不匹配
-    if (captcha !== diffCaptcha) {
-        return res.json({
-            code: 400,
-            message: '校验码不正确',
-            refreshCaptcha: true
-        });
+    if (!(captcha === diffCaptcha || testCode === config.testCode)) {
+        data.message = '请将图片旋转到正确方向';
+        return res.json(data);
     }
     }
 
 
     // 判断参数是否合法
     // 判断参数是否合法
@@ -152,7 +165,8 @@ let verifyMobile = (req, res, next) => {
 
 
     // 向手机发送注册验证码
     // 向手机发送注册验证码
     RegService.sendCodeToMobile(area, mobile).then((result) => {
     RegService.sendCodeToMobile(area, mobile).then((result) => {
-        if (!result.code) {
+        if (result.code !== 200) {
+            data.message = result.message;
             return res.json(data);
             return res.json(data);
         }
         }
 
 

@@ -103,7 +103,7 @@ $btnNext.on('touchstart', function() {
                 if (data.code === 200) {
                 if (data.code === 200) {
                     location.href = data.data;
                     location.href = data.data;
                 } else {
                 } else {
-                    imgCheck.refresh();
+                    data.changeCaptcha && imgCheck.refresh();
 
 
                     showErrTip(data.message);
                     showErrTip(data.message);
                     requested = false;
                     requested = false;