wugg 2 years ago
parent
commit
5fbb5d7d00
3 changed files with 11 additions and 4 deletions
  1. 1 1
      app/admin/controller/Action.php
  2. 2 2
      app/admin/controller/Menu.php
  3. 8 1
      public/index.php

+ 1 - 1
app/admin/controller/Action.php

@@ -11,7 +11,7 @@ class Action extends BaseController{
     //获取素有菜单列表数据
  public function index(){
 
-        $data = Db::name("admin_menu")->where(["status"=>1])->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type");
+        $data = Db::name("admin_menu")->where(["status"=>1])->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,status");
         $result = [];
         if(empty($data)){
             return app_show(0,"获取成功",$result);

+ 2 - 2
app/admin/controller/Menu.php

@@ -29,7 +29,7 @@ class Menu extends BaseController{
         $MenuAction[$value['menuid']][]=$value;
         }
         $menuid= array_column($action,"menuid");
-        $menuAll =Db::name("admin_menu")->where(["id"=>$menuid,"status"=>1])->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type");
+        $menuAll =Db::name("admin_menu")->where(["id"=>$menuid,"status"=>1])->column("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,status");
         $list=[];
         foreach ($menuAll as $value){
            $value['action'][]=$MenuAction[$value['id']];
@@ -47,7 +47,7 @@ class Menu extends BaseController{
     * @throws \think\exception\DbException
     */
      public function   MenuAllList(){
-       $data = Db::name("admin_menu")->field("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type")->order("weight desc,id asc")->select();
+       $data = Db::name("admin_menu")->field("id,menu_name,menu_img,menu_route,menu_url,pid,is_show,is_private,menu_type,status")->order("weight desc,id asc")->select();
         $l= MenuTree($data,0);
         return app_show(0,"获取成功",$l);
     }

+ 8 - 1
public/index.php

@@ -13,7 +13,14 @@
 namespace think;
 
 require __DIR__ . '/../vendor/autoload.php';
-
+header('Access-Control-Allow-Origin:*');
+header('Access-Control-Allow-Methods:POST,GET,OPTIONS,DELETE');
+header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization");
+// 执行HTTP应用并响应
+if($_SERVER['REQUEST_METHOD']=="OPTIONS"){
+    echo '';
+    exit();
+}
 // 执行HTTP应用并响应
 $http = (new App())->http;