diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 8f707b4a..830d14de 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -157,7 +157,7 @@ Route::group([ $router->resource('order-refunds', 'OrderRefundLogController')->only([ 'index', - ])->names('order_refund'); + ])->names('order_refunds'); $router->get('import-job-logs', 'ImportJobLogController@index')->name('import_job_logs.index'); diff --git a/app/Models/Admin/Administrator.php b/app/Models/Admin/Administrator.php index b9f05894..6ded9dcc 100644 --- a/app/Models/Admin/Administrator.php +++ b/app/Models/Admin/Administrator.php @@ -16,6 +16,7 @@ class Administrator extends DcatAdministrator return true; } //判断是否有权限 + dd($slug, $this->getCachePermissions()); return in_array($slug, $this->getCachePermissions()); } diff --git a/database/seeders/AdminPermissionSeeder.php b/database/seeders/AdminPermissionSeeder.php index 2c6dcdae..073322ff 100644 --- a/database/seeders/AdminPermissionSeeder.php +++ b/database/seeders/AdminPermissionSeeder.php @@ -321,9 +321,10 @@ class AdminPermissionSeeder extends Seeder 'paid'=>['name' =>'确认收款'], 'shipping'=>['name' =>'确认发货'], 'allocate'=>['name' =>'自动分配'], + 'manager'=>['name' =>'系统订单'], ], ], - 'dealer-earnings'=>[ + 'dealer_earnings'=>[ 'name' =>'资金管理', 'curd' => ['index', 'show'], 'children' => [ @@ -335,15 +336,14 @@ class AdminPermissionSeeder extends Seeder ], ], ]; - DB::table('admin_permissions')->truncate(); - try { - DB::begintransaction(); - $this->createPermissionData($permissions); - DB::commit(); - } catch (\Exception $e) { - Log::error('权限录入:'.$e->getMessage()); - DB::rollBack(); - } + // try { + // DB::begintransaction(); + $this->createPermissionData($permissions); + // DB::commit(); + // } catch (\Exception $e) { + // Log::error('权限录入:'.$e->getMessage()); + // DB::rollBack(); + // } } /**