|
@@ -347,9 +347,7 @@ class Auth extends \fast\Auth
|
|
|
$module = request()->module();
|
|
|
|
|
|
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];
|
|
|
}
|
|
|
|