diff --git a/app/admin/controller/decoration/MenuDecorate.php b/app/admin/controller/decoration/MenuDecorate.php index 63cf4f36..8f8ef102 100644 --- a/app/admin/controller/decoration/MenuDecorate.php +++ b/app/admin/controller/decoration/MenuDecorate.php @@ -259,7 +259,6 @@ class MenuDecorate extends AdminBase{ $post = $this->request->post(); $post['del'] = 0; $post['decorate_type'] = $post['type']; - (new MenuDecorateValidate())->goCheck('Add',$post); $result = MenuDecorateLogic::add_tools($post); if($result){ return JsonServer::success('添加成功'); @@ -279,7 +278,6 @@ class MenuDecorate extends AdminBase{ if($this->request->isAjax()){ $post = $this->request->post(); $post['del'] = 0; - (new MenuDecorateValidate())->goCheck('edit', $post); $result = MenuDecorateLogic::edit_tools($post); if($result){ return JsonServer::success('修改成功'); @@ -298,7 +296,6 @@ class MenuDecorate extends AdminBase{ // 切换工具状态 public function swtichToolsStatus(){ - (new MenuDecorateValidate())->goCheck('swtich'); $post = $this->request->post(); MenuDecorateLogic::swtichToolsStatus($post); return JsonServer::success('操作成功'); @@ -307,7 +304,6 @@ class MenuDecorate extends AdminBase{ // 删除工具 public function delTools(){ $id = $this->request->post('id'); - (new MenuDecorateValidate())->goCheck('del'); MenuDecorateLogic::delTools($id); return JsonServer::success('删除成功'); } diff --git a/app/admin/logic/decoration/MenuDecorateLogic.php b/app/admin/logic/decoration/MenuDecorateLogic.php index e24ab371..1dde203d 100644 --- a/app/admin/logic/decoration/MenuDecorateLogic.php +++ b/app/admin/logic/decoration/MenuDecorateLogic.php @@ -376,7 +376,6 @@ class MenuDecorateLogic extends Logic { 'is_show' => $post['is_show'], 'create_time' => time(), ]; - return Db::name('menu_tools')->where(['id'=>$post['id']])->update($data); } diff --git a/app/admin/view/decoration/menu_decorate/lists.html b/app/admin/view/decoration/menu_decorate/lists.html index 607861ea..adbb099d 100644 --- a/app/admin/view/decoration/menu_decorate/lists.html +++ b/app/admin/view/decoration/menu_decorate/lists.html @@ -387,7 +387,7 @@ if(res.code == 1) { layui.layer.msg(res.msg); layer.close(index); - table.reload('like-table-lists'); + table.reload('like-tools-lists'); } } }); @@ -421,7 +421,7 @@ if(res.code == 1) { layui.layer.msg(res.msg); layer.close(index); - table.reload('like-table-lists'); + table.reload('like-tools-lists'); } } }); diff --git a/app/api/controller/Menu.php b/app/api/controller/Menu.php index dc5a9d42..a2e811ef 100644 --- a/app/api/controller/Menu.php +++ b/app/api/controller/Menu.php @@ -30,4 +30,11 @@ class Menu extends Api $list = array_values($list); return JsonServer::success('获取成功', $list); } + + public function tools() + { + $list = MenuLogic::getMenuTools(); + return JsonServer::success('获取成功', $list); + + } } \ No newline at end of file diff --git a/app/api/logic/MenuLogic.php b/app/api/logic/MenuLogic.php index 912302e4..ba095716 100644 --- a/app/api/logic/MenuLogic.php +++ b/app/api/logic/MenuLogic.php @@ -8,6 +8,7 @@ use app\common\model\MenuDecorate; use app\common\server\ConfigServer; use app\common\server\UrlServer; use app\common\enum\MenuEnum; +use think\facade\Db; class MenuLogic extends Logic { @@ -63,4 +64,19 @@ class MenuLogic extends Logic } return $menu_list; } + + public static function getMenuTools() + { + $result = Db::name('menu_tools') + ->where(['del' => 0, 'is_show' => 1]) + ->field('name, image, url') + ->order('sort desc') + ->select(); + + foreach ($result as &$v) { + $v['image'] = UrlServer::getFileUrl($v['image']); + } + + return $result; + } } \ No newline at end of file