jsasg/orico-official-website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
jsasg
2025-07-18 13:36:33 +08:00
parent 493dae7475 ab041a2d48
commit ce401a6068
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/admin/validate/v1/SysBannerItemValidate.php
View File

@@ -15,7 +15,7 @@ class SysBannerItemValidate extends Validate
*/ */
protected $rule = [ protected $rule = [
'id' => 'require|integer', 'id' => 'require|integer',
'banner_id' => 'require|integer', 'banner_id' => 'require|integer|gt:0',
'title' => 'require|max:256', 'title' => 'require|max:256',
'title_txt_color' => 'max:7', 'title_txt_color' => 'max:7',
'desc' => 'max:1024', 'desc' => 'max:1024',
@@ -41,6 +41,7 @@ class SysBannerItemValidate extends Validate
'id.integer' => 'ID必须是整数', 'id.integer' => 'ID必须是整数',
'banner_id.require' => '横幅项分类不能为空', 'banner_id.require' => '横幅项分类不能为空',
'banner_id.integer' => '横幅项分类必须是整数', 'banner_id.integer' => '横幅项分类必须是整数',
'banner_id.gt' => '该横幅分类不可选',
'title.require' => '名称不能为空', 'title.require' => '名称不能为空',
'title.max' => '名称最多不能超过256个字符', 'title.max' => '名称最多不能超过256个字符',
'title_txt_color.max' => '名称字体颜色最多不能超过7个字符', 'title_txt_color.max' => '名称字体颜色最多不能超过7个字符',

1
app/index/controller/TopicNas.php
View File

@@ -205,6 +205,7 @@ class TopicNas extends Common
->language($this->lang_id) ->language($this->lang_id)
->parent($parent) ->parent($parent)
->isShow(true) ->isShow(true)
->order(['sort' => 'asc', 'id' => 'desc'])
->select(); ->select();
View::assign('article_categorys', $article_categorys); View::assign('article_categorys', $article_categorys);