diff --git a/app/Admin/Controllers/AdminUserController.php b/app/Admin/Controllers/AdminUserController.php index fbab86c..fda26ea 100644 --- a/app/Admin/Controllers/AdminUserController.php +++ b/app/Admin/Controllers/AdminUserController.php @@ -52,8 +52,8 @@ class AdminUserController extends AdminController amisMake()->ImageControl('avatar', __('admin.admin_user.avatar'))->receiver($this->uploadImagePath()), amisMake()->TextControl('username', __('admin.username'))->required(), amisMake()->TextControl('name', __('admin.admin_user.name'))->required(), - amisMake()->TextControl('password', __('admin.password'))->type('input-password')->required(), - amisMake()->TextControl('confirm_password', __('admin.confirm_password'))->type('input-password')->required(), + amisMake()->TextControl('password', __('admin.password'))->type('input-password')->required()->validations(['minLength' => 6]), + amisMake()->TextControl('confirm_password', __('admin.confirm_password'))->type('input-password')->validations(['minLength' => 6]), amisMake()->SelectControl('roles', __('admin.admin_user.roles')) ->searchable() ->multiple() diff --git a/app/Admin/Controllers/CustomRegionController.php b/app/Admin/Controllers/CustomRegionController.php index 8bc32fe..3b7c202 100644 --- a/app/Admin/Controllers/CustomRegionController.php +++ b/app/Admin/Controllers/CustomRegionController.php @@ -45,7 +45,7 @@ class CustomRegionController extends AdminController foreach($regionList as $region){ $tabs = Region::regionTabConfig($region); $resList[] = [ - "icon"=> $region->cover ?? '', + "icon"=> $region->cover ?: url('default.svg'), "text"=> $region->name, 'clickAction' => DialogAction::make()->dialog( Dialog::make()->title($region['name'])->body([ @@ -77,16 +77,16 @@ class CustomRegionController extends AdminController ->labelWidth(100) ->body([ \amisMake()->TextControl()->static(true)->name('name')->label('名称')->value($region->name), - TextControl::make()->name('cover')->label(__('region.cover'))->static(true)->staticSchema(Image::make()), + TextControl::make()->name('cover')->label(__('region.cover'))->static(true)->staticSchema(Image::make()->src($region->cover)), \amisMake()->TextControl()->static(true)->name('director')->label('负责人')->value($region->director), \amisMake()->TextControl()->static(true)->name('category_name')->label('分类')->value($region->category?->name ?? ''), \amisMake()->TextControl()->static(true)->name('area')->label('面积m²')->value($region?->area ?? ''), \amisMake()->TextControl()->static(true)->name('sort')->label('排序')->value($region?->sort ?? '0'), - \amisMake()->SwitchControl()->static(true)->name('is_enable')->name('is_enable')->label('显示')->value($region?->is_enable ?? 0), + \amisMake()->SwitchControl()->static(true)->label('显示')->value(!!$region->is_enable), ]), amisMake()->Panel()->title('基础介绍') ->body([ - amisMake()->Tpl()->tpl($region?->content ?? '') + amisMake()->Tpl()->tpl($region?->description ?? '') ]) ]), amisMake()->Wrapper()->sm(8)->body([ diff --git a/public/default.svg b/public/default.svg new file mode 100644 index 0000000..312d7bf --- /dev/null +++ b/public/default.svg @@ -0,0 +1 @@ + \ No newline at end of file