'绑定手机号成功界面'

@@ -372,16 +372,13 @@ const bind = {
 
 
     // 调用绑定接口
     // 调用绑定接口
     forceBindMobileApi: (req, res, next) => {
     forceBindMobileApi: (req, res, next) => {
-        if (req.session.bindEmail && req.session.bindPass) {
-            return res.json({code: 301, data: {}, message: 'success'});
+        if (!req.session.bindEmail || !req.session.bindPassword) {
+            return res.json({code: 401, data: {}, message: '请重新登录授权'});
         }
         }
 
 
-        req.body.email = '1181060696@qq.com';
-        req.body.password = 'hao123456';
-
         req.ctx(BindServiceModel).bindEmailLoginMobile(Object.assign(req.body, {
         req.ctx(BindServiceModel).bindEmailLoginMobile(Object.assign(req.body, {
             email: req.session.bindEmail,
             email: req.session.bindEmail,
-            password: req.session.bindPass,
+            password: req.session.bindPassword,
         })).then(result => {
         })).then(result => {
             if (_.get(result, 'code', 400) !== 200) {
             if (_.get(result, 'code', 400) !== 200) {
                 return res.json(result);
                 return res.json(result);
@@ -394,7 +391,7 @@ const bind = {
                 result.data.session_key
                 result.data.session_key
             ).then(() => {
             ).then(() => {
                 delete req.session.bindEmail;
                 delete req.session.bindEmail;
-                delete req.session.bindPass;
+                delete req.session.bindPassword;
                 return res.json({code: 200, data: {}, message: 'success'});
                 return res.json({code: 200, data: {}, message: 'success'});
             });
             });
         }).catch(next);
         }).catch(next);

@@ -83,9 +83,8 @@ router.get('/passport/password/resetsuccess', reset.passwordResetOkPage); // 重
 
 
 // 通过邮箱登录绑定手机号
 // 通过邮箱登录绑定手机号
 router.get('/passport/bind/forceBindMobile', validateCode.load, bind.forceBindMobilePage);
 router.get('/passport/bind/forceBindMobile', validateCode.load, bind.forceBindMobilePage);
-router.post('/passport/bind/forceSendMsg', bind.sendMsgApi, bind.forceSendMsg);
+router.post('/passport/bind/forceSendMsg', validateCode.check, bind.sendMsgApi, bind.forceSendMsg);
 router.post('/passport/bind/forceMobileCheck',
 router.post('/passport/bind/forceMobileCheck',
-    validateCode.check,
     bind.forceMobileCheckApi,
     bind.forceMobileCheckApi,
     bind.forceBindMobileApi
     bind.forceBindMobileApi
 );
 );

@@ -147,26 +147,34 @@ class EmailMobile extends Page {
 
 
         this.selector.verifyCodeBtn.data('oneClick', true);
         this.selector.verifyCodeBtn.data('oneClick', true);
 
 
+        validate.getResults().then(result => {
             let params = {
             let params = {
                 area: area.replace('+', ''),
                 area: area.replace('+', ''),
                 mobile: pn
                 mobile: pn
             };
             };
 
 
+            $.extend(params, result);
+
             this.ajax({
             this.ajax({
                 url: '/passport/bind/forceSendMsg',
                 url: '/passport/bind/forceSendMsg',
                 type: 'POST',
                 type: 'POST',
                 data: params
                 data: params
             }).then(codeResult => {
             }).then(codeResult => {
                 this.selector.verifyCodeBtn.data('oneClick', false);
                 this.selector.verifyCodeBtn.data('oneClick', false);
+                validate.type === 2 && validate.refresh();
                 if (codeResult.code === 200) {
                 if (codeResult.code === 200) {
                     this.countDown();
                     this.countDown();
                     return;
                     return;
                 } else {
                 } else {
                     showErrTip(codeResult.message);
                     showErrTip(codeResult.message);
                 }
                 }
+
+                (codeResult.changeCaptcha && validate.type !== 2) && validate.refresh();
             }).catch(() => {
             }).catch(() => {
                 this.selector.verifyCodeBtn.data('oneClick', false);
                 this.selector.verifyCodeBtn.data('oneClick', false);
                 showErrTip('出错了，请重试');
                 showErrTip('出错了，请重试');
+                validate.refresh();
+            });
         });
         });
     }
     }
 
 
@@ -187,23 +195,18 @@ class EmailMobile extends Page {
 
 
         this.selector.loginBtn.data('oneClick', true);
         this.selector.loginBtn.data('oneClick', true);
 
 
-        validate.getResults().then(result => {
         let params = {
         let params = {
             area: area.replace('+', ''),
             area: area.replace('+', ''),
             mobile: pn,
             mobile: pn,
             code: verifyCode,
             code: verifyCode,
         };
         };
 
 
-            $.extend(params, result);
-
         this.ajax({
         this.ajax({
             url: '/passport/bind/forceMobileCheck',
             url: '/passport/bind/forceMobileCheck',
             type: 'POST',
             type: 'POST',
             data: params
             data: params
         }).then(codeResult => {
         }).then(codeResult => {
-
             this.selector.loginBtn.data('oneClick', false);
             this.selector.loginBtn.data('oneClick', false);
-                validate.type === 2 && validate.refresh();
 
 
             if (codeResult.code === 200) {
             if (codeResult.code === 200) {
                 this.continueBind(
                 this.continueBind(
@@ -213,13 +216,9 @@ class EmailMobile extends Page {
             } else {
             } else {
                 showErrTip(codeResult.message);
                 showErrTip(codeResult.message);
             }
             }
-
-                (codeResult.changeCaptcha && validate.type !== 2) && validate.refresh();
         }).catch(() => {
         }).catch(() => {
             this.selector.loginBtn.data('oneClick', false);
             this.selector.loginBtn.data('oneClick', false);
             showErrTip('出错了，请重试');
             showErrTip('出错了，请重试');
-                validate.refresh();
-            });
         });
         });
     }
     }
 
 
@@ -238,7 +237,7 @@ class EmailMobile extends Page {
         }
         }
 
 
         dialog.showDialog({
         dialog.showDialog({
-            dialogText: bindDialogHbs({isBind: true}),
+            dialogText: bindDialogHbs(bindParams),
             fast: true,
             fast: true,
             hasFooter: {
             hasFooter: {
                 leftBtnText: '去登录',
                 leftBtnText: '去登录',