2019/4/11

解决页面问题
1.新建组织管理员弹框仅允许cancel关闭
2.商户端修改密码弹窗会多次重叠，导致页面黑屏

src/main/ui/static/boot/indexMainApp.js

@@ -18,28 +18,31 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
 
             var stompClient = null;
             var newPartnerGuide_counts = 0;
+            var pwdcount = 0;
             $scope.loadCurrentUser = function () {
                 $http.get('/global/userstatus/current_partner').then(function (resp) {
                     $rootScope.currentUser = resp.data;
-                   /* if ((resp.data.client.approve_result == 2 || resp.data.client.approve_result == 3) && resp.data.client.source == 4) {
-                        if (resp.data.wechat_openid == null) {
-                            $scope.newPartnerGuide(resp.data);
-                        } else {
-                            $http.get('/client/partner_info/orderscount').then(function (resp) {
-                                if (resp.data == 0 && newPartnerGuide_counts == 0) {
-                                    $scope.newPartnerGuide(resp.data);
-                                }
-                            });
-                        }
+                    /* if ((resp.data.client.approve_result == 2 || resp.data.client.approve_result == 3) && resp.data.client.source == 4) {
+                         if (resp.data.wechat_openid == null) {
+                             $scope.newPartnerGuide(resp.data);
+                         } else {
+                             $http.get('/client/partner_info/orderscount').then(function (resp) {
+                                 if (resp.data == 0 && newPartnerGuide_counts == 0) {
+                                     $scope.newPartnerGuide(resp.data);
+                                 }
+                             });
+                         }
+
+                     }*/
+                    if ($rootScope.currentUser.is_password_expired && pwdcount == 0) {
 
-                    }*/
-                    if ($rootScope.currentUser.is_password_expired) {
                         commonDialog.confirm({
                             title: 'Change Password!',
                             content: 'Your password has been expired,click OK to set a new password'
                         }).then(function () {
                             $scope.changePwd();
                         })
+                        pwdcount++;
                     }
                     connectWebSocket();
                     if ($scope.currentUser.role == 1 || $scope.currentUser.role == 2) {
@@ -119,9 +122,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                         ag: ag
                     },
                     size: 'lg',
-                    type:'info',
-                    backdrop:'static',
-                    keyboard:false
+                    type: 'info',
+                    backdrop: 'static',
+                    keyboard: false
                 }).result.then(function () {
                     // $scope.loadPartnerNotice();
                 })
@@ -129,7 +132,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
 
             $scope.getAgStatus = function () {
                 $http.get('/client/partner_info/checkContract').then(function (resp) {
-                    if (resp.data){
+                    if (resp.data) {
                         $scope.showAG(resp.data)
                     }
 
@@ -139,9 +142,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
             $scope.refundNotice = {counts: 0};
             $scope.openRefundNotice = false;
             $scope.showRefundNotice = function () {
-                    $http.get('/api/payment/v1.0/refund/json/auditions').then(function (resp) {
-                        $scope.refundNotice.counts = resp.data.counts;
-                    });
+                $http.get('/api/payment/v1.0/refund/json/auditions').then(function (resp) {
+                    $scope.refundNotice.counts = resp.data.counts;
+                });
             };
             $scope.showRefundNotice();
             $scope.toggleOpenRefundNotice = function () {
@@ -305,7 +308,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         }
     }]);
 
-    app.controller('agreementDetailCtrl', ['$scope', '$http', 'commonDialog','$sce', 'ag', function ($scope, $http,commonDialog, $sce, ag) {
+    app.controller('agreementDetailCtrl', ['$scope', '$http', 'commonDialog', '$sce', 'ag', function ($scope, $http, commonDialog, $sce, ag) {
         $scope.ag = angular.copy(ag);
         $scope.agreeCheck = false;
         $scope.agree = function () {
@@ -560,7 +563,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         return function (module) {
             var result = false;
             angular.forEach($rootScope.currentUser.available_module_ids, function (item) {
-                if((item+'') == (module+'')){
+                if ((item + '') == (module + '')) {
                     result = true;
                     return result;
                 }

src/main/ui/static/config/managers/manager.js

@@ -66,6 +66,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         };
         $scope.newManager = function () {
             $uibModal.open({
+                backdrop: 'static', keyboard: false,
                 templateUrl: '/static/config/managers/templates/new_manager.html',
                 controller: 'newManagerDialogCtrl'
             }).result.then(function () {