ad

app/bug/controller/Action.php

@@ -100,31 +100,31 @@ class Action extends Base
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-//    public function index(){
-//        $post  =$this->request->post();
-//        $data = Db::name("admin_menu")->where(["pid"=>0,"status"=>1,"is_del"=>0])->select();
-//        $result = [];
-//        if(empty($data)){
-//            return app_show(0,"获取成功",$result);
-//        }
-//        foreach ($data as $key=>$val){
-//            $val["child"]=[];
-//            $result[$val['id']] =$val;
-//        }
-//
-//        $child =Db::name("admin_menu")->where([["pid","<>",0],['status',"=",1],["is_del","=",0]])->select();
-//        foreach ($child as $k=>$value){
-//            // $act = PasAction::all(['menuid'=>$value['id'],"status"=>1]);
-//            $act =Db::name("action")->alias("a")->leftJoin("action_list l","a.action_code=l.action_code")->field
-//            ("a.*,action_name")->where(['a.menuid'=>$value['id'],"a.status"=>1])->select();
-//            $act_data = Db::name("action_field")->where(['menuid'=>$value['id'],"status"=>1])->select();
-//            $value['action'] = $act;
-//            $value['action_data'] = $act_data;
-//            if(array_key_exists($value['pid'],$result)){
-//                $result[$value['pid']]["child"][]=$value;
-//            }
-//        }
-//
-//        return app_show(0,"获取成功",array_values($result));
-//    }
+    public function index(){
+        $post  =$this->request->post();
+        $data = Db::name("admin_menu")->where(["pid"=>0,"status"=>1,"is_del"=>0])->select();
+        $result = [];
+        if(empty($data)){
+            return app_show(0,"获取成功",$result);
+        }
+        foreach ($data as $key=>$val){
+            $val["child"]=[];
+            $result[$val['id']] =$val;
+        }
+
+        $child =Db::name("admin_menu")->where([["pid","<>",0],['status',"=",1],["is_del","=",0]])->select();
+        foreach ($child as $k=>$value){
+            // $act = PasAction::all(['menuid'=>$value['id'],"status"=>1]);
+            $act =Db::name("action")->alias("a")->leftJoin("action_list l","a.action_code=l.action_code")->field
+            ("a.*,action_name")->where(['a.menuid'=>$value['id'],"a.status"=>1])->select();
+            $act_data = Db::name("action_field")->where(['menuid'=>$value['id'],"status"=>1])->select();
+            $value['action'] = $act;
+            $value['action_data'] = $act_data;
+            if(array_key_exists($value['pid'],$result)){
+                $result[$value['pid']]["child"][]=$value;
+            }
+        }
+
+        return success("获取成功",array_values($result));
+    }
 }

app/bug/model/AdminMenu.php

@@ -30,9 +30,14 @@ class AdminMenu extends Base
         $Menu = $this->where(['pid'=>$pid,'is_del'=>0])
         ->field(['id','menu_name','menu_img','menu_route','menu_url','pid','is_private','is_display','weight','status'])
         ->order('weight desc,id asc')->select();
-        if($Menu->isEmpty())return[];
+        if($Menu->isEmpty()){
+        	return[];
+        }
         foreach ($Menu as &$item){
         	$item['child']=$this->GetMenuTree($item->id);
+        	if($pid>0){
+        		$item['action']= Action::with(["actionInfo"])->where(["menuid"=>$item->id])->select();
+        	}
         }
         return $Menu;
     }

app/common.php

@@ -64,4 +64,10 @@ if(!function_exists("makeToken")){
 		$token = call_user_func($type,$strs.$salt);
 		return $token;
 	}
+};
+
+if(!function_exists('__')){
+	function __($msg){
+		return $msg;
+	}
 };