diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php index be2b60a3..4bf42c01 100644 --- a/application/admin/library/Auth.php +++ b/application/admin/library/Auth.php @@ -80,6 +80,7 @@ class Auth extends \fast\Auth $this->logined = false; //重置登录状态 Session::delete("admin"); Cookie::delete("keeplogin"); + setcookie('fastadmin_userinfo', '', $_SERVER['REQUEST_TIME'] - 3600, rtrim(url("/" . request()->module(), '', false), '/')); return true; } diff --git a/application/admin/view/addon/index.html b/application/admin/view/addon/index.html index 1222332f..f886bd59 100644 --- a/application/admin/view/addon/index.html +++ b/application/admin/view/addon/index.html @@ -62,6 +62,10 @@ padding: 0; } + .operate .dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { + bottom: inherit; + } +
diff --git a/public/assets/js/backend/addon.js b/public/assets/js/backend/addon.js index 68a3ca83..959aa488 100644 --- a/public/assets/js/backend/addon.js +++ b/public/assets/js/backend/addon.js @@ -1,4 +1,6 @@ -define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function ($, undefined, Backend, Table, Form, Template) { +define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template', 'cookie'], function ($, undefined, Backend, Table, Form, Template, undefined) { + $.cookie.prototype.defaults = {path: Config.moduleurl}; + var Controller = { index: function () { // 初始化表格参数配置 diff --git a/public/assets/js/backend/index.js b/public/assets/js/backend/index.js index dfe61944..f7c4de1f 100755 --- a/public/assets/js/backend/index.js +++ b/public/assets/js/backend/index.js @@ -204,7 +204,7 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi } //这一行需要放在点击左侧链接事件之前 - var addtabs = Config.referer ? localStorage.getItem("addtabs") : null; + var addtabs = Config.referer ? sessionStorage.getItem("addtabs") : null; console.log($("[data-config='simplenav']").prop("checked")) //绑定tabs事件,如果需要点击强制刷新iframe,则请将iframeForceRefresh置为true,iframeForceRefreshTable只强制刷新表格