更新前端文件

2019-07-03 16:36:05 +08:00
parent 073a4de647
commit 777b452685
151 changed files with 158954 additions and 64 deletions
--- a/app/middleware/Admin.php
+++ b/app/middleware/Admin.php
@@ -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);
 	}
 }