登录验证密码有效期

assets/js/controllers/loginCtrl.js

@@ -586,7 +586,13 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
                                         if (resp.data && resp.data.user && resp.data.user.id) {
                                             // console.log(resp.error);
                                             $rootScope.getpending();
-                                            $state.go('app.dashboard');
+                                            // 正常登录并且密码有效期已过
+                                            if(resp.overTime && !$scope.isSSo){
+                                                $rootScope.changepassword(true);
+                                                return;
+                                            }else{
+                                                $state.go('app.dashboard');
+                                            }
                                             $rootScope.app.isLoginFixed = false;
                                             // console.log(resp);
                                             // api_wechatfile.getDictionary({ "type": "list", "key": "hjzx_cornet" }).then(function(data) {
@@ -617,7 +623,7 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
                     // SweetAlert.swal("系统错误，请重试！", "登录错误", "error");
                     SweetAlert.swal("用户名或者密码验证失败，请重试！", "error");
                 });
-            // })        
+            // })
         };
         if ($scope.isSSo) {
             $scope.handleLoginClick();

assets/js/controllers/mainCtrl.js

@@ -48,8 +48,8 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
     $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
       console.log(event, toState, toParams, fromState, fromParams)
       // 修改密码验证
-      // if(toState.name != 'login.signin'){
-      //   $rootScope.changepassword();
+      // if((fromState.name != 'login.signin' || toState.name != 'login.signin') && localStorage.getItem('isSSo') === '0' && localStorage.getItem('isOverTime') === '1'){
+      //   $rootScope.changepassword(true);
       // }
       if ((toState.name == 'app.incident.chart' || toState.name == 'app.incident.editor') &&
         fromState.name) {
@@ -2214,8 +2214,9 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
       });
 
     }
-    $rootScope.changepassword = function () {
+    $rootScope.changepassword = function (isNoClose = false) {
       var modalInstance = $modal.open({
+        backdrop: !isNoClose,
         templateUrl: 'assets/views/changepassword.html',
         controller: function ($scope, $modalInstance, items, Restangular, SweetAlert) {
           $scope.passwordnull = function (originalPwd, pwd, pwd_2) {
@@ -2234,7 +2235,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
               });
               return;
             }
-            if (pwd == pwd_2 && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,20}$/.test(pwd))) {
+            if (pwd == pwd_2 && !(/^(?=.*[a-z])(?=.*[A-Z]).{8,20}$/.test(pwd))) {
               SweetAlert.swal({
                 title: "密码长度8-20位，必须包含大写和小写!",
                 text: "输入错误，请重新输入！",
@@ -2255,6 +2256,7 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
                   type: "success",
                   confirmButtonColor: "#007AFF"
                 });
+                isNoClose && $state.go('app.dashboard');
               } else {
                 SweetAlert.swal({
                   title: "修改失败!",