mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'karson/master'

pull/71/head
pppscn 2018-08-07 09:55:14 +08:00
parent 0b16246ab0 95c08fb8bd
commit 2b87fa4735
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/admin/library/Auth.php
View File

@ -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];
@ -384,11 +382,13 @@ class Auth extends \fast\Auth
$v['pinyin'] = $pinyin->permalink($v['title'], '');
$v['title'] = __($v['title']);
$selected = $v['name'] == $fixedPage ? $v : $selected;
$referer = $v['url'] == $refererUrl ? $v : $referer;
$referer = url($v['url']) == $refererUrl ? $v : $referer;
}
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];
}