From 24b8ccfcefd8dd03cadd5d55c43aadf33b1b1231 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Fri, 21 Jan 2022 15:29:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AdministratorController.php | 1 + app/Admin/Controllers/MessageController.php | 2 +- .../Controllers/OrderPackageController.php | 4 +- app/Admin/Controllers/RoleController.php | 1 + app/Admin/routes.php | 6 +- database/seeders/AdminPermissionSeeder.php | 194 ++++++++++-------- 6 files changed, 118 insertions(+), 90 deletions(-) diff --git a/app/Admin/Controllers/AdministratorController.php b/app/Admin/Controllers/AdministratorController.php index 00fab35e..fe80250c 100644 --- a/app/Admin/Controllers/AdministratorController.php +++ b/app/Admin/Controllers/AdministratorController.php @@ -14,6 +14,7 @@ class AdministratorController extends UserController //新增 if (Admin::user()->can('dcat.admin.administrator.create')) { $grid->disableCreateButton(false); + $grid->disableDeleteButton(false); $grid->enableDialogCreate(); } // $grid-> diff --git a/app/Admin/Controllers/MessageController.php b/app/Admin/Controllers/MessageController.php index 00580c71..43f0c416 100644 --- a/app/Admin/Controllers/MessageController.php +++ b/app/Admin/Controllers/MessageController.php @@ -50,7 +50,7 @@ class MessageController extends AdminController $grid->filter(function (Grid\Filter $filter) { // $filter->equal('id'); $filter->panel(); - $filter->like('title'); + $filter->like('title')->width(3); }); }); } diff --git a/app/Admin/Controllers/OrderPackageController.php b/app/Admin/Controllers/OrderPackageController.php index 147e2063..c0c231f1 100644 --- a/app/Admin/Controllers/OrderPackageController.php +++ b/app/Admin/Controllers/OrderPackageController.php @@ -32,7 +32,9 @@ class OrderPackageController extends AdminController $builder = OrderPackage::with(['order', 'tags']); return Grid::make($builder, function (Grid $grid) { $grid->tools(function (Grid\Tools $tools) { - $tools->append(new Import()); + if (Admin::user()->can('dcat.admin.order_packages.import')) { + $tools->append(new Import()); + } }); $grid->column('id')->sortable(); $grid->column('order.sn')->if(function () { diff --git a/app/Admin/Controllers/RoleController.php b/app/Admin/Controllers/RoleController.php index ab9b85be..ea78181b 100644 --- a/app/Admin/Controllers/RoleController.php +++ b/app/Admin/Controllers/RoleController.php @@ -14,6 +14,7 @@ class RoleController extends BaseController //新增 if (Admin::user()->can('dcat.admin.roles.create')) { $grid->disableCreateButton(false); + $grid->disableDeleteButton(false); $grid->enableDialogCreate(); } // $grid-> diff --git a/app/Admin/routes.php b/app/Admin/routes.php index d2e2ae7e..8f707b4a 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -82,9 +82,9 @@ Route::group([ $router->get('after-sales', 'AfterSaleController@index')->name('after_sales.index'); $router->get('after-sales/{after_sale}', 'AfterSaleController@show')->name('after_sales.show'); - $router->get('verify-after-sales', 'AfterSaleController@index')->name('after_sales.verify'); - $router->get('shipping-after-sales', 'AfterSaleController@index')->name('after_sales.shipping'); - $router->get('finance-after-sales', 'AfterSaleController@index')->name('after_sales.finance'); + $router->get('verify-after-sales', 'AfterSaleController@index')->name('after_sales.verifies'); + $router->get('shipping-after-sales', 'AfterSaleController@index')->name('after_sales.shippings'); + $router->get('finance-after-sales', 'AfterSaleController@index')->name('after_sales.finances'); $router->resource('users', 'UserController'); diff --git a/database/seeders/AdminPermissionSeeder.php b/database/seeders/AdminPermissionSeeder.php index 5c36d587..2c6dcdae 100644 --- a/database/seeders/AdminPermissionSeeder.php +++ b/database/seeders/AdminPermissionSeeder.php @@ -59,15 +59,26 @@ class AdminPermissionSeeder extends Seeder 'api.product_skus'=>['name'=>'子商品列表'], 'api.coupons'=>['name'=>'优惠券'], 'api.coupone_send_tasks'=>['name'=>'优惠券发送任务'], + 'api.orders'=>['name'=>'订单'], + 'api.order_products'=>['name'=>'订单商品'], + 'api.users'=>['name'=>'用户'], ], ], - 'ad_addresses'=>[ - 'name'=>'广告位', - 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], - ], - 'ads'=>[ - 'name'=>'广告内容', - 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], + 'users'=>[ + 'name'=>'会员管理', + 'curd'=>['index', 'show', 'create', 'store'], + 'children'=>[ + 'disable' =>['name'=>'禁用'], + 'enable'=>['name' =>'启用'], + 'frozen'=>['name' =>'冻结资产'], + 'edit_agent'=>['name' =>'修改等级'], + 'reset_password'=>['name' =>'修改密码'], + 'reset_account_password'=>['name' =>'修改安全密码'], + 'edit_phone'=>['name' =>'修改手机号'], + 'edit_bank'=>['name'=>'修改银行卡'], + 'enable_bonus'=>['name' =>'开启奖金分红'], + 'disable_bonus'=>['name' =>'关闭奖金分红'], + ], ], 'article_categories' =>[ 'name'=>'文章分类', @@ -77,22 +88,41 @@ class AdminPermissionSeeder extends Seeder 'name'=>'文章', 'curd' => true, ], + 'ad_addresses'=>[ + 'name'=>'广告位', + 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], + ], + 'ads'=>[ + 'name'=>'广告内容', + 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], + ], + 'coupons'=>[ + 'name' =>'优惠券管理', + 'curd' => true, + 'children'=>[ + 'range_list' =>['name' =>'使用范围'], + ], + ], + 'coupon_ranges'=>[ + 'name' =>'优惠使用范围管理', + 'curd' => ['create', 'store', 'edit', 'update', 'destroy'], + ], + 'shipping_templates'=>[ + 'name' =>'运费模板管理', + 'curd' => true, + 'children'=>[ + 'rule_list' =>['name' =>'运费规则'], + ], + ], + 'shipping_rules'=>[ + 'name' =>'运费规则管理', + 'curd' => ['create', 'store', 'edit', 'update', 'destroy'], + ], + 'product_categories'=>[ 'name' =>'商品分类', 'curd'=>['index', 'create', 'store', 'edit', 'update', 'destroy'], ], - 'product_groups'=>[ - 'name' =>'商品分组', - 'curd'=>['index', 'create', 'store', 'edit', 'update', 'destroy'], - ], - 'product_features'=>[ - 'name' =>'商品特点', - 'curd' =>['index', 'create', 'store', 'edit', 'update', 'destroy'], - ], - 'product_buynotes'=>[ - 'name' =>'商品购买须知', - 'curd'=>['index', 'create', 'store', 'edit', 'update', 'destroy'], - ], 'product_spus'=>[ 'name' =>'主商品', 'curd'=> true, @@ -126,40 +156,25 @@ class AdminPermissionSeeder extends Seeder 'batch_verify'=>['name' =>'批量审核'], ], ], - 'vips'=>[ - 'name' =>'会员等级', + 'product_groups'=>[ + 'name' =>'属性分组', 'curd'=>['index', 'create', 'store', 'edit', 'update', 'destroy'], ], - 'users'=>[ - 'name'=>'会员管理', - 'curd'=>['index', 'create', 'store'], + 'product_features'=>[ + 'name' =>'商品特点', + 'curd' =>['index', 'create', 'store', 'edit', 'update', 'destroy'], + ], + 'product_buynotes'=>[ + 'name' =>'购买须知', + 'curd'=>['index', 'create', 'store', 'edit', 'update', 'destroy'], + ], + 'product_parts'=>[ + 'name' =>'商品分区', + 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], 'children'=>[ - 'disable' =>['name'=>'禁用'], - 'enable'=>['name' =>'启用'], + 'coupons'=>['name'=>'赠券'], ], ], - 'coupons'=>[ - 'name' =>'优惠券管理', - 'curd' => true, - 'children'=>[ - 'range_list' =>['name' =>'使用范围'], - ], - ], - 'coupon_ranges'=>[ - 'name' =>'优惠使用范围管理', - 'curd' => ['create', 'store', 'edit', 'update', 'destroy'], - ], - 'shipping_templates'=>[ - 'name' =>'运费模板管理', - 'curd' => true, - 'children'=>[ - 'rule_list' =>['name' =>'运费规则'], - ], - ], - 'shipping_rules'=>[ - 'name' =>'运费规则管理', - 'curd' => ['create', 'store', 'edit', 'update', 'destroy'], - ], 'coupon_send_tasks'=>[ 'name' =>'优惠券发放', 'curd' => true, @@ -171,35 +186,29 @@ class AdminPermissionSeeder extends Seeder 'name' =>'优惠券发放日志', 'curd' => ['index'], ], - 'after_sales'=>[ - 'name' =>'售后管理', - 'curd' => ['index', 'show'], - 'children' => [ - 'verify'=>['name' =>'审核'], - 'shipping'=>['name' =>'确认收货'], - 'finance'=>['name' =>'确认打款'], - 'tags'=>['name' =>'标签设置'], - ], - ], 'messages'=>[ 'name' =>'公告消息', 'curd' => true, ], - 'product_parts'=>[ - 'name' =>'商品分区', + 'share_bgs'=>[ + 'name'=>'分享背景', + 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], + ], + 'app_versions'=>[ + 'name' =>'App版本管理', 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], ], 'orders'=>[ 'name' =>'订单管理', 'curd' => ['index', 'show'], 'children'=>[ + 'export_shipping_orders'=>['name' =>'导出发货单'], + 'tags'=>['name' =>'标签设置'], 'pay'=>['name' =>'支付订单'], 'reduce'=>['name' =>'订单改价'], 'remark'=>['name' =>'订单备注'], 'consignee'=>['name' =>'修改地址'], 'create_package'=>['name' =>'发货'], - 'tags'=>['name' =>'标签设置'], - 'export_shipping_orders'=>['name' =>'导出发货单'], 'pendding_orders'=>['name' =>'待发货单'], 'finished_orders'=>['name' =>'已完成单'], ], @@ -208,21 +217,35 @@ class AdminPermissionSeeder extends Seeder 'name' =>'订单调价权限管理', 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], ], + 'order_refunds'=>[ + 'name' => '退款记录', + 'curd' => ['index'], + ], 'order_packages'=>[ 'name' =>'发货单', 'curd' =>['index', 'edit', 'update', 'destroy'], 'children' => [ + 'import'=>['name' =>'导入发货单'], 'failed' => ['name' =>'作废'], 'tags'=>['name' =>'标签设置'], ], ], - 'app_versions'=>[ - 'name' =>'App版本管理', - 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], + 'import_job_logs'=>[ + 'name' =>'导入记录', + 'curd'=>['index'], ], - 'share_bgs'=>[ - 'name'=>'分享背景', - 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], + 'after_sales'=>[ + 'name' =>'售后管理', + 'curd' => ['index', 'show'], + 'children' => [ + 'verifies'=>['name' =>'售后处理'], + 'verify'=>['name' =>'客服审核'], + 'shippings'=>['name' =>'售后验收'], + 'shipping'=>['name' =>'确认收货'], + 'finances'=>['name' =>'售后打款'], + 'finance'=>['name' =>'确认打款'], + 'tags'=>['name' =>'标签设置'], + ], ], 'tags'=>[ 'name' =>'标签管理', @@ -230,14 +253,7 @@ class AdminPermissionSeeder extends Seeder ], 'settings'=>[ 'name' =>'配置管理', - 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], - ], - 'wallet_to_bank_logs' => [ - 'name' => '提现审核', 'curd' => ['index'], - 'children' => [ - 'verify'=>['name' =>'审核'], - ], ], 'distribution_pre_incomes'=>[ 'name' =>'预收益', @@ -260,13 +276,20 @@ class AdminPermissionSeeder extends Seeder ], ], 'points_logs'=>[ - 'name' =>'预收益', + 'name' =>'积分账户', 'curd' => ['index'], ], 'quota_logs'=>[ 'name' =>'新配额账户', 'curd' => ['index'], ], + 'wallet_to_bank_logs' => [ + 'name' => '提现审核', + 'curd' => ['index'], + 'children' => [ + 'verify'=>['name' =>'审核'], + ], + ], 'quota_v1_send_jobs'=>[ 'name' => '老配额分红', 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], @@ -274,14 +297,6 @@ class AdminPermissionSeeder extends Seeder 'log_list'=>['name' =>'分红记录'], ], ], - 'order_refunds'=>[ - 'name' => '售后记录', - 'curd' => ['index'], - ], - 'import_job_logs'=>[ - 'name' =>'导入记录', - 'curd'=>['index'], - ], 'dealers' =>[ 'name' =>'经销商管理', 'curd'=>['index', 'show', 'update'], @@ -312,10 +327,15 @@ class AdminPermissionSeeder extends Seeder 'name' =>'资金管理', 'curd' => ['index', 'show'], 'children' => [ + 'channel'=>['name' =>'渠道补贴'], + 'purchase'=>['name' =>'进货补贴'], + 'manage' =>['name' =>'管理补贴'], + 'manager'=>['name' =>'管理者补贴'], 'pay'=>['name' =>'确认打款'], ], ], ]; + DB::table('admin_permissions')->truncate(); try { DB::begintransaction(); $this->createPermissionData($permissions); @@ -369,8 +389,12 @@ class AdminPermissionSeeder extends Seeder //判断是否默认插入curd权限 if (isset($permission['curd']) && $permission['curd']) { if (is_array($permission['curd'])) { + rsort($permission['curd']); foreach ($permission['curd'] as $value) { - $permission['children'][$value] = $curdArr[$value]; + // $permission['children'][$value] = $curdArr[$value]; + $permission['children'] = array_merge([ + $value=>$curdArr[$value], + ], $permission['children']); } } else { $permission['children'] = array_merge($curdArr, $permission['children']);