From bc6bcb84f974fae4053aefcd5ea21b57f0f6dc68 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 15 Jun 2023 21:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=92=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	public/assets/js/backend/addon.js
---
 application/admin/library/Auth.php      | 1 +
 application/admin/view/addon/index.html | 4 ++++
 public/assets/js/backend/addon.js       | 2 ++
 public/assets/js/backend/index.js       | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

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 f8297577..1c7f7262 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;
+    }
+
 </style>
 <div class="panel panel-default panel-intro">
     <div class="panel-heading">
diff --git a/public/assets/js/backend/addon.js b/public/assets/js/backend/addon.js
index 5b27cd85..c3d56735 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', '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 dd682baf..e99f2038 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;
 
             //绑定tabs事件,如果需要点击强制刷新iframe,则请将iframeForceRefresh置为true,iframeForceRefreshTable只强制刷新表格
             nav.addtabs({iframeHeight: "100%", iframeForceRefresh: false, iframeForceRefreshTable: true, nav: nav});