molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新前端文件

Browse Source
This commit is contained in:
龙渊
2019-07-03 16:36:05 +08:00
parent 073a4de647
commit 777b452685
151 changed files with 158954 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/middleware/Admin.php
+4 -2
View File
@@ -26,6 +26,7 @@ class Admin {
}
if ($request->isAjax()) {
unset($this->data['config']);
return json($this->data);
} else {
return $response->data($this->fetch());
@@ -46,7 +47,8 @@ class Admin {
'__public__' => '/static/admin',
),
);
return View::config($config)->assign($this->data)->fetch($template);
$data = isset($this->data['data']) ? $this->data['data'] : [];
$data['config'] = isset($this->data['config']) ? $this->data['config'] : $data;
return View::config($config)->assign($data)->fetch($template);
}
}
app/middleware/AdminAuth.php
+2 -2
View File
@@ -39,7 +39,7 @@ class AdminAuth {
* @title 显示菜单
*/
protected function getMenu($request) {
$current_controller = str_replace('.', '/', strtolower($request->controller()));
$current_controller = '/' . str_replace('.', '/', strtolower($request->controller()));
$current_url = $current_controller . '/' . strtolower($request->action());
$menu = Cache::get('menu');
if (!$menu) {
@@ -50,7 +50,7 @@ class AdminAuth {
}
$current_pid = 0;
foreach ($menu as $key => $value) {
if (strpos($value['url'], $current_controller) !== false) {
if (strpos($value['url'], $current_controller.'/') !== false) {
if ($value['pid'] == 0) {
$current_pid = $value['id'];
} else {