From d659dae643de1a6dc0e081194594ce7ab33bba10 Mon Sep 17 00:00:00 2001 From: todking Date: Thu, 11 Apr 2019 12:15:25 +0800 Subject: [PATCH] =?UTF-8?q?2019/4/11=20=E8=A7=A3=E5=86=B3=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98=201.=E6=96=B0=E5=BB=BA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E5=91=98=E5=BC=B9=E6=A1=86=E4=BB=85?= =?UTF-8?q?=E5=85=81=E8=AE=B8cancel=E5=85=B3=E9=97=AD=202.=E5=95=86?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E4=BC=9A=E5=A4=9A=E6=AC=A1=E9=87=8D=E5=8F=A0=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E9=BB=91=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/boot/indexMainApp.js | 45 ++++++++++--------- src/main/ui/static/config/managers/manager.js | 1 + 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js index e51254417..3d36c1f4a 100644 --- a/src/main/ui/static/boot/indexMainApp.js +++ b/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; } diff --git a/src/main/ui/static/config/managers/manager.js b/src/main/ui/static/config/managers/manager.js index d4cbf90d2..882412321 100644 --- a/src/main/ui/static/config/managers/manager.js +++ b/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 () {