验证码读取本地数据

ccbikai(👎🏻🍜)
Commit 33765cb6c7d4af3261fef293c2b971f3345382a4 1 parent 4fb418f6
Showing 21 changed files with 394 additions and 155 deletions
apps/passport/controllers/back.js
apps/passport/controllers/login.js
apps/passport/controllers/reg.js
apps/passport/controllers/sms.js
apps/passport/data/captcha.json
apps/passport/models/auth-helper.js
apps/passport/models/reg-service.js
apps/passport/router.js
apps/passport/views/action/back/mobile.hbs
apps/passport/views/action/international.hbs
apps/passport/views/action/login.hbs
apps/passport/views/action/reg/index.hbs
apps/passport/views/action/sms/login.hbs
apps/serverAPI/imgcheck.js
public/js/passport/back/mobile.js
public/js/passport/login/international.js
public/js/passport/login/login.js
public/js/passport/register/password.js
public/js/passport/register/register.js
public/js/passport/sms-login.page.js
--- a/apps/passport/controllers/back.js
View file @33765cb
+++ b/apps/passport/controllers/back.js
View file @33765cb
@@ -142,6 +142,7 @@ const indexMobilePage = (req, res, next) => {
     service.getAreaDataAsync()
         .then(result => {
             res.render('back/mobile', Object.assign({
+                width750: true,
                 module: 'passport',
                 page: 'back-mobile',
                 title: '找回密码-通过手机号'
@@ -217,11 +218,13 @@ const sendCodeToMobileAPI = (req, res, next) => {
         }
         req.session.backupCaptch.useTime = req.session.backupCaptch.useTime - 1;
     } else {
-        req.session.backupCaptch.useTime = 5;
+        _.set(req.session, 'backupCaptch.useTime', 5);
     }
     if (verifyCode) {
-        if (verifyCode.toString() === _.get(req, 'session.backupCaptch.code', '').toString()) {
+        let captcha = _.get(req, 'session.captcha');
+
+        if (captcha && verifyCode.toString() === captcha) {
             req.session.backupCaptch.verifyResult = true;
         } else {
             return res.json({
--- a/apps/passport/controllers/login.js
View file @33765cb
+++ b/apps/passport/controllers/login.js
View file @33765cb
@@ -5,7 +5,7 @@
  * @date: 2016/05/09
  */
 'use strict';
-
+const _ = require('lodash');
 const passport = require('passport');
 // const md5 = require('md5');
@@ -78,6 +78,7 @@ const common = {
     }
 };
+
 const local = {
     loginPage: (req, res) => {
         // 先清除cookie
@@ -97,7 +98,9 @@ const local = {
         });
         res.render('login', {
+            width750: true,
             loginIndex: true, // 模板中使用JS的标识
+            captchaShow: _.get(req.session, 'login.errorCount') <= 0,
             // 返回的URL链接
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
@@ -135,9 +138,11 @@ const local = {
         });
         res.render('international', {
+            width750: true,
             // 返回的URL链接
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
             loginInternational: true, // 模板中使用JS的标识
+            captchaShow: _.get(req.session, 'login.errorCount') <= 0,
             isPassportPage: true, // 模板中模块标识
             headerText: '登录',
             areaCode: '+86', // 默认区号
@@ -148,13 +153,44 @@ const local = {
         });
     },
     login: (req, res, next) => {
+        let count = _.get(req.session, 'login.errorCount');
+
+        if (count == null) { // eslint-disable-line
+            _.set(req.session, 'login.errorCount', 3);
+        } else if (count <= 0) {
+            let captchaInput = req.body.captcha;
+            let captchaCode = _.get(req.session, 'captcha');
+
+            delete req.session.captcha; // 用过就丢弃
+
+            if (!captchaInput || !captchaCode || captchaInput !== captchaCode) {
+                res.json({
+                    code: 400,
+                    message: '请将图片旋转到正确方向',
+                    captchaShow: true
+                });
+
+                return;
+            }
+        }
+
         passport.authenticate('local', (err, user) => {
+            let loginSession = req.session.login;
+
             if (err) {
-                res.json({
+                let obj = {
                     code: 400,
                     message: err,
                     data: ''
-                });
+                };
+
+                --loginSession.errorCount;
+
+                if (loginSession.errorCount <= 0) {
+                    obj.captchaShow = true;
+                }
+
+                res.json(obj);
             } else {
                 let refer = req.cookies.refer;
--- a/apps/passport/controllers/reg.js
View file @33765cb
+++ b/apps/passport/controllers/reg.js
View file @33765cb
@@ -8,6 +8,7 @@
 'use strict';
 const _ = require('lodash');
+const url = require('url');
 const utils = require(global.utils);
 const helpers = global.yoho.helpers;
 const sign = global.yoho.sign;
@@ -26,6 +27,7 @@ const captchaService = require('../models/captcha-service');
     }
 */
+
 /**
  *  步骤校验
  *  step: 预期步骤
@@ -58,6 +60,17 @@ let index = (req, res) => {
         return res.redirect(req.get('refer') || '/');
     }
+    // 判断是否 来自 个人中心
+    if (!_.get(req.session, 'phoneReg.isFromMy')) {
+        let referer = req.get('Referer') || '';
+        let urlObj = url.parse(referer, true, true);
+
+        referer = _.get(urlObj, 'query.refer', '');
+
+        urlObj = url.parse(referer, true, true);
+        urlObj.path === '/home' && _.set(req.session, 'phoneReg.isFromMy', '1');
+    }
+
     // 设置注册有效时间30分钟, 防机器刷
     // req.session.REG_EXPIRE = Date.now() + 1800000;
     let refer = req.query.refer;
@@ -76,6 +89,7 @@ let index = (req, res) => {
     }
     res.render('reg/index', {
+        width750: true,
         module: 'passport',
         page: 'reg',
         title: '注册',
@@ -99,7 +113,7 @@ let verifyMobile = (req, res, next) => {
     let mobile = +req.body.phoneNum;
     let area = +(req.body.areaCode || 86);
     let captcha = (req.body.captcha || '').trim();
-    let diffCaptcha = _.get(req.session, 'phoneReg.captcha');
+    let diffCaptcha = _.get(req.session, 'captcha');
     // error case： 没有验证码
     if (!diffCaptcha) {
@@ -110,7 +124,7 @@ let verifyMobile = (req, res, next) => {
         });
     }
-    delete req.session.phoneReg.captcha; // captcha 一次性
+    delete req.session.captcha; // captcha 一次性
     // error case: 验证码不匹配
     if (captcha !== diffCaptcha) {
@@ -185,7 +199,6 @@ let codeAction = (req, res, next) => {
     res.render('reg/code', {
         page: 'code',
         title: '注册-验证码',
-        backUrl: '/?go=1', // eslint-disable-line
         headerText: '注册', // 头部信息
         isPassportPage: true, // 模板中模块标识
         areaCode: area, // 默认的区号
@@ -361,6 +374,7 @@ let setPassword = (req, res, next) => {
     let password = req.body.password;
     let token = req.body.token;
     let smsCode = +req.body.smsCode;
+    let isFromMy = _.get(req.session, 'phoneReg.isFromMy', '0');
     // 判断参数是否合法
     if (!smsCode || !_.isString(token) || !_.isNumber(mobile) || !_.isNumber(area) || !password) {
@@ -383,29 +397,40 @@ let setPassword = (req, res, next) => {
     let shoppingKey = cookie.getShoppingKey(req);
     // 验证注册的标识码是否有效
-    RegService.regMobileAes(area, mobile, password, shoppingKey, smsCode).then((result) => {
+    let resultCopy = null;
+
+    RegService.regMobileAes(area, mobile, password, shoppingKey, smsCode, isFromMy).then((result) => {
         if (!result.code || result.code !== 200) {
             return Promise.reject(result);
         }
         if (!result.data || !result.data.uid) {
             return Promise.reject(result);
         }
+
+        resultCopy = result;
+
         return AuthHelper.syncUserSession(result.data.uid, req, res);
     }).then(() => {
         // 返回跳转到来源页面
         let refer = req.cookies.refer;
-        if (refer) {
-            refer = decodeURI(req.cookies.refer);
+        // isFromMy  to 新人会场
+        if (resultCopy.data.newUserPage) {
+            refer = resultCopy.data.msgDelivery; // 来自个人中心，跳新人会场
         } else {
-            refer = '/home';
-        }
+            if (refer) {
+                refer = decodeURI(req.cookies.refer);
+            } else {
+                refer = '/home';
+            }
+
+            if (/sign|login/.test(refer)) {
+                refer = '/home';
+            }
-        if (/sign|login/.test(refer)) {
-            refer = '/home';
+            refer = utils.refererLimit(refer);
         }
-        refer = utils.refererLimit(refer);
         delete req.session.phoneNum;
--- a/apps/passport/controllers/sms.js
View file @33765cb
+++ b/apps/passport/controllers/sms.js
View file @33765cb
 /* eslint no-unused-vars: ["error", { "args": "none" }] */
 'use strict';
 const _ = require('lodash');
+const moment = require('moment');
 const helpers = global.yoho.helpers;
 const cookie = global.yoho.cookie;
+const EventEmitter = require('events');
 const utils = require(global.utils);
 const RegService = require('../models/reg-service');
 const PhoneService = require('../models/phone-service');
 const AuthHelper = require('../models/auth-helper');
-const captchaService = require('../models/captcha-service');
 // constrant
 const CODE_REQUIRED = '请输入校验码';
 const PASSWORD_REQUIRED = '请输入密码';
 const PASSWORD_LENGTH_ERROR = '密码6-20位，请重新输入';
 const BAD_PASSWORD = '密码格式不正确';
-const TOO_MANY = '请求太频繁';
 const LOGIN_SUCCSS = '登录成功';
 const VERIFY_ERROR = '校验失败';
@@ -44,6 +44,7 @@ const _step1 = (req, res, next) => {
     let template = 'sms/login';
     let viewData = {
+        width750: true,
         module: 'passport',
         page: 'sms-login',
         title: '手机短信登录',
@@ -55,6 +56,8 @@ const _step1 = (req, res, next) => {
     };
     res.render(template, viewData);
+
+
 };
 // 短信登录 第二步： 输入 校验码
@@ -118,44 +121,75 @@ exports.loginPage = (req, res, next) => {
     }
 };
-exports.tokenBefore = (req, res, next) => {
-    let area = req.query.area = (req.query.area || '').trim();
-    let mobile = req.query.mobile = (req.query.mobile || '').trim();
-    let step = _.get(req.session, 'smsLogin.step');
-    let count = _.get(req.session, 'smsLogin.count');
-    let interval = _.get(req.session, 'smsLogin.interval');
-    let captcha1 = _.get(req.session, 'smsLogin.captcha');
-    let captcha2 = (req.query.captcha || '').trim();
+/**
+ *  step1 的表单提交验证
+ */
+exports.indexCheck = (req, res, next) => {
+    _.set(req.session, 'smsLogin.step', 1);
-    if (!req.xhr) {
-        return next(404);
-    }
+    let area = req.body.area = (req.body.area || '').trim();
+    let mobile = req.body.mobile = (req.body.mobile || '').trim();
+    let captcode = (req.body.captcode || '').trim();
+    let captcodeValid = _.get(req.session, 'captcha');
-    if ([area, mobile].some(val => val === '')) {
-        return res.json({
-            code: 401,
-            message: '手机号 必填'
+    let em = new EventEmitter();
+
+    // 校验 成功
+    em.on('resolve', () => {
+        // 1. 将信息放入 session
+        _.set(req.session, 'smsLogin.area', area);
+        _.set(req.session, 'smsLogin.mobile', mobile);
+        _.set(req.session, 'smsLogin.step', 2);
+
+        PhoneService.sendSMS(mobile, area, 1);
+
+        --req.session.smsLogin.count;
+
+        if (!req.session.smsLogin.count) {
+            _.set(req.session, 'smsLogin.interval', Date.now() + 5 * 60 * 1000);
+        } else {
+            _.set(req.session, 'smsLogin.interval', Date.now() + 60 * 1000);
+        }
+
+        res.json({
+            code: 200,
+            redirect: '/passport/sms_login?step=2'
         });
+    });
+
+    // 校验 失败
+    em.on('reject', error => {
+        _.set(req.session, 'smsLogin.step', 1);
+
+        res.json(error);
+    });
+
+
+    req.session.captcha = void 0; // 验证码 用过就扔
+
+    // 验证
+    if ([area, mobile].some(val => val === '')) {
+        return em.emit('reject', {code: 400, message: '请填写手机号'});
+    } else if (!captcode) {
+        return em.emit('reject', {code: 400, message: '请填写验证码'});
+    } else if (captcode !== captcodeValid) {
+        return em.emit('reject', {code: 400, message: '请将图片旋转到正确位置'});
     }
-    delete req.session.smsLogin.captcha; // 图形验证码 一次性
+    // congratulation～～
+    em.emit('resolve');
+};
-    // step1 要 校验图形验证码
-    if (step === 1) {
-        if (!captcha2) {
-            return res.json({
-                code: 400,
-                message: '请填写验证码'
-            });
-        }
+exports.tokenBefore = (req, res, next) => {
-        if (captcha1 !== captcha2) {
-            return res.json({
-                code: 400,
-                message: VERIFY_ERROR
-            });
-        }
+    let step = _.get(req.session, 'smsLogin.step');
+    let count = _.get(req.session, 'smsLogin.count');
+    let interval = _.get(req.session, 'smsLogin.interval');
+
+
+    if (!req.xhr || step !== 2) {
+        return next(404);
     }
     let now = Date.now();
@@ -164,11 +198,14 @@ exports.tokenBefore = (req, res, next) => {
     //      1. 过了冻结期， count 重设为 5次
     //      2. 没过冻结期， end
     // 没有用完, 判断是否请求太频繁
+    let during = moment.duration(interval - now, 'ms').minutes();
+    let message = `请${during}分钟后再试`;
+
     if (!count) {
         if (interval > now) {
             return res.json({
                 code: 400,
-                message: TOO_MANY,
+                message: message,
                 during: Math.ceil((interval - now) / 1000)
             });
         } else {
@@ -177,17 +214,19 @@ exports.tokenBefore = (req, res, next) => {
     } else if (interval > now) {
         return res.json({
             code: 429,
-            message: TOO_MANY
+            message: message
         });
     }
     next();
 };
+
+
 // AJAX 获取验证码
 exports.token = (req, res, next) => {
-    let area = req.query.area;
-    let mobile = req.query.mobile;
+    let area = _.get(req.session, 'smsLogin.area');
+    let mobile = _.get(req.session, 'smsLogin.mobile');
     PhoneService.sendSMS(mobile, area, 1).then(result => {
         if (result.code === 200) {
@@ -376,6 +415,7 @@ exports.password = (req, res, next) => {
 /**
  *  生成 校验码
  */
+/*
 exports.genCaptcha = (req, res) => {
     let captcha = captchaService.generateCaptcha(90, 52, 4);
@@ -386,3 +426,4 @@ exports.genCaptcha = (req, res) => {
        .status(200)
        .send(captcha.image);
 };
+*/
--- a/apps/passport/data/captcha.json 0 → 100644
View file @33765cb
+++ b/apps/passport/data/captcha.json 0 → 100644
View file @33765cb
--- a/apps/passport/models/auth-helper.js
View file @33765cb
+++ b/apps/passport/models/auth-helper.js
View file @33765cb
 'use strict';
+const _ = require('lodash');
 const aes = require('./aes-pwd');
 const sign = global.yoho.sign;
 const api = global.yoho.API;
@@ -87,10 +88,17 @@ class Auth {
                     domain: 'yohobuy.com',
                     expires: new Date(Date.now() + 2592000000) // 有效期一年
                 });
+
+                req.session.AVATAR = data.head_ico;
+                _.set(req.session, 'USER.AVATAR', data.head_ico);
+                _.set(req.session, 'USER.NAME', data.profile_name);
             }
             req.session.TOKEN = publicToken;
             req.session.LOGIN_UID = uid;
+
+            _.set(req.session, 'USER.ENCRYPTION_UID', encryptionUid);
+
             res.cookie('_TOKEN', publicToken, {
                 httpOnly: true,
                 domain: 'yohobuy.com',
--- a/apps/passport/models/reg-service.js
View file @33765cb
+++ b/apps/passport/models/reg-service.js
View file @33765cb
@@ -96,13 +96,16 @@ const RegService = {
         return api.post('', params);
     },
-    regMobileAes(area, mobile, password, shoppingKey, smsCode) {
+    regMobileAes(area, mobile, password, shoppingKey, smsCode, isFromMy) {
+        isFromMy = isFromMy || '0';
+
         let params = {
             method: 'app.passport.registerAES',
             area: area,
             profile: mobile,
             password: aes.aesPwd(password),
-            verifyCode: smsCode
+            verifyCode: smsCode,
+            isFromMy
         };
         if (shoppingKey) {
--- a/apps/passport/router.js
View file @33765cb
+++ b/apps/passport/router.js
View file @33765cb
@@ -41,6 +41,7 @@ router.post('/passport/login/auth', login.local.login);
 // SMS 短信
 router.use('/passport/sms_login', login.common.beforeLogin, smsLogin.beforeIn);
 router.get('/passport/sms_login', smsLogin.loginPage);
+router.post('/passport/sms_login/step1_check', smsLogin.indexCheck);
 router.get('/passport/sms_login/token.json',
     smsLogin.tokenBefore,
     smsLogin.token); // only ajax;
@@ -48,7 +49,6 @@ router.get('/passport/sms_login/check.json',
     smsLogin.checkBefore,
     smsLogin.check); // only ajax
 router.post('/passport/sms_login/password.json', smsLogin.password);
-router.get('/passport/sms_login/captcha.png', smsLogin.genCaptcha);
 // 微信登录
 router.get('/passport/login/wechat', login.common.beforeLogin, login.wechat.login);
@@ -126,4 +126,9 @@ router.get('/passport/newpower', agreement.newpower);// 新力传媒
 router.get('/passport/yohobuy', agreement.aboutYoho);// 关于有货
 router.get('/passport/agreement', agreement.agreement);// 服务条款
+// 验证码
+let captcha = require(`${cRoot}/captcha`);
+
+router.get('/passport/captcha/get', captcha.get);
+
 module.exports = router;
--- a/apps/passport/views/action/back/mobile.hbs
View file @33765cb
+++ b/apps/passport/views/action/back/mobile.hbs
View file @33765cb
@@ -6,12 +6,11 @@
             <span id="area-code" class="area-code">{{areaCode}}</span>
             <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
         </div>
-        <div class="passport-captcha row">
-            <div class="passport-captcha-img"><img id="verify-code-img" src="{{verifySrc}}" alt="verify code"></div>
-            <div class="passport-captcha-input">
-                <input id="verify-code" type="text" placeholder="验证码">
-            </div>
+        {{!--图片验证 start--}}
+        <div id="js-img-check">
+            <input type="hidden" name="captsrc" value="{{captsrc}}">
         </div>
+        {{!--图片验证 end--}}
         <span id="btn-next" class="btn btn-next disable row">下一步</span>
     </div>
 </div>
--- a/apps/passport/views/action/international.hbs
View file @33765cb
+++ b/apps/passport/views/action/international.hbs
View file @33765cb
@@ -9,6 +9,8 @@
         <div class="input-container row has-eye">
             <input id="pwd" class="pwd input" type="password" placeholder="密码">
         </div>
+        <div id="js-img-check" {{#captchaShow }}data-init{{/captchaShow}}></div>
+
         <span id="btn-login" class="btn btn-login disble row">登录</span>
     </div>
 </div>
--- a/apps/passport/views/action/login.hbs
View file @33765cb
+++ b/apps/passport/views/action/login.hbs
View file @33765cb
@@ -8,9 +8,10 @@
         <div class="input-container row has-eye">
             <input id="pwd" class="pwd input" type="password" placeholder="密码">
         </div>
+        <div id="js-img-check" {{#captchaShow }}data-init{{/captchaShow}}></div>
         <span id="btn-login" class="btn btn-login disable">登录</span>
         <p class="op-container">
-            {{!--<a class="sms-login" href={{smsLoginUrl}}>手机号码快捷登录</a>--}}
+            <a class="sms-login" href={{smsLoginUrl}}>手机号码快捷登录</a>
             <span id="forget-pwd" class="forget-pwd">忘记密码</span>
         </p>
         <div class="third-party-login">
@@ -43,4 +44,4 @@
             </li>
         </ul>
     </div>
-</div>
+</div>
--- a/apps/passport/views/action/reg/index.hbs
View file @33765cb
+++ b/apps/passport/views/action/reg/index.hbs
View file @33765cb
@@ -6,16 +6,13 @@
             <span id="area-code" class="area-code">{{areaCode}}</span>
             <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
         </div>
-        <!-- 验证码: start-->
-        <div class="passport-captcha row">
-            <div class="passport-captcha-img">
-                <img class="passport-captcha-png" src="{{captchaUrl}}">
-            </div>
-            <div class="passport-captcha-input">
-                <input id="js-captcha"  type="text" placeholder="验证码">
-            </div>
+
+        {{!--图片验证 start--}}
+        <div id="js-img-check">
+            <input type="hidden" name="captsrc" value="{{captsrc}}">
         </div>
-        <!-- 验证码: end-->
+        {{!--图片验证 end--}}
+
         <span id="btn-next" class="btn btn-next disable row">下一步</span>
         <p class="register-tip">Yoho!Family账号可登录Yoho!Buy有货、Yoho!Now、mars及SHOW</p>
     </div>
--- a/apps/passport/views/action/sms/login.hbs
View file @33765cb
+++ b/apps/passport/views/action/sms/login.hbs
View file @33765cb
@@ -7,12 +7,11 @@
             <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
             <button class="clear-input" type="button"></button>
         </div>
-        <div class="passport-captcha row">
-            <div class="passport-captcha-img"><img src="{{captchaUrl}}" alt=""></div>
-            <div class="passport-captcha-input">
-                <input id="js-captcha"  type="text" placeholder="验证码">
-            </div>
+        {{!--图片验证 start--}}
+        <div id="js-img-check">
+            <input type="hidden" name="captsrc" value="{{captsrc}}">
         </div>
+        {{!--图片验证 end--}}
         <button id="btn-next" class="btn btn-next disable row" disabled>获取短信验证码</button>
     </div>
 </div>
--- a/apps/serverAPI/imgcheck.js
View file @33765cb
+++ b/apps/serverAPI/imgcheck.js
View file @33765cb
 'use strict';
+const _ = require('lodash');
+let captchaData = require('../passport/data/captcha.json');
-let api = global.yoho.API;
-
+// let api = global.yoho.API;
 /**
  *  获取图形旋转验证码
  *  @return Promise
@@ -24,9 +25,16 @@ let api = global.yoho.API;
  *}
  */
 exports.gen = () => {
-    let params = {
-        method: 'web.register.getVerifiedGraphicCode'
-    };
+    // let params = {
+    //     method: 'web.register.getVerifiedGraphicCode'
+    // };
+
+    // return api.get('', params);
+
+    let random = _.random(0, captchaData.length);
-    return api.get('', params);
+    return Promise.resolve({
+        code: 200,
+        data: captchaData[random]
+    })
 };
--- a/public/js/passport/back/mobile.js
View file @33765cb
+++ b/public/js/passport/back/mobile.js
View file @33765cb
@@ -19,6 +19,18 @@ var tip = require('../../plugin/tip');
 var trim = $.trim;
 var showErrTip = tip.show;
+// 图片验证码
+let ImgCheck = require('plugin/img-check');
+
+let imgCheck = new ImgCheck('#js-img-check', {
+    useREM: {
+        rootFontSize: 40,
+        picWidth: 150
+    }
+});
+
+imgCheck.init();
+
 api.selectCssHack($('#country-select'));
 api.bindClearEvt();
@@ -45,12 +57,13 @@ $verifyCodeImg.on('touchstart', function() {
 $btnNext.on('touchstart', function() {
     var pn = trim($phoneNum.val()),
         area = trim($countrySelect.val()),
-        verify = trim($verifyCode.val());
+        verify = trim(imgCheck.getResults());
     if ($btnNext.hasClass('disable')) {
         return;
     }
+
     if (verify && area && pn && api.phoneRegx[area].test(pn)) {
         $.ajax({
             url: '/passport/back/sendcode',
@@ -63,18 +76,21 @@ $btnNext.on('touchstart', function() {
             success: function(data) {
                 if (data.code === 200) {
                     location.href = data.data;
+                    return;
                 } else if (data.code === 409) {
                     showErrTip(data.message);
                     location.href = data.refer;
                 } else {
                     showErrTip(data.message);
                 }
+
+                imgCheck.refresh();
             }
         });
     } else if (!area) {
         showErrTip('出错了，请重新刷新页面');
-    } else if (!verify) {
-        showErrTip('请输入验证码');
+    } else if (verify === '0000') {
+        showErrTip('请将图片旋转到正确位置');
     } else {
         showErrTip('手机号格式不正确，请重新输入');
     }
--- a/public/js/passport/login/international.js
View file @33765cb
+++ b/public/js/passport/login/international.js
View file @33765cb
@@ -4,6 +4,7 @@
  * @date: 2015/10/8
  */
 var $ = require('yoho-jquery');
+var ImgCheck = require('plugin/img-check');
 var $phoneNum = $('#phone-num'),
     $countrySelect = $('#country-select'),
@@ -11,6 +12,8 @@ var $phoneNum = $('#phone-num'),
     $pwd = $('#pwd'),
     $loginBtn = $('#btn-login'),
+    $captcha = $('#js-img-check'),
+
     pnPass = false,
     pwdPass = false;
@@ -20,13 +23,28 @@ var tip = require('../../plugin/tip');
 var trim = $.trim;
 var showErrTip = tip.show;
+var imgCheck = new ImgCheck($captcha, {
+    useREM: {
+        rootFontSize: 40,
+        picWidth: 150
+    }
+});
+
+if ($captcha.data('init') != null) { //eslint-disable-line
+    imgCheck.init();
+}
+
+
 // 登录按钮状态切换
 function switchLoginBtnStatus() {
-    if (pnPass && pwdPass) {
-        $loginBtn.removeClass('disable');
-    } else {
-        $loginBtn.addClass('disable');
-    }
+    var bool = !(pnPass && pwdPass);
+
+    $loginBtn.toggleClass('disable', bool);
+}
+
+function resetForm() {
+    $pwd.val('').focus();
+    $loginBtn.text('登录').addClass('disable');
 }
 // Android-UC下显示select的direction:rtl无效的临时解决办法
@@ -67,23 +85,39 @@ $countrySelect.change(function() {
 $loginBtn.on('touchstart', function() {
     var pn = trim($phoneNum.val()),
         areaCode = $countrySelect.val(),
-        pwd = trim($pwd.val());
+        pwd = trim($pwd.val()),
+        captcha = null;
     if ($loginBtn.hasClass('disable')) {
         return;
     }
+    if (imgCheck.atWorking) {
+        captcha = imgCheck.getResults();
+
+        if (captcha === '0000') {
+            return tip.show(' 请将图片旋转到正确方向');
+        }
+    }
+
+
     $loginBtn.text('正在登录...').addClass('disable');
     if ((api.phoneRegx[areaCode].test(pn) || areaCode !== '+86') && api.pwdValidate(pwd)) {
+        let data = {
+            areaCode: areaCode.replace('+', ''),
+            account: pn,
+            password: pwd
+        };
+
+        if (imgCheck.atWorking) {
+            $.extend(data, {captcha});
+        }
+
         $.ajax({
             type: 'POST',
             url: '/passport/login/auth',
-            data: {
-                areaCode: areaCode.replace('+', ''),
-                account: pn,
-                password: pwd
-            },
+            data,
             success: function(data) {
                 var res,
                     time;
@@ -110,21 +144,27 @@ $loginBtn.on('touchstart', function() {
                         location.href = res.href;
                     }, 3000);
+                    $loginBtn.text('登录成功').off();
                     showErrTip('登录成功');
                 } else {
+                    if (data.captchaShow) {
+                        imgCheck.atWorking ? imgCheck.refresh() : imgCheck.init();
+                    }
+
                     showErrTip(data.message);
+                    resetForm();
                 }
             },
             error: function() {
                 showErrTip('网络断开连接啦~');
-            },
-            complete: function() {
-                $loginBtn.text('登录').removeClass('disable');
+                $loginBtn.text('登录');
+
+                imgCheck.atWorking && imgCheck.refresh();
             }
         });
     } else {
         showErrTip('账号或密码有错误，请重新输入');
-        $loginBtn.text('登录').removeClass('disable');
+        $loginBtn.text('登录').addClass('disable');
     }
 });
--- a/public/js/passport/login/login.js
View file @33765cb
+++ b/public/js/passport/login/login.js
View file @33765cb
@@ -4,6 +4,7 @@
  * @date: 2015/9/30
  */
 var $ = require('yoho-jquery');
+var ImgCheck = require('plugin/img-check');
 var $account = $('#account'),
     $pwd = $('#pwd'),
@@ -12,6 +13,8 @@ var $account = $('#account'),
     $mask = $('#retrive-pwd-mask'),
     $ways = $('#retrive-pwd-ways'),
+    $captcha = $('#js-img-check'),
+
     accPass = false,
     pwdPass = false;
@@ -21,13 +24,30 @@ var tip = require('../../plugin/tip');
 var trim = $.trim;
 var showErrTip = tip.show;
+
+var imgCheck = new ImgCheck($captcha, {
+    useREM: {
+        rootFontSize: 40,
+        picWidth: 150
+    }
+});
+
+if ($captcha.data('init') != null) { //eslint-disable-line
+    imgCheck.init();
+}
+
 // 登录按钮状态切换
 function switchLoginBtnStatus() {
-    if (accPass && pwdPass) {
-        $loginBtn.removeClass('disable');
-    } else {
-        $loginBtn.addClass('disable');
-    }
+    var bool = true;
+
+    bool = !(accPass && pwdPass);
+
+    $loginBtn.toggleClass('disable', bool);
+}
+
+function resetForm() {
+    $pwd.val('').focus();
+    $loginBtn.text('登录').addClass('disable');
 }
 // 显示找回密码面板
@@ -70,23 +90,38 @@ $pwd.bind('input', function() {
 // Login
 $loginBtn.on('touchstart', function() {
     var acc = trim($account.val()),
-        pwd = trim($pwd.val());
+        pwd = trim($pwd.val()),
+        captcha = null;
     if ($loginBtn.hasClass('disable')) {
         return;
     }
+    if (imgCheck.atWorking) {
+        captcha = imgCheck.getResults();
+
+        if (captcha === '0000') {
+            return tip.show(' 请将图片旋转到正确方向');
+        }
+    }
+
     $loginBtn.text('正在登录...').addClass('disable');
     // 验证账号（数字或者邮箱）和密码合理性
     if ((/^[0-9]+$/.test(acc) || api.emailRegx.test(acc)) && api.pwdValidate(pwd)) {
+        let data = {
+            account: acc,
+            password: pwd
+        };
+
+        if (imgCheck.atWorking) {
+            $.extend(data, {captcha});
+        }
+
         $.ajax({
             type: 'POST',
             url: '/passport/login/auth',
-            data: {
-                account: acc,
-                password: pwd
-            },
+            data,
             success: function(data) {
                 var res;
@@ -95,12 +130,22 @@ $loginBtn.on('touchstart', function() {
                     showErrTip('登录成功');
                     location.href = res.href;
+                    $loginBtn.text('登录成功').off();
                 } else {
+                    if (data.captchaShow) {
+                        imgCheck.atWorking ? imgCheck.refresh() : imgCheck.init();
+                    }
+
                     showErrTip(data.message);
+                    resetForm();
                 }
+
+                return data;
             },
             error: function() {
                 showErrTip('网络断开连接啦~');
+
+                imgCheck.atWorking && imgCheck.refresh();
             },
             complete: function() {
                 $loginBtn.text('登录').removeClass('disable');
--- a/public/js/passport/register/password.js
View file @33765cb
+++ b/public/js/passport/register/password.js
View file @33765cb
@@ -35,7 +35,7 @@ $pwd.bind('input', function() {
     });
     $btnSure.toggleClass('disable', !bool);
-})
+});
 qs = window.queryString;
@@ -137,4 +137,4 @@ $('.agreement-detail').on('click', function() {
 // 如果有值, 立刻校验
 if ($pwd.val()) {
     $pwd.triggerHandler('input');
-}
+}
--- a/public/js/passport/register/register.js
View file @33765cb
+++ b/public/js/passport/register/register.js
View file @33765cb
@@ -24,17 +24,29 @@ api.selectCssHack($('#country-select'));
 api.bindClearEvt();
+
+// 图片验证码
+let ImgCheck = require('plugin/img-check');
+
+let imgCheck = new ImgCheck('#js-img-check', {
+    useREM: {
+        rootFontSize: 40,
+        picWidth: 150
+    }
+});
+
+imgCheck.init();
+
 /**
  * 必填校验
  */
 function checkEnableNext() {
     var phone = trim($phoneNum.val());
     var area = trim($countrySelect.val());
-    var captcha = trim($captcha.val());
     var ret = true;
-    $.each([phone, area, captcha], function(i, val) {
+    $.each([phone, area], function(i, val) {
         if (!val) {
             ret = false;
             return ret;
@@ -44,24 +56,13 @@ function checkEnableNext() {
     return ret;
 }
-
-/**
- *  刷新 校验码
- */
-function refreshCaptcha() {
-    $captcha.val('').focus();
-    $captchaPNG.attr('src', ['//m.yohobuy.com/passport/reg/captcha.png', '?t=', Date.now()].join(''));
-}
-
-
 /*
     Event bind
 */
 $('.reg-page')
-    .on('input', '.phone-num, #js-captcha', function() {
+    .on('input', '.phone-num', function() {
         $btnNext.toggleClass('disable', !checkEnableNext());
-    })
-    .on('click', '.passport-captcha-png', refreshCaptcha);
+    });
 $countrySelect.change(function() {
     $areaCode.text($countrySelect.val());
@@ -70,10 +71,10 @@ $countrySelect.change(function() {
 $btnNext.on('touchstart', function() {
     var pn = trim($phoneNum.val()),
         areaCode = $countrySelect.val(),
-        captcha = $captcha.val().trim();
+        captcha = imgCheck.getResults();
-    if (!captcha) {
-        tip.show('请输入验证码');
+    if (captcha === '0000') {
+        tip.show('请将图片旋转到正确位置');
         return false;
     }
@@ -102,7 +103,7 @@ $btnNext.on('touchstart', function() {
                 if (data.code === 200) {
                     location.href = data.data;
                 } else {
-                    refreshCaptcha();
+                    imgCheck.refresh();
                     showErrTip(data.message);
                     requested = false;
@@ -110,7 +111,7 @@ $btnNext.on('touchstart', function() {
             },
             error: function() {
                 showErrTip('出错了，请重试');
-                refreshCaptcha();
+                imgCheck.refresh();
                 requested = false;
             }
         });
--- a/public/js/passport/sms-login.page.js
View file @33765cb
+++ b/public/js/passport/sms-login.page.js
View file @33765cb
@@ -17,10 +17,26 @@ tip = require('plugin/tip');
 api = require('./api');
 checkPoint = require('./smslogin/check-point');
+
+// 图片验证码
+let ImgCheck = require('plugin/img-check');
+
+let imgCheck = new ImgCheck('#js-img-check', {
+    useREM: {
+        rootFontSize: 40,
+        picWidth: 150
+    }
+});
+
+imgCheck.init();
+
+
+
 page = {
     init: function() {
         this.domInit();
         this.bindEvent();
+        this.toggleNextBtn();
     },
     domInit: function() {
         $countrySelect = $('#country-select');
@@ -28,8 +44,6 @@ page = {
         $nextBtn = $('#btn-next');
         $phoneNum = $('#phone-num');
         $resetBtn = $('.clear-input');
-        $captcha = $('.passport-captcha input');
-        $captchaPNG = $('.passport-captcha-img img');
     },
     bindEvent: function() {
         var self = this;
@@ -41,12 +55,6 @@ page = {
             self.toggleNextBtn();
         });
-        $captcha.on('input', function() {
-            self.toggleNextBtn();
-        });
-
-        $captchaPNG.on('click', $.proxy(this.refreshCapatch, this));
-
         $nextBtn.on('click', function() {
             self.goNext();
         });
@@ -62,7 +70,7 @@ page = {
     // 切换$nextBtn disable状态
     toggleNextBtn: function() {
-        var bool = Boolean($.trim($phoneNum.val())) && Boolean($.trim($captcha.val()));
+        var bool = Boolean($.trim($phoneNum.val()));
         $nextBtn
             .toggleClass('disable', !bool)
@@ -71,17 +79,11 @@ page = {
         $resetBtn.toggle(bool);
     },
-    refreshCapatch: function() {
-        $captchaPNG.attr('src', '/passport/sms_login/captcha.png?t=' + Date.now());
-        $captcha.val('');
-    },
-
     // 提交按钮
     goNext: function() {
-        var self = this;
         var areaCode = $countrySelect.val();
         var phone = $.trim($phoneNum.val());
-        var captcha = $.trim($captcha.val());
+        var captcha = $.trim(imgCheck.getResults());
         if ($nextBtn.prop('disabled')) {
             return;
@@ -92,11 +94,16 @@ page = {
             return;
         }
+        if (captcha === '0000') {
+            tip.show('请将图片旋转到正确位置');
+            return;
+        }
+
         $nextBtn.prop('disabled', true);
-        $.get('/passport/sms_login/token.json', {
+        $.post('/passport/sms_login/step1_check', {
             area: areaCode.replace('+', ''),
             mobile: phone,
-            captcha: captcha
+            captcode: captcha
         })
             .done(function(data) {
                 if (data.code === 200) {
@@ -104,11 +111,12 @@ page = {
                     $nextBtn.off();
                     location.href = data.redirect;
                 } else {
-                    self.refreshCapatch();
+                    imgCheck.refresh();
                     tip.show(data.message);
                 }
             })
             .fail(function() {
+                imgCheck.refresh();
                 tip.show('出错了, 请重试');
             })
             .always(function() {
--- a/public/js/passport/smslogin/check-point.js
View file @33765cb
+++ b/public/js/passport/smslogin/check-point.js
View file @33765cb
@@ -12,10 +12,12 @@ var sendInfo = function(eventName) {
     channel = channelMap[channel] || 1;
     param = JSON.stringify({C_ID: channel});
-    yas && yas.sendCustomInfo({
-        op: eventName,
-        param: param
-    }, true);
+    if (yas && yas.sendCustomInfo) {
+        yas.sendCustomInfo({
+            op: eventName,
+            param: param
+        }, true);
+    }
 };
 module.exports = sendInfo;