diff --git a/app/Admin/Controllers/ActivityController.php b/app/Admin/Controllers/ActivityController.php
index a7044ce..ba2adc7 100644
--- a/app/Admin/Controllers/ActivityController.php
+++ b/app/Admin/Controllers/ActivityController.php
@@ -120,7 +120,7 @@ class ActivityController extends AdminController
                 amis()->FieldSetControl()->title('活动信息')->body([
                     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()->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()->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'))
@@ -158,11 +158,11 @@ class ActivityController extends AdminController
                                                 amis()->TextControl('game_name', __('admin.activity_games.name'))->required(true),
                                                 amis()->GroupControl()->mode('horizontal')->body([
                                                     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()->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),
                                                 Components::make()->sortControl('mark', __('admin.activity_games.mark'))->required(true),
diff --git a/app/Http/Resources/Api/ActivityResource.php b/app/Http/Resources/Api/ActivityResource.php
index 0c2b2ef..f982f8e 100644
--- a/app/Http/Resources/Api/ActivityResource.php
+++ b/app/Http/Resources/Api/ActivityResource.php
@@ -19,7 +19,7 @@ class ActivityResource extends JsonResource
             'id'        => $this->id,
             'name'      => $this->name,
             'cover'     => $this->cover ??'',
-            'rules'     => nl2br($this->rules ??''),
+            'rules'     => $this->rules ??'',
             'start_at'  => $this->start_at->format('Y-m-d H:i'),
             'end_at'    => $this->end_at->format('Y-m-d H:i'),
             'state'     => $this->state,
diff --git a/app/Http/Resources/Api/UserGiftResource.php b/app/Http/Resources/Api/UserGiftResource.php
index 7fcd9d7..b0b7f04 100644
--- a/app/Http/Resources/Api/UserGiftResource.php
+++ b/app/Http/Resources/Api/UserGiftResource.php
@@ -27,7 +27,7 @@ class UserGiftResource extends JsonResource
                 return $this->gift->rank;
             }, ''),
             'gift_explain'=> $this->whenLoaded('gift', function () {
-                return nl2br($this->gift->explain);
+                return $this->gift->explain;
             }, ''),
             'activity_name' => $this->whenLoaded('activity', function () {
                 return $this->activity->name;
diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index 3ab9aff..c0d47b4 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -15,8 +15,8 @@ class Activity extends Model
     ];
 
     protected $casts = [
-        'start_at' => 'datetime',
-        'end_at' => 'datetime'
+        'start_at' => 'datetime:Y-m-d H:i​:s',
+        'end_at' => 'datetime:Y-m-d H:i​:s'
     ];
 
     public function scopeShow($q){
diff --git a/lang/zh_CN/admin.php b/lang/zh_CN/admin.php
index 503fe3b..7d05220 100644
--- a/lang/zh_CN/admin.php
+++ b/lang/zh_CN/admin.php
@@ -149,6 +149,7 @@ return [
         'old_password_error'      => '原密码错误',
         'username_already_exists' => '用户名已存在',
         'cannot_delete'           => '不可删除超级管理员',
+        'lock'                    => '锁定',
     ],
 
     'admin_roles' => '角色',