From 36508c0c3cdbfd473cbd44b92cf55279388d6192 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Mon, 25 Dec 2017 11:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=B3=A8=E9=94=80=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xxl-job-admin/src/main/webapp/static/js/common.1.js | 8 ++++++--
 xxl-job-admin/src/main/webapp/static/js/login.1.js  | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/static/js/common.1.js b/xxl-job-admin/src/main/webapp/static/js/common.1.js
index 515325f5..b11af37a 100644
--- a/xxl-job-admin/src/main/webapp/static/js/common.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/common.1.js
@@ -7,14 +7,18 @@ $(function(){
 
 			$.post(base_url + "/logout", function(data, status) {
 				if (data.code == "200") {
-					layer.open({
+                    layer.msg('注销成功');
+                    setTimeout(function(){
+                        window.location.href = base_url + "/";
+                    }, 500);
+					/*layer.open({
 						title: '系统提示',
 						content: '注销成功',
 						icon: '1',
 						end: function(layero, index){
 							window.location.href = base_url + "/";
 						}
-					});
+					});*/
 				} else {
 					layer.open({
 						title: '系统提示',
diff --git a/xxl-job-admin/src/main/webapp/static/js/login.1.js b/xxl-job-admin/src/main/webapp/static/js/login.1.js
index 67bd6cac..6300cdbc 100644
--- a/xxl-job-admin/src/main/webapp/static/js/login.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/login.1.js
@@ -48,14 +48,18 @@ $(function(){
         submitHandler : function(form) {
 			$.post(base_url + "/login", $("#loginForm").serialize(), function(data, status) {
 				if (data.code == "200") {
-                    layer.open({
+                    layer.msg('登录成功');
+                    setTimeout(function(){
+                        window.location.href = base_url;
+                    }, 500);
+                    /*layer.open({
                         title: '系统提示',
                         content: '登录成功',
                         icon: '1',
                         end: function(layero, index){
                             window.location.href = base_url;
                         }
-                    });
+                    });*/
 				} else {
                     layer.open({
                         title: '系统提示',