diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index d3e7c0f8eeb334bd0744c687011b5c3ada50f5d4..9f0d3491a3e45c897a621f3e5ed533edbbb78116 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -77,7 +77,12 @@ class Handler extends ExceptionHandler } // Exception类的错误监听 - if($exception instanceof \Exception){ + if($exception instanceof Exception){ + return $this->setJsonReturn($exception); + } + + // ErrorException类的监听 + if($exception instanceof \ErrorException){ return $this->setJsonReturn($exception); } } diff --git a/app/Models/SoftDelete/SoftDelete.php b/app/Models/SoftDelete/SoftDelete.php index ec54f0cbb2a31f7ee55529c83c952e465fcee93c..8f38e535270977d3ff8985057c998f38f70a33ec 100644 --- a/app/Models/SoftDelete/SoftDelete.php +++ b/app/Models/SoftDelete/SoftDelete.php @@ -4,8 +4,6 @@ declare(strict_types = 1); namespace App\Models\SoftDelete; -use http\Env\Request; - trait SoftDelete { public function getIsDelete() diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue index 5d868b8f01da5da9b688e06cf66cd85cc5bf1cc6..de38cac40e74322854698026abdd0c0d1b48e774 100644 --- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue +++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue @@ -25,6 +25,9 @@ + + + diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue index 014c730d4969f6d1be6c02d12f7f42ce3203fec4..20292dd23892b8a66a8ff14cc5b9fbce3ac80de4 100644 --- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue +++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue @@ -25,6 +25,12 @@ label="菜单名称" > + +