From 7fcae26d37d40996f617a279876f3226a6b21127 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Mon, 6 Aug 2018 23:00:57 +0800
Subject: [PATCH] 修复在二级目录下加载404的BUG
---
application/admin/library/Auth.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php
index eca1ff1..4494f23 100644
--- a/application/admin/library/Auth.php
+++ b/application/admin/library/Auth.php
@@ -347,9 +347,7 @@ class Auth extends \fast\Auth
$module = request()->module();
// 生成菜单的badge
foreach ($params as $k => $v) {
-
$url = $k;
-
if (is_array($v)) {
$nums = isset($v[0]) ? $v[0] : 0;
$color = isset($v[1]) ? $v[1] : $colorArr[(is_numeric($nums) ? $nums : strlen($nums)) % $colorNums];
@@ -389,6 +387,8 @@ class Auth extends \fast\Auth
if ($selected == $referer) {
$referer = [];
}
+ $selected && $selected['url'] = url($selected['url']);
+ $referer && $referer['url'] = url($referer['url']);
$select_id = $selected ? $selected['id'] : 0;
$menu = $nav = '';
@@ -426,7 +426,6 @@ class Auth extends \fast\Auth
}
}
-
return [$menu, $nav, $selected, $referer];
}
--
libgit2 0.24.0