pdkj
/
guessing-miniprogram
generated from liutk/owl-admin-base
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

main
liutk 2024-06-05 14:28:02 +08:00
parent a86fbf5502
commit 730641a1e5
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Admin/Controllers/ActivityController.php
View File

@ -120,7 +120,7 @@ class ActivityController extends AdminController
amis()->FieldSetControl()->title('活动信息')->body([ amis()->FieldSetControl()->title('活动信息')->body([
amis()->TextControl('name', __('admin.activities.name'))->required(true), amis()->TextControl('name', __('admin.activities.name'))->required(true),
amis()->Image()->type('static-image')->name('cover')->label( __('admin.activities.cover'))->height('80px')->width('80px')->thumbMode('cover')->enlargeAble(true)->required(true), amis()->Image()->type('static-image')->name('cover')->label( __('admin.activities.cover'))->height('80px')->width('80px')->thumbMode('cover')->enlargeAble(true)->required(true),
amis()->DateRangeControl('start_at', __('admin.activities.activity_at'))->extraName('end_at')->clearable(false)->format('YYYY-MM-DD HH:mm:ss')->required(true), amis()->DateRangeControl('start_at', __('admin.activities.activity_at'))->format('YYYY-MM-DD HH:mm:ss'),
amis()->TextControl('share_title', __('admin.activities.share_title')), amis()->TextControl('share_title', __('admin.activities.share_title')),
amis()->Image()->type('static-image')->name('share_image')->label( __('admin.activities.share_image'))->height('80px')->width('80px')->thumbMode('cover')->enlargeAble(true), amis()->Image()->type('static-image')->name('share_image')->label( __('admin.activities.share_image'))->height('80px')->width('80px')->thumbMode('cover')->enlargeAble(true),
amis()->TextareaControl('rules', __('admin.activities.rules')) amis()->TextareaControl('rules', __('admin.activities.rules'))
@ -158,11 +158,11 @@ class ActivityController extends AdminController
amis()->TextControl('game_name', __('admin.activity_games.name'))->required(true), amis()->TextControl('game_name', __('admin.activity_games.name'))->required(true),
amis()->GroupControl()->mode('horizontal')->body([ amis()->GroupControl()->mode('horizontal')->body([
amis()->TextControl('home_field', __('admin.activity_games.home_field'))->required(), amis()->TextControl('home_field', __('admin.activity_games.home_field'))->required(),
Components::make()->cropImageControl('home_logo', __('admin.activity_games.home_logo')), Components::make()->imageControl('home_logo', __('admin.activity_games.home_logo')),
]), ]),
amis()->GroupControl()->mode('horizontal')->body([ amis()->GroupControl()->mode('horizontal')->body([
amis()->TextControl('away', __('admin.activity_games.away'))->required(), amis()->TextControl('away', __('admin.activity_games.away'))->required(),
Components::make()->cropImageControl('away_logo', __('admin.activity_games.away_logo')), Components::make()->imageControl('away_logo', __('admin.activity_games.away_logo')),
]), ]),
amis()->DateTimeControl('game_at', __('admin.activity_games.game_at'))->format('YYYY-MM-DD HH:mm:ss')->required(true), amis()->DateTimeControl('game_at', __('admin.activity_games.game_at'))->format('YYYY-MM-DD HH:mm:ss')->required(true),
Components::make()->sortControl('mark', __('admin.activity_games.mark'))->required(true), Components::make()->sortControl('mark', __('admin.activity_games.mark'))->required(true),

2
app/Http/Resources/Api/ActivityResource.php
View File

@ -19,7 +19,7 @@ class ActivityResource extends JsonResource
'id' => $this->id, 'id' => $this->id,
'name' => $this->name, 'name' => $this->name,
'cover' => $this->cover ??'', 'cover' => $this->cover ??'',
'rules' => nl2br($this->rules ??''), 'rules' => $this->rules ??'',
'start_at' => $this->start_at->format('Y-m-d H:i'), 'start_at' => $this->start_at->format('Y-m-d H:i'),
'end_at' => $this->end_at->format('Y-m-d H:i'), 'end_at' => $this->end_at->format('Y-m-d H:i'),
'state' => $this->state, 'state' => $this->state,

2
app/Http/Resources/Api/UserGiftResource.php
View File

@ -27,7 +27,7 @@ class UserGiftResource extends JsonResource
return $this->gift->rank; return $this->gift->rank;
}, ''), }, ''),
'gift_explain'=> $this->whenLoaded('gift', function () { 'gift_explain'=> $this->whenLoaded('gift', function () {
return nl2br($this->gift->explain); return $this->gift->explain;
}, ''), }, ''),
'activity_name' => $this->whenLoaded('activity', function () { 'activity_name' => $this->whenLoaded('activity', function () {
return $this->activity->name; return $this->activity->name;

4
app/Models/Activity.php
View File

@ -15,8 +15,8 @@ class Activity extends Model
]; ];
protected $casts = [ protected $casts = [
'start_at' => 'datetime', 'start_at' => 'datetime:Y-m-d H:i​:s',
'end_at' => 'datetime' 'end_at' => 'datetime:Y-m-d H:i​:s'
]; ];
public function scopeShow($q){ public function scopeShow($q){

1
lang/zh_CN/admin.php
View File

@ -149,6 +149,7 @@ return [
'old_password_error' => '原密码错误', 'old_password_error' => '原密码错误',
'username_already_exists' => '用户名已存在', 'username_already_exists' => '用户名已存在',
'cannot_delete' => '不可删除超级管理员', 'cannot_delete' => '不可删除超级管理员',
'lock' => '锁定',
], ],
'admin_roles' => '角色', 'admin_roles' => '角色',