merge-master

郭成尧
Commit fb2eb7f0494e11388e5b91930556a42382d285d1 2 parents 6cab3f40 d992d8f9
Showing 6 changed files with 76 additions and 26 deletions
apps/guang/models/detail.js
apps/passport/controllers/bind.js
apps/passport/models/bind-service.js
apps/passport/router.js
public/js/passport/bind/_email-bind-mobile.js
public/js/passport/bind/_third-bind-mobile.js
--- a/apps/guang/models/detail.js
View file @fb2eb7f
+++ b/apps/guang/models/detail.js
View file @fb2eb7f
@@ -238,7 +238,7 @@ class DetailModel extends global.yoho.BaseModel {
         // 获取资讯
         return this._getArticle(id).then(data => {
             // 调用接口失败
-            if (!data || data.code !== 200) {
+            if (!data || data.code !== 200 || _.get(data, 'data.status') !== 1) {
                 result.code = 400;
                 return result;
             }
--- a/apps/passport/controllers/bind.js
View file @fb2eb7f
+++ b/apps/passport/controllers/bind.js
View file @fb2eb7f
@@ -346,7 +346,11 @@ const bind = {
     // 第三方绑定手机号发送短信
     thirdSendMsgApi: (req, res, next) => {
-        req.ctx(BindServiceModel).sendThirdBindMobileCodeOnly(req.body).then(result => {
+        let params = {
+            superCapture: req.body.geetest_challenge ? config.superCapture : ''
+        };
+
+        req.ctx(BindServiceModel).sendThirdBindMobileCodeOnly(Object.assign({}, req.body, params)).then(result => {
             if (_.get(result, 'code', 400) === 200) {
                 return next();
             }
@@ -378,7 +382,11 @@ const bind = {
     // 通过邮箱绑定手机号发送短信
     sendMsgApi: (req, res, next) => {
-        req.ctx(BindServiceModel).sendChangeBindMobileCodeOnly(req.body).then(result => {
+        let params = {
+            superCapture: req.body.geetest_challenge ? config.superCapture : ''
+        };
+
+        req.ctx(BindServiceModel).sendChangeBindMobileCodeOnly(Object.assign({}, req.body, params)).then(result => {
             if (_.get(result, 'code', 400) === 200) {
                 return next();
             }
@@ -388,7 +396,11 @@ const bind = {
     // 检查手机是否绑定
     changeMobileCheckApi: (req, res, next) => {
-        req.ctx(BindServiceModel).changeMobileCheck(req.body).then(result => {
+        let params = {
+            superCapture: req.body.geetest_challenge ? config.superCapture : ''
+        };
+
+        req.ctx(BindServiceModel).changeMobileCheck(Object.assign({}, req.body, params)).then(result => {
             if (_.get(result, 'data.isBind', '') === 'N' &&
                 _.get(result, 'data.isRegister', '') === 'N') {
                 return next();
@@ -433,10 +445,12 @@ const bind = {
     // 调用绑定接口
     forceBindMobileApi: (req, res, next) => {
-        req.ctx(BindServiceModel).bindEmailLoginMobile(Object.assign(req.body, {
+        let params = {
             email: req.session.bindEmail,
             password: req.session.bindPassword,
-        })).then(result => {
+        };
+
+        req.ctx(BindServiceModel).bindEmailLoginMobile(Object.assign({}, req.body, params)).then(result => {
             if (_.get(result, 'code', 400) !== 200) {
                 return res.json(result);
             }
--- a/apps/passport/models/bind-service.js
View file @fb2eb7f
+++ b/apps/passport/models/bind-service.js
View file @fb2eb7f
@@ -104,10 +104,12 @@ class BindServiceModel extends global.yoho.BaseModel {
     // 强制绑定手机↓↓↓↓  -> 邮件登录绑定手机号发送短信
     sendChangeBindMobileCodeOnly(params) {
         return this.get({data: {
-            method: 'app.bind.sendChangeBindMobileCodeOnly',
-            business_line: 'yohobuy',
+            method: 'app.bind.sendChangeBindMobileCodeOnlyImg',
             mobile: params.mobile || '',
-            area: params.area || '86'
+            area: params.area || '86',
+            degrees: params.captcha || '',
+            superCapture: params.superCapture || '',
+            fromPage: PAGE
         }});
     }
@@ -116,7 +118,6 @@ class BindServiceModel extends global.yoho.BaseModel {
         return this.get({
             data: Object.assign({
                 method: 'app.bind.changeMobileCheck',
-                business_line: 'yohobuy',
             }, params)
         });
     }
@@ -125,7 +126,6 @@ class BindServiceModel extends global.yoho.BaseModel {
     bindEmailLoginMobile(params) {
         return this.get({data: {
             method: 'app.bind.bindEmailLoginMobile',
-            business_line: 'yohobuy',
             mobile: params.mobile || '',
             area: params.area || '86',
             code: params.code,
@@ -137,10 +137,12 @@ class BindServiceModel extends global.yoho.BaseModel {
     // 第三方绑定手机号发送短信
     sendThirdBindMobileCodeOnly(params) {
         return this.get({data: {
-            method: 'app.bind.sendThirdBindMobileCodeOnly',
-            business_line: 'yohobuy',
+            method: 'app.bind.sendThirdBindMobileCodeOnlyImg',
             mobile: params.mobile || '',
-            area: params.area || '86'
+            area: params.area || '86',
+            superCapture: params.superCapture || '',
+            degrees: params.captcha || '',
+            fromPage: PAGE
         }});
     }
@@ -148,7 +150,6 @@ class BindServiceModel extends global.yoho.BaseModel {
     thirdBindMobile(params) {
         return this.get({data: {
             method: 'app.bind.bindMobile',
-            business_line: 'yohobuy',
             mobile: params.mobile || '',
             area: params.area || '86',
             code: params.code,
--- a/apps/passport/router.js
View file @fb2eb7f
+++ b/apps/passport/router.js
View file @fb2eb7f
@@ -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 @fb2eb7f
+++ b/public/js/passport/bind/_email-bind-mobile.js
View file @fb2eb7f
@@ -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,17 +146,21 @@ class EmailBindMobile extends Page {
         this.selector.verifyCodeBtn.data('oneClick', true);
+        validate.getResults().then(result => {
             let params = {
                 area: area.replace('+', ''),
                 mobile: pn
             };
+            $.extend(params, result);
+
             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();
@@ -152,9 +168,15 @@ class EmailBindMobile extends Page {
                 } else {
                     showErrTip(codeResult.message);
                 }
+
+                (codeResult.changeCaptcha && validate.type !== 2) && validate.refresh();
             }).catch(() => {
                 this.selector.verifyCodeBtn.data('oneClick', false);
                 showErrTip('出错了，请重试');
+                validate.refresh();
+            });
+        }).catch(() => {
+            this.selector.verifyCodeBtn.data('oneClick', false);
         });
     }
@@ -173,8 +195,6 @@ class EmailBindMobile extends Page {
             return showErrTip('手机号格式不正确，请重新输入');
         }
-        this.selector.loginBtn.data('oneClick', true);
-
         let params = {
             area: area.replace('+', ''),
             mobile: pn,
@@ -186,8 +206,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 +215,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 @fb2eb7f
+++ b/public/js/passport/bind/_third-bind-mobile.js
View file @fb2eb7f
@@ -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();
     }
@@ -137,17 +149,21 @@ class ThirdBindMobile extends Page {
         this.selector.verifyCodeBtn.data('oneClick', true);
+        validate.getResults().then(result => {
             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);
+                validate.type === 2 && validate.refresh();
                 if (codeResult.code === 200) {
                     this.countDown();
@@ -155,9 +171,15 @@ class ThirdBindMobile extends Page {
                 } else {
                     showErrTip(codeResult.message);
                 }
+
+                (codeResult.changeCaptcha && validate.type !== 2) && validate.refresh();
             }).catch(() => {
                 this.selector.verifyCodeBtn.data('oneClick', false);
                 showErrTip('出错了，请重试');
+                validate.refresh();
+            });
+        }).catch(() => {
+            this.selector.verifyCodeBtn.data('oneClick', false);
         });
     }
@@ -176,8 +198,6 @@ class ThirdBindMobile extends Page {
             return showErrTip('手机号格式不正确，请重新输入');
         }
-        this.selector.loginBtn.data('oneClick', true);
-
         let params = {
             area: area.replace('+', ''),
             mobile: pn,
@@ -191,8 +211,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 +220,6 @@ class ThirdBindMobile extends Page {
                 showErrTip(codeResult.message);
             }
         }).catch(() => {
-            this.selector.loginBtn.data('oneClick', false);
             showErrTip('出错了，请重试');
         });
     }