wufeng 2 жил өмнө
parent
commit
7af0240f95

+ 40 - 38
app/admin/controller/Menu.php

@@ -108,14 +108,14 @@ class Menu extends Base
      */
     public function MenuEdit(){
         $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
+//        $token = isset($post['token']) ? trim($post['token']) : "";
+//        if($token==""){
+//            return error_show(101,'token不能为空');
+//        }
+//        $effetc = VerifyTokens($token);
+//        if(!empty($effetc) && $effetc['code']!=0){
+//            return error_show($effetc['code'],$effetc['message']);
+//        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         if($id!=""){
             $menu = Db::name("admin_menu")->where("id","=",$id)->find();
@@ -139,6 +139,8 @@ class Menu extends Base
         if($pid!=0 && $route==""){
             return error_show(1002,"子级菜单路由不能为空");
         }
+        $level = isset($post['level'])?intval($post['level']):'';
+        if($level=='') return json_show(0,'菜单等级不能为空');
         $data=[
             "menu_name"=>$name,
             "menu_url"=>$url,
@@ -150,7 +152,7 @@ class Menu extends Base
             'is_display'=>$is_display,
             "is_private"=>$private,
             'status'=>1,
-            'level'=>$this->level,
+            'level'=>$level,
             "weight"=>$weight,
             "updatetime"=>date("Y-m-d H:i:s"),
         ];
@@ -161,7 +163,7 @@ class Menu extends Base
         }
         $result = Db::name("admin_menu")->save($data);
         $orde = ["order_code"=>$code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-        ActionLog::logAdd($token,$orde,"admin_menu",0,$orde);
+        ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname],$orde,"admin_menu",0,$orde);
         return $result ? app_show(0,"{$message}成功"): error_show(1003,"{$message}失败");
     }
 
@@ -173,14 +175,14 @@ class Menu extends Base
      */
     public function MenuStatus(){
         $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
+//        $token = isset($post['token']) ? trim($post['token']) : "";
+//        if($token==""){
+//            return error_show(101,'token不能为空');
+//        }
+//        $effetc = VerifyTokens($token);
+//        if(!empty($effetc) && $effetc['code']!=0){
+//            return error_show($effetc['code'],$effetc['message']);
+//        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         $menu = Db::name("admin_menu")->where("id","=",$id)->find();
         if($menu==false){
@@ -195,7 +197,7 @@ class Menu extends Base
         $menu['updatetime']=date("Y-m-d H:i:s");
         $result = Db::name("admin_menu")->save($menu);
         $orde = ["order_code"=>$menu['menu_name'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
-        ActionLog::logAdd($token,$orde,"admin_menu", $menu['status'],$orde);
+        ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname],$orde,"admin_menu", $menu['status'],$orde);
         return $result ? app_show(0,"状态更新成功"): error_show(1003,"状态更新失败");
     }
 
@@ -207,7 +209,7 @@ class Menu extends Base
      * @throws \think\exception\DbException
      */
     public function   MenuAllList(){
-        $post  =$this->request->post();
+//        $post  =$this->request->post();
 
         $data = Db::name("admin_menu")
             ->where(['pid'=>0,'is_del'=>0])
@@ -238,14 +240,14 @@ class Menu extends Base
 
     public function MenuDel(){
         $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
+//        $token = isset($post['token']) ? trim($post['token']) : "";
+//        if($token==""){
+//            return error_show(101,'token不能为空');
+//        }
+//        $effetc = VerifyTokens($token);
+//        if(!empty($effetc) && $effetc['code']!=0){
+//            return error_show($effetc['code'],$effetc['message']);
+//        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         $menu =  Db::name("admin_menu")->where("id","=",$id)->find();
         if($menu==false){
@@ -258,7 +260,7 @@ class Menu extends Base
         $menu['updatetime']=date("Y-m-d H:i:s");
         $result =  Db::name("admin_menu")->save($menu);
         $orde = ["order_code"=>$menu['menu_name'],"status"=>$var,"action_remark"=>'',"action_type"=>"delete"];
-        ActionLog::logAdd($token,$orde,"admin_menu", $menu['status'],$orde);
+        ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname],$orde,"admin_menu", $menu['status'],$orde);
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }
 
@@ -270,14 +272,14 @@ class Menu extends Base
      */
     public function MenuActionDel(){
         $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
+//        $token = isset($post['token']) ? trim($post['token']) : "";
+//        if($token==""){
+//            return error_show(101,'token不能为空');
+//        }
+//        $effetc = VerifyTokens($token);
+//        if(!empty($effetc) && $effetc['code']!=0){
+//            return error_show($effetc['code'],$effetc['message']);
+//        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         $menu =  Db::name("action")->where("id","=",$id)->find();
         if($menu==false){
@@ -286,7 +288,7 @@ class Menu extends Base
 
         $result =  Db::name("action")->delete($menu);
         $orde = ["order_code"=>$menu['id'],"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
-        ActionLog::logAdd($token,$orde,"action",0,$orde);
+        ActionLog::logAdd(['id'=>$this->uid,'nickname'=>$this->uname],$orde,"action",0,$orde);
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }
 }