小更新

app/model/Menu.php

@@ -9,28 +9,27 @@
 
 namespace app\model;
 
+use think\facade\Cache;
 use think\Model;
 use think\Request;
-use think\facade\Cache;
 
 /**
  * @title: ²Ëµ¥Ä£ÐÍ
  */
 class Menu extends Model {
 
-
 	/**
 	 * @title ÏÔʾ²Ëµ¥
 	 */
-	public function getMenu(Request $request) {
-		$list = [];
+	public function getAuthMenuList(Request $request) {
+		$list               = [];
 		$current_controller = '/' . str_replace('.', '/', strtolower($request->controller()));
-		$current_url        = $current_controller . '/' . strtolower($request->action());
+		$current_url        = $request->url;
 		$menu               = Cache::get('menu');
 		if (!$menu) {
-			$res  = (new \app\model\Menu())->where('is_menu', 1)->order('sort asc, id asc')->select();
+			$res = self::where('is_menu', 1)->order('sort asc, id asc')->select()->toArray();
 			foreach ($res as $key => $item) {
-				$menu[$item['id']] = $item->toArray();
+				$menu[$item['id']] = $item;
 			}
 			Cache::set('menu', $menu);
 		}
@@ -43,10 +42,4 @@ class Menu extends Model {
 		$menuList = list_to_tree($list);
 		return $menuList;
 	}
-	
-	public function getAuthMenuList(){
-		$list = $this->select();
-		$data = list_to_tree($list->toArray(), 'id', 'pid');
-		return $data;
-	}
 }