'绑定手机号加图形验证码'

郝肖肖
Commit b1b9e2fb7b5095b3f44102fcb2defbf2d61d94fd 1 parent a3d8b39a
Showing 3 changed files with 79 additions and 49 deletions
apps/passport/router.js
public/js/passport/bind/_email-bind-mobile.js
public/js/passport/bind/_third-bind-mobile.js
--- a/apps/passport/router.js
View file @b1b9e2f
+++ b/apps/passport/router.js
View file @b1b9e2f
@@ -84,6 +84,7 @@ router.get('/passport/password/resetsuccess', reset.passwordResetOkPage); // 重
 // 通过邮箱登录绑定手机号
 router.get('/passport/bind/forceBindMobile', validateCode.load, bind.forceBindMobilePage);
 router.post('/passport/bind/forceSendMsg',
+    validateCode.check,
     bind.isCheckEmailPassword,
     bind.sendMsgApi,
     bind.forceSendMsg
@@ -97,7 +98,7 @@ router.post('/passport/bind/continueMobile', bind.isCheckEmailPassword, bind.for
 // 第三方绑定手机号
 router.get('/passport/bind/index', validateCode.load, bind.thirdBindMobilePage);
-router.post('/passport/bind/thirdSendMsg', bind.thirdSendMsgApi, bind.forceSendMsg);
+router.post('/passport/bind/thirdSendMsg', validateCode.check, bind.thirdSendMsgApi, bind.forceSendMsg);
 router.post('/passport/bind/thirdMobileCheck',
     bind.changeMobileCheckApi,
     bind.thirdBindMobileApi
--- a/public/js/passport/bind/_email-bind-mobile.js
View file @b1b9e2f
+++ b/public/js/passport/bind/_email-bind-mobile.js
View file @b1b9e2f
@@ -4,7 +4,14 @@ import Page from 'yoho-page';
 import api from '../api';
 import dialog from 'plugin/dialog';
 import bindDialogHbs from 'passport/bind-dialog-tip.hbs';
+import Validate from 'plugin/validata';
+const validate = new Validate('#js-img-check', {
+    useREM: {
+        rootFontSize: 40,
+        picWidth: 150
+    }
+});
 const showErrTip = tip.show;
 class EmailBindMobile extends Page {
@@ -19,12 +26,17 @@ class EmailBindMobile extends Page {
             verifyCodeInput: $('.mobile-form-login input.verify-code-input'),
             verifyCodeBtn: $('.mobile-form-login .get-verify-code'),
             loginBtn: $('.mobile-form-login .sms-login-btn'),
+            $captcha: $('#js-img-check')
         };
         this.init();
     }
     init() {
+        if (this.selector.$captcha.data('userverify')) {
+            validate.init();
+        }
+
         this.bindEvents();
     }
@@ -134,27 +146,35 @@ class EmailBindMobile extends Page {
         this.selector.verifyCodeBtn.data('oneClick', true);
-        let params = {
-            area: area.replace('+', ''),
-            mobile: pn
-        };
+        validate.getResults().then(result => {
+            let params = {
+                area: area.replace('+', ''),
+                mobile: pn
+            };
-        this.ajax({
-            url: '/passport/bind/forceSendMsg',
-            type: 'POST',
-            data: params
-        }).then(codeResult => {
-            this.selector.verifyCodeBtn.data('oneClick', false);
+            $.extend(params, result);
-            if (codeResult.code === 200) {
-                this.countDown();
-                return;
-            } else {
-                showErrTip(codeResult.message);
-            }
-        }).catch(() => {
-            this.selector.verifyCodeBtn.data('oneClick', false);
-            showErrTip('出错了，请重试');
+            this.ajax({
+                url: '/passport/bind/forceSendMsg',
+                type: 'POST',
+                data: params
+            }).then(codeResult => {
+                this.selector.verifyCodeBtn.data('oneClick', false);
+                validate.type === 2 && validate.refresh();
+
+                if (codeResult.code === 200) {
+                    this.countDown();
+                    return;
+                } else {
+                    showErrTip(codeResult.message);
+                }
+
+                (codeResult.changeCaptcha && validate.type !== 2) && validate.refresh();
+            }).catch(() => {
+                this.selector.verifyCodeBtn.data('oneClick', false);
+                showErrTip('出错了，请重试');
+                validate.refresh();
+            });
         });
     }
@@ -173,8 +193,6 @@ class EmailBindMobile extends Page {
             return showErrTip('手机号格式不正确，请重新输入');
         }
-        this.selector.loginBtn.data('oneClick', true);
-
         let params = {
             area: area.replace('+', ''),
             mobile: pn,
@@ -186,8 +204,6 @@ class EmailBindMobile extends Page {
             type: 'POST',
             data: params
         }).then(codeResult => {
-            this.selector.loginBtn.data('oneClick', false);
-
             if (codeResult.code === 200) {
                 this.continueBind(
                     $.extend({isBind: 'N', isRegister: 'N'}, codeResult.data),
@@ -197,7 +213,6 @@ class EmailBindMobile extends Page {
                 showErrTip(codeResult.message);
             }
         }).catch(() => {
-            this.selector.loginBtn.data('oneClick', false);
             showErrTip('出错了，请重试');
         });
     }
--- a/public/js/passport/bind/_third-bind-mobile.js
View file @b1b9e2f
+++ b/public/js/passport/bind/_third-bind-mobile.js
View file @b1b9e2f
@@ -4,7 +4,14 @@ import Page from 'yoho-page';
 import api from '../api';
 import dialog from 'plugin/dialog';
 import bindDialogHbs from 'passport/bind-dialog-tip.hbs';
+import Validate from 'plugin/validata';
+const validate = new Validate('#js-img-check', {
+    useREM: {
+        rootFontSize: 40,
+        picWidth: 150
+    }
+});
 const showErrTip = tip.show;
 class ThirdBindMobile extends Page {
@@ -21,12 +28,17 @@ class ThirdBindMobile extends Page {
             verifyCodeInput: $('.mobile-form-login input.verify-code-input'),
             verifyCodeBtn: $('.mobile-form-login .get-verify-code'),
             loginBtn: $('.mobile-form-login .sms-login-btn'),
+            $captcha: $('#js-img-check')
         };
         this.init();
     }
     init() {
+        if (this.selector.$captcha.data('userverify')) {
+            validate.init();
+        }
+
         this.bindEvents();
     }
@@ -136,28 +148,35 @@ class ThirdBindMobile extends Page {
         }
         this.selector.verifyCodeBtn.data('oneClick', true);
+        validate.getResults().then(result => {
+            let params = {
+                area: area.replace('+', ''),
+                mobile: pn
+            };
-        let params = {
-            area: area.replace('+', ''),
-            mobile: pn
-        };
+            $.extend(params, result);
-        this.ajax({
-            url: '/passport/bind/thirdSendMsg',
-            type: 'POST',
-            data: params
-        }).then(codeResult => {
-            this.selector.verifyCodeBtn.data('oneClick', false);
+            this.ajax({
+                url: '/passport/bind/thirdSendMsg',
+                type: 'POST',
+                data: params
+            }).then(codeResult => {
+                this.selector.verifyCodeBtn.data('oneClick', false);
+                validate.type === 2 && validate.refresh();
-            if (codeResult.code === 200) {
-                this.countDown();
-                return;
-            } else {
-                showErrTip(codeResult.message);
-            }
-        }).catch(() => {
-            this.selector.verifyCodeBtn.data('oneClick', false);
-            showErrTip('出错了，请重试');
+                if (codeResult.code === 200) {
+                    this.countDown();
+                    return;
+                } else {
+                    showErrTip(codeResult.message);
+                }
+
+                (codeResult.changeCaptcha && validate.type !== 2) && validate.refresh();
+            }).catch(() => {
+                this.selector.verifyCodeBtn.data('oneClick', false);
+                showErrTip('出错了，请重试');
+                validate.refresh();
+            });
         });
     }
@@ -176,8 +195,6 @@ class ThirdBindMobile extends Page {
             return showErrTip('手机号格式不正确，请重新输入');
         }
-        this.selector.loginBtn.data('oneClick', true);
-
         let params = {
             area: area.replace('+', ''),
             mobile: pn,
@@ -191,8 +208,6 @@ class ThirdBindMobile extends Page {
             type: 'POST',
             data: params
         }).then(codeResult => {
-            this.selector.loginBtn.data('oneClick', false);
-
             if (codeResult.code === 200) {
                 this.continueBind(
                     $.extend({isBind: 'N', isRegister: 'N'}, codeResult.data),
@@ -202,7 +217,6 @@ class ThirdBindMobile extends Page {
                 showErrTip(codeResult.message);
             }
         }).catch(() => {
-            this.selector.loginBtn.data('oneClick', false);
             showErrTip('出错了，请重试');
         });
     }