reset-ok

@@ -70,6 +70,8 @@ passport.use(new LocalStrategy({
             done(null, result.data);
         } else if (result.code && result.code === 4189) {
             done({code: 4189}, null);
+        } else if (result.code && result.code === 510) {
+            done({code: 510, data: result.data}, null);
         } else {
             done('账号或密码不正确', null);
         }

@@ -192,6 +192,14 @@ const local = {
                     };
 
                     return res.json(obj);
+                } else if (err.code === 510) {
+                    req.session.passwordWeak = err.data;
+                    return res.json({
+                        code: 510,
+                        url: '/passport/password/resetpage',
+                        pwdTip: _.get(err, 'data.pwdTip', '密码应为6-20位字母、数字的组合'),
+                        uid: _.get(err, 'data.uid', '')
+                    });
                 } else {
                     let obj = {
                         code: 400,

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date: 2017-04-13 10:21:07
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-14 13:49:39
+ * @Last Modified time: 2017-04-14 16:49:51
  */
 
 /* ********************
@@ -14,12 +14,16 @@
 const reset = require('../models/reset');
 
 const passwordResetPage = (req, res) => {
+    let passwordWeakObj = req.session.passwordWeak;
+
+    console.log(passwordWeakObj);
     res.render('reset/password', {
         width750: true,
         module: 'passport',
         page: 'reset',
         pageStyle: 'passport-body',
-        title: '重置密码'
+        title: '重置密码',
+        canSkip: passwordWeakObj.canSkip === 'Y'
     });
 };
 
@@ -30,21 +34,22 @@ const passwordResetPage = (req, res) => {
  * @param {*} next
  */
 const passwordReset = (req, res, next) => {
-    let uid = req.user.uid;
-    let token = req.body.token;
+    let passwordWeakObj = req.session.passwordWeak;
 
-    if (!uid || !token) {
+    if (!passwordWeakObj.uid || !passwordWeakObj.token) {
         return res.json({
             code: 400,
-            massage: '非法请求！'
+            massage: '非法请求'
         });
     }
 
+    req.session.passwordWeak = null;
+
     reset.resetPassword({
-        uid: req.user.uid,
+        uid: passwordWeakObj.uid,
         oldPwd: req.body.oldPwd,
         newPwd: req.body.newPwd,
-        token: token
+        token: passwordWeakObj.token
     }).then(result => {
         res.json(result);
     }).catch(next);

@@ -2,9 +2,11 @@
     <div class="title">
         <span>重置登录密码</span>
     </div>
+    {{#if canSkip}}
     <div class="ignore" id="ignoreBtn">
         <span>跳过</span>
     </div>
+    {{/if}}
     <div class="tip">
         <span>您的账号密码过于简单请您重置登录密码</span>
     </div>

@@ -100,6 +100,11 @@ function loginAuth(params, acc) {
                 localStorage.loginJumpUrl = $('#account').val();
                 localStorage.loginJump = 'true';
                 location.href = data.url;
+            } else if (data.code === 510) {
+                showErrTip(data.pwdTip || '密码应为6-20位字母、数字的组合');
+                setTimeout(function() {
+                    location.href = data.url;
+                }, 500);
             } else {
                 $captcha.data('userverify', data.captchaShow);
                 if (data.captchaShow) {

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date: 2017-04-13 14:43:19
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-13 15:01:34
+ * @Last Modified time: 2017-04-14 16:57:16
  */
 
 /* ***************
@@ -46,7 +46,7 @@ $sureResetBtn.on('click', function() {
     }
 
     if (!validatePWD($newPasswordInput.val())) {
-        tip.show('密码6-20位，请重新输入');
+        tip.show('密码应为6-20位字母、数字的组合');
         return false;
     }
 
@@ -54,8 +54,8 @@ $sureResetBtn.on('click', function() {
         type: 'post',
         url: '/passport/password/reset',
         data: {
-            oldPassword: $oldPasswordInput.val(),
-            newPassword: $newPasswordInput.val()
+            oldPwd: $oldPasswordInput.val(),
+            newPwd: $newPasswordInput.val()
         },
         dataType: 'json',
         success: function(result) {