mirror of https://gitee.com/karson/fastadmin.git
修复在二级目录下加载404的BUG
parent
c5d7fef22e
commit
7fcae26d37
|
|
@ -347,9 +347,7 @@ class Auth extends \fast\Auth
|
||||||
$module = request()->module();
|
$module = request()->module();
|
||||||
// 生成菜单的badge
|
// 生成菜单的badge
|
||||||
foreach ($params as $k => $v) {
|
foreach ($params as $k => $v) {
|
||||||
|
|
||||||
$url = $k;
|
$url = $k;
|
||||||
|
|
||||||
if (is_array($v)) {
|
if (is_array($v)) {
|
||||||
$nums = isset($v[0]) ? $v[0] : 0;
|
$nums = isset($v[0]) ? $v[0] : 0;
|
||||||
$color = isset($v[1]) ? $v[1] : $colorArr[(is_numeric($nums) ? $nums : strlen($nums)) % $colorNums];
|
$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) {
|
if ($selected == $referer) {
|
||||||
$referer = [];
|
$referer = [];
|
||||||
}
|
}
|
||||||
|
$selected && $selected['url'] = url($selected['url']);
|
||||||
|
$referer && $referer['url'] = url($referer['url']);
|
||||||
|
|
||||||
$select_id = $selected ? $selected['id'] : 0;
|
$select_id = $selected ? $selected['id'] : 0;
|
||||||
$menu = $nav = '';
|
$menu = $nav = '';
|
||||||
|
|
@ -426,7 +426,6 @@ class Auth extends \fast\Auth
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return [$menu, $nav, $selected, $referer];
|
return [$menu, $nav, $selected, $referer];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue