diff --git a/assets/templates/admin/admin_modify_password.html b/assets/templates/admin/admin_modify_password.html index 7125c63..d9c47a5 100644 --- a/assets/templates/admin/admin_modify_password.html +++ b/assets/templates/admin/admin_modify_password.html @@ -132,8 +132,11 @@ okay: { text: '关闭', action: function () { - parent.window.close(); - window.open("/login"); + if (window.frames.length !== parent.frames.length) { + parent.window.open("/login",'_self'); + }else{ + window.open("/login",'_self'); + } } } } diff --git a/assets/templates/index/index.html b/assets/templates/index/index.html index 1b22b4e..43b5347 100644 --- a/assets/templates/index/index.html +++ b/assets/templates/index/index.html @@ -281,8 +281,11 @@ $.cookie('_nav_title_', ''); $.cookie('_login_token_', ''); - parent.window.close(); - window.open("/login"); + if (window.frames.length !== parent.frames.length) { + parent.window.open("/login",'_self'); + }else{ + window.open("/login",'_self'); + } }, function (response) { AjaxError(response);