From 54faeb2ca7a682ef023f53eb4adb3c073b7474f6 Mon Sep 17 00:00:00 2001 From: liutk <961510893@qq.com> Date: Sun, 19 May 2024 22:34:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E5=8F=B0=E8=8E=B7?= =?UTF-8?q?=E5=A5=96=E5=88=97=E8=A1=A8=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/ActivityController.php | 8 +- .../Controllers/ActivityGiftController.php | 2 +- app/Admin/Controllers/UserGiftController.php | 77 +++++++++++++++++++ app/Admin/routes.php | 2 + app/Models/Filters/UserGiftFilter.php | 11 +++ app/Models/UserGift.php | 13 +++- app/Services/Admin/UserGiftService.php | 24 ++++++ database/seeders/AdminMenuSeeder.php | 2 +- lang/zh_CN/admin.php | 11 ++- lang/zh_CN/menu.php | 2 +- 10 files changed, 143 insertions(+), 9 deletions(-) create mode 100644 app/Admin/Controllers/UserGiftController.php create mode 100644 app/Models/Filters/UserGiftFilter.php create mode 100644 app/Services/Admin/UserGiftService.php diff --git a/app/Admin/Controllers/ActivityController.php b/app/Admin/Controllers/ActivityController.php index b16ea83..099d738 100644 --- a/app/Admin/Controllers/ActivityController.php +++ b/app/Admin/Controllers/ActivityController.php @@ -44,11 +44,11 @@ class ActivityController extends AdminController "0"=>"未发布", "1"=>"进行中", "2"=>"已结束", - "*"=> '其他：${gender}' + "*"=> '其他：${state}' ]), amis()->TableColumn('logs_count', __('admin.activities.user_count')), - amis()->TableColumn('start_at', __('admin.activities.start_at')), - amis()->TableColumn('end_at', __('admin.activities.end_at')), + amis()->TableColumn('start_at', __('admin.activities.start_at'))->type('datetime'), + amis()->TableColumn('end_at', __('admin.activities.end_at'))->type('datetime'), amis()->TableColumn('created_at', __('admin.created_at'))->type('datetime')->sortable(true), Operation::make()->label(__('admin.actions'))->buttons([ @@ -156,7 +156,7 @@ class ActivityController extends AdminController "0"=>"未发布", "1"=>"进行中", "2"=>"已结束", - "*"=> '其他：${gender}' + "*"=> '其他：${state}' ]), amis()->TableColumn('home_field', __('admin.activity_games.home_field')), amis()->TableColumn('home_logo', __('admin.activity_games.home_logo'))->type('image')->height('30px')->width('30px'), diff --git a/app/Admin/Controllers/ActivityGiftController.php b/app/Admin/Controllers/ActivityGiftController.php index 8f57af2..1fe9ff0 100644 --- a/app/Admin/Controllers/ActivityGiftController.php +++ b/app/Admin/Controllers/ActivityGiftController.php @@ -23,7 +23,7 @@ class ActivityGiftController extends AdminController ->filter($this->baseFilter()->labelWidth('80px')->body([ ])) ->columns([ - + ]); return $this->baseList($crud); diff --git a/app/Admin/Controllers/UserGiftController.php b/app/Admin/Controllers/UserGiftController.php new file mode 100644 index 0000000..1755af7 --- /dev/null +++ b/app/Admin/Controllers/UserGiftController.php @@ -0,0 +1,77 @@ +baseCRUD()->tableLayout('fixed') + ->headerToolbar([ + amis('reload')->align('right'), + amis('filter-toggler')->align('right'), + ]) + ->filter($this->baseFilter()->labelWidth('80px')->body([ + + ])) + ->columns([ + amis()->TableColumn('activity.name', __('admin.activities.name')), + amis()->TableColumn('gift.name', __('admin.activity_gifts.name')), + amis()->TableColumn('user.nick_name', __('admin.users.nick_name')), + amis()->TableColumn('user.phone', __('admin.users.phone')), + amis()->TableColumn('state', __('admin.user_gifts.state'))->type('mapping')->map([ + "0"=>"未领取", + "1"=>"未发货", + "2"=>"已发货", + "*"=> '其他：${state}' + ]), + amis()->TableColumn('consignee', __('admin.user_gifts.consignee')), + amis()->TableColumn('address', __('admin.user_gifts.address')), + amis()->TableColumn('phone', __('admin.user_gifts.phone')), + amis()->TableColumn('shipping_company', __('admin.user_gifts.shipping_company')), + amis()->TableColumn('shipping_number', __('admin.user_gifts.shipping_number')), + ]); + + return $this->baseList($crud); + } + + public function form($isEdit = false): Form + { + return $this->baseForm()->body([ + + ]); + } + + public function detail() + { + $form = amisMake()->form()->title('')->panelClassName('border-r border-t-0 border-b-0 border-l-0')->mode('horizontal') + ->static(true)->actions([]) + ->body([ + + ]); + + return amisMake()->Grid()->columns([ + amis()->Column()->body($form)->md(4), + amis()->Column()->body([ + ])->md(8), + ]); + } + + public function detailActions() + { + return [ + //返回 + amis()->Button()->actionType('cancel')->label(__('admin.back'))->primary() + ]; + } +} \ No newline at end of file diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 3763979..4de8695 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -42,6 +42,8 @@ Route::group([ $router->resource('activity_gifts', \App\Admin\Controllers\ActivityGiftController::class); + $router->resource('user_gifts', \App\Admin\Controllers\UserGiftController::class); + //修改上传 $router->post('upload_file', [\App\Admin\Controllers\IndexController::class, 'uploadFile']); $router->post('upload_image', [\App\Admin\Controllers\IndexController::class, 'uploadImage']); diff --git a/app/Models/Filters/UserGiftFilter.php b/app/Models/Filters/UserGiftFilter.php new file mode 100644 index 0000000..302bfd3 --- /dev/null +++ b/app/Models/Filters/UserGiftFilter.php @@ -0,0 +1,11 @@ +orderBy('created_at', 'desc'); } + public function user() + { + return $this->belongsTo(User::class, 'user_id'); + } + + public function activity() + { + return $this->belongsTo(Activity::class, 'activity_id'); + } + public function gift() { return $this->belongsTo(ActivityGift::class, 'gift_id'); diff --git a/app/Services/Admin/UserGiftService.php b/app/Services/Admin/UserGiftService.php new file mode 100644 index 0000000..ec1c518 --- /dev/null +++ b/app/Services/Admin/UserGiftService.php @@ -0,0 +1,24 @@ + 'activity', 'icon' => 'akar-icons:star', 'url' => '/activity', 'order' => 3, 'children' => [ ['title'=> 'activites', 'icon'=> 'bx:football', 'url' => '/activities', 'order'=>1], - ['title'=> 'activity_gifts', 'icon'=> 'akar-icons:gift', 'url' => '/activity_gifts', 'order'=>1], + ['title'=> 'user_gifts', 'icon'=> 'akar-icons:gift', 'url' => '/user_gifts', 'order'=>1], ] ], ['title' => 'web_content', 'icon' => 'ic:outline-collections-bookmark', 'url' => '', 'order'=>4, diff --git a/lang/zh_CN/admin.php b/lang/zh_CN/admin.php index 30c71d2..8453721 100644 --- a/lang/zh_CN/admin.php +++ b/lang/zh_CN/admin.php @@ -346,7 +346,8 @@ return [ 'away_logo' => '客场logo', 'game_at' => '比赛时间', 'mark' => '奖励', - 'score' => '比分' + 'score' => '比分', + 'state' => '状态' ], 'activity_gifts' => [ 'name' => '奖品名称', @@ -354,4 +355,12 @@ return [ 'rank' => '奖励名次', 'explain' => '领奖说明', ], + 'user_gifts' => [ + 'consignee' => '收货人', + 'address' => '收货地址', + 'phone' => '联系电话', + 'shipping_company' => '快递公司', + 'shipping_number' => '快递号码', + 'state' => '状态', + ] ]; diff --git a/lang/zh_CN/menu.php b/lang/zh_CN/menu.php index be478f9..d85562a 100644 --- a/lang/zh_CN/menu.php +++ b/lang/zh_CN/menu.php @@ -15,6 +15,6 @@ return [ 'ads' => '广告管理', 'activity' => '活动中心', 'activites'=> '足彩竞猜', - 'activity_gifts' => '获奖列表', + 'user_gifts' => '获奖列表', 'users' => '会员管理' ];