Authored by yyq

Merge branch 'feature/emaildel' into release/6.3

... ... @@ -326,11 +326,12 @@ module.exports = class extends global.yoho.BaseModel {
red: 'true',
url: helpers.urlFormat('/home/account/userpwd'),
isValid: true
}, {
icon: 'warning',
type: '邮箱验证',
tip: '验证后,可用于找回登录密码。',
url: helpers.urlFormat('/home/account/email')
// }, {
// icon: 'warning',
// type: '邮箱验证',
// tip: '验证后,可用于找回登录密码。',
// url: helpers.urlFormat('/home/account/email')
}, {
icon: 'warning',
type: '手机验证',
... ... @@ -343,13 +344,13 @@ module.exports = class extends global.yoho.BaseModel {
if (verifyResult.data) {
let verifyData = verifyResult.data;
resq[1].icon = verifyData.emailVerify === 'N' ? 'warning' : 'ok';
resq[1].tip = verifyData.emailVerify === 'N' ? '验证后,可用于找回登录密码。' :
'您验证的邮箱:' + verifyData.email.slice(0, 2) + '****' + verifyData.email.slice(6);
resq[1].isValid = verifyData.emailVerify === 'N' ? false : true;
resq[2].icon = verifyData.mobileVerify === 'N' ? 'warning' : 'ok';
resq[2].isValid = verifyData.mobileVerify === 'N' ? false : true;
resq[2].tip = verifyData.mobileVerify === 'N' ? '验证后,可用于找回登录密码。' :
// resq[1].icon = verifyData.emailVerify === 'N' ? 'warning' : 'ok';
// resq[1].tip = verifyData.emailVerify === 'N' ? '验证后,可用于找回登录密码。' :
// '您验证的邮箱:' + verifyData.email.slice(0, 2) + '****' + verifyData.email.slice(6);
// resq[1].isValid = verifyData.emailVerify === 'N' ? false : true;
resq[1].icon = verifyData.mobileVerify === 'N' ? 'warning' : 'ok';
resq[1].isValid = verifyData.mobileVerify === 'N' ? false : true;
resq[1].tip = verifyData.mobileVerify === 'N' ? '验证后,可用于找回登录密码。' :
'您验证的手机:' + verifyData.mobile.slice(0, 3) + '****' + verifyData.mobile.slice(7);
}
... ...
... ... @@ -223,7 +223,7 @@ router.get('/account', tabsMiddleware.getCommonHeader, AccountController.index);
router.get('/account/userpwd', tabsMiddleware.getCommonHeader, captcha.required, AccountController.userPwd);
router.get('/account/email', tabsMiddleware.getCommonHeader, captcha.required, AccountController.userEmail);
// router.get('/account/email', tabsMiddleware.getCommonHeader, captcha.required, AccountController.userEmail);
router.get('/account/mobile', tabsMiddleware.getCommonHeader, captcha.required, AccountController.userMobile);
... ... @@ -235,13 +235,13 @@ router.post('/account/modifypwd', tabsMiddleware.getCommonHeader, AccountControl
router.post('/account/sendemail', AccountController.sendEmail);
router.post('/account/checkemail', tabsMiddleware.getCommonHeader, AccountController.checkEmail);
// router.post('/account/checkemail', tabsMiddleware.getCommonHeader, AccountController.checkEmail);
router.post('/account/modifyemail', tabsMiddleware.getCommonHeader, AccountController.modifyEmail);
// router.post('/account/modifyemail', tabsMiddleware.getCommonHeader, AccountController.modifyEmail);
router.get('/account/sendemailsuccess', tabsMiddleware.getCommonHeader, AccountController.sendEmailSuccess);
router.get('/account/mailresult', tabsMiddleware.getCommonHeader, AccountController.mailResult);
// router.get('/account/mailresult', tabsMiddleware.getCommonHeader, AccountController.mailResult);
router.post('/account/checkmobile', AccountController.checkMobile);
... ...