diff --git a/app/Admin/Controllers/ArticleController.php b/app/Admin/Controllers/ArticleController.php index 5f4c323..907e903 100644 --- a/app/Admin/Controllers/ArticleController.php +++ b/app/Admin/Controllers/ArticleController.php @@ -39,7 +39,7 @@ class ArticleController extends AdminController ->itemSchema(amis()->Tag()->label('${item}')->color(Admin::setting()->get('system_theme_setting')['theme_color'] ?? '#1677ff')), amis()->TableColumn('tags', __('admin.articles.tags'))->type('mapping')->map(Keyword::tagsMap('article_tag')), amis()->TableColumn('cover', __('admin.articles.cover'))->type('image')->height('50px')->width('50px')->enlargeAble(true), - amis()->TableColumn('published_at', __('admin.articles.published_at'))->remark('若无发布时间操作显示,则会自动生成当前发布时间'), + amis()->TableColumn('published_at', __('admin.articles.published_at'))->remark(__('admin.articles.published_at_remark')), amis()->TableColumn('is_enable', __('admin.articles.is_enable'))->type('switch'), amis()->TableColumn('is_recommend', __('admin.articles.is_recommend'))->type('switch'), amis()->TableColumn('created_at', __('admin.created_at')), @@ -62,7 +62,7 @@ class ArticleController extends AdminController Components::make()->keywordsTagControl('t_ids', __('admin.articles.tags'), 'article_tag'), Components::make()->cropImageControl('cover', __('admin.articles.cover')), Components::make()->sortControl('sort', __('admin.articles.sort')), - amis()->DateTimeControl('published_at', __('admin.articles.published_at'))->format('YYYY-MM-DD HH:mm:ss')->description('*若创建时设置显示且未填写,则默认为创建时间'), + amis()->DateTimeControl('published_at', __('admin.articles.published_at'))->format('YYYY-MM-DD HH:mm:ss')->description(__('admin.articles.published_at_remark')), amis()->SwitchControl('is_enable', __('admin.articles.is_enable'))->value(false), amis()->SwitchControl('is_recommend', __('admin.articles.is_recommend'))->value(false), ])->md(4), diff --git a/app/Models/Article.php b/app/Models/Article.php index a2eac23..5fdae7c 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -42,6 +42,10 @@ class Article extends Model 'appendixes', ]; + public function scopeShow(){ + $q->where('is_enable', true)->where('published_at', '>=', now()); + } + public function scopeSort($q) { $q->orderBy('is_recommend', 'desc') diff --git a/lang/zh_CN/admin.php b/lang/zh_CN/admin.php index 379d5b7..7805ccc 100644 --- a/lang/zh_CN/admin.php +++ b/lang/zh_CN/admin.php @@ -285,6 +285,7 @@ return [ 'is_enable' => '显示', 'is_recommend' => '推荐', 'sort' => '排序', - 'appendixes' => '附件' + 'appendixes' => '附件', + 'published_at_remark' => '*若未设置发布时间且操作设置为显示,则默认生成发布时间' ] ];