Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -705,10 +705,10 @@ define(['app/app'], function (app) {
             var heightLevelReg = /^(?=.{8,20})(((?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]))|((?=.*[0-9])((?=.*[a-zA-Z]))(?=.*[^a-zA-Z0-9]))).*$/;
             if(heightLevelReg.test(newPassword)){
               $scope.secLevel = 3;
-              return false;
+              return true;
             }else if(middlLevelReg.test(newPassword)){
               $scope.secLevel = 2;
-              return false;
+              return true;
             }else{
               $scope.secLevel = 1;
               return false;
@@ -729,25 +729,26 @@ define(['app/app'], function (app) {
             $scope.checkFailed2 = true;
           }
 
-          //修改密码
+          // 修改密码
           $scope.ok = function () {
-            //原密码校验
+            // 原密码校验
             if(!$scope.checkSuccess){
               $scope.checkPassword($scope.user.password);
             }
-            //新密码校验
+            // 新密码校验
             $scope.checkNewPassword($scope.user.newPassword);
-            //再次输入密码校验
+            // 再次输入密码校验
             $scope.checkNewPassword1();
             if(!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2){
                 return;
             }
-            if ($scope.user.newPassword == $scope.user.password) {
-              toaster.pop('error', '错误', '新密码与原密码相同');
+            // 密码强度校验
+            if(!$scope.checkPasswordLevel($scope.user.newPassword)){
+              toaster.pop('error', '错误', '密码强度不够，请重新输入');
               return;
             }
-            if ($scope.secLevel <= 1) {
-              toaster.pop('error', '错误', '密码强度不够，请重新输入');
+            if ($scope.user.newPassword == $scope.user.password) {
+              toaster.pop('error', '错误', '新密码与原密码相同');
               return;
             }
             if ($scope.user.newPassword == $scope.user.newPassword1) {//验证重复密码相等

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -626,10 +626,10 @@ define(['app/app'], function(app) {
             var heightLevelReg = /^(?=.{8,20})(((?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]))|((?=.*[0-9])((?=.*[a-zA-Z]))(?=.*[^a-zA-Z0-9]))).*$/;
             if(heightLevelReg.test(newPassword)){
               $scope.secLevel = 3;
-              return false;
+              return true;
             }else if(middlLevelReg.test(newPassword)){
               $scope.secLevel = 2;
-              return false;
+              return true;
             }else{
               $scope.secLevel = 1;
               return false;
@@ -650,25 +650,26 @@ define(['app/app'], function(app) {
             $scope.checkFailed2 = true;
           }
 
-          //修改密码
+          // 修改密码
           $scope.ok = function () {
-            //原密码校验
+            // 原密码校验
             if(!$scope.checkSuccess){
               $scope.checkPassword($scope.user.password);
             }
-            //新密码校验
+            // 新密码校验
             $scope.checkNewPassword($scope.user.newPassword);
-            //再次输入密码校验
+            // 再次输入密码校验
             $scope.checkNewPassword1();
             if(!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2){
               return;
             }
-            if ($scope.user.newPassword == $scope.user.password) {
-              toaster.pop('error', '错误', '新密码与原密码相同');
+            // 密码强度校验
+            if(!$scope.checkPasswordLevel($scope.user.newPassword)){
+              toaster.pop('error', '错误', '密码强度不够，请重新输入');
               return;
             }
-            if ($scope.secLevel <= 1) {
-              toaster.pop('error', '错误', '密码强度不够，请重新输入');
+            if ($scope.user.newPassword == $scope.user.password) {
+              toaster.pop('error', '错误', '新密码与原密码相同');
               return;
             }
             if ($scope.user.newPassword == $scope.user.newPassword1) {//验证重复密码相等