From 23b6c602f07bc7309d6e33aa137d91198eed89dc Mon Sep 17 00:00:00 2001 From: Luthics Date: Mon, 25 Sep 2023 21:17:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + app/Admin/Controller/DiscussionController.class.php | 2 +- app/Admin/Controller/NewsController.class.php | 8 ++++---- app/Admin/Controller/NoticeUserController.class.php | 2 +- app/Admin/Controller/RecruitmenNoticeController.class.php | 3 ++- app/Common/Model/ContentResModel.class.php | 6 +++--- app/Common/Model/NewsModel.class.php | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 1c78975..8b9c177 100755 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /package /www/Public/libs /www/Uploads +/Uploads /app/Runtime /lara/storage /lara/vendor/composer/installed.json diff --git a/app/Admin/Controller/DiscussionController.class.php b/app/Admin/Controller/DiscussionController.class.php index cdb563f..6ebd22d 100644 --- a/app/Admin/Controller/DiscussionController.class.php +++ b/app/Admin/Controller/DiscussionController.class.php @@ -39,7 +39,7 @@ class DiscussionController extends GyListController $builder = new ListBuilder(); - $builder = $builder->setMetaTitle('议题管理'); + $builder = $builder->setMetaTitle('讨论管理'); $builder->addTopButton('addnew'); $builder ->setNIDByNode(MODULE_NAME, CONTROLLER_NAME, 'index') diff --git a/app/Admin/Controller/NewsController.class.php b/app/Admin/Controller/NewsController.class.php index 61810b9..c073052 100755 --- a/app/Admin/Controller/NewsController.class.php +++ b/app/Admin/Controller/NewsController.class.php @@ -154,8 +154,8 @@ class NewsController extends GyListController ->addFormItem('in_date', 'date', '入库时间') ->addFormItem('start_date', 'date', '首发时间') ->addFormItem('url', 'text', '原文链接') - ->addFormItem('recommendation', 'textarea', '*入库推荐语') - ->addFormItem('content', 'ueditor', '内容详情') + ->addFormItem('recommendation', 'textarea', '入库推荐语') + ->addFormItem('content', 'ueditor', '*内容详情') ->display(); } } @@ -304,8 +304,8 @@ class NewsController extends GyListController ->addFormItem('in_date', 'date', '入库时间') ->addFormItem('start_date', 'date', '首发时间') ->addFormItem('url', 'text', '原文链接') - ->addFormItem('recommendation', 'textarea', '*入库推荐语') - ->addFormItem('content', 'ueditor', '内容详情') + ->addFormItem('recommendation', 'textarea', '入库推荐语') + ->addFormItem('content', 'ueditor', '*内容详情') ->setFormData($info) ->display(); } diff --git a/app/Admin/Controller/NoticeUserController.class.php b/app/Admin/Controller/NoticeUserController.class.php index 2c03675..9d37c3f 100644 --- a/app/Admin/Controller/NoticeUserController.class.php +++ b/app/Admin/Controller/NoticeUserController.class.php @@ -40,7 +40,7 @@ class NoticeUserController extends GyListController $builder = new ListBuilder(); - $builder = $builder->setMetaTitle('圆桌招募管理'); + $builder = $builder->setMetaTitle('圆桌招募参与人管理'); $builder->addTopButton('addnew'); $builder ->setNIDByNode(MODULE_NAME, CONTROLLER_NAME, 'index') diff --git a/app/Admin/Controller/RecruitmenNoticeController.class.php b/app/Admin/Controller/RecruitmenNoticeController.class.php index d7f2793..20ad488 100644 --- a/app/Admin/Controller/RecruitmenNoticeController.class.php +++ b/app/Admin/Controller/RecruitmenNoticeController.class.php @@ -65,7 +65,8 @@ class RecruitmenNoticeController extends GyListController $data = I('post.'); $model = D('RecruitmenNotice'); $data['status'] = $data['status'] ?? DBCont::NORMAL_STATUS; - $data['cur_people'] = count($data['cur_peoples']); + if ($data['cur_peoples']) $data['cur_people'] = count($data['cur_peoples']); + else $data['cur_people'] = 0; $r = $model->createAdd($data); if ($r === false) { $this->error($model->getError()); diff --git a/app/Common/Model/ContentResModel.class.php b/app/Common/Model/ContentResModel.class.php index 05acf75..478e85d 100644 --- a/app/Common/Model/ContentResModel.class.php +++ b/app/Common/Model/ContentResModel.class.php @@ -6,14 +6,14 @@ use \Gy_Library\DBCont; class ContentResModel extends \Gy_Library\GyListModel { - protected $model_name = '副页面简介'; + protected $model_name = '资源管理'; protected $_auto = array( // array('created_at', "date", parent::MODEL_INSERT, 'function', array('Y-m-d H:i:s')), // array('from_name', 'getUserName', parent::MODEL_BOTH, 'callback'), // array('from_avatar', 'getUserAvatar', parent::MODEL_BOTH, 'callback'), - array('create_time', 'time', parent::MODEL_INSERT, 'function'), - array('update_time', 'time', parent::MODEL_BOTH, 'function') + array('created_at', 'time', parent::MODEL_INSERT, 'function'), + // array('update_time', 'time', parent::MODEL_BOTH, 'function') ); protected $_validate = array( diff --git a/app/Common/Model/NewsModel.class.php b/app/Common/Model/NewsModel.class.php index 5193af6..5acd725 100755 --- a/app/Common/Model/NewsModel.class.php +++ b/app/Common/Model/NewsModel.class.php @@ -14,7 +14,7 @@ class NewsModel extends \Gy_Library\GyListModel array('cate_id', 'require', '请选择文章分类', self::MUST_VALIDATE, '', 3), array('cover_id', 'require', '请上传封面图', self::MUST_VALIDATE, '', 3), array('author', 'require', '请填写作者', self::MUST_VALIDATE, '', 3), - array('recommendation', 'require', '请填写入库推荐语', self::MUST_VALIDATE, '', 3), + array('content', 'require', '请填写内容详情', self::MUST_VALIDATE, '', 3), array('title', '0,255', '标题过长', self::EXISTS_VALIDATE, 'length', self::MODEL_BOTH), array('author', '0,255', '作者过长', self::EXISTS_VALIDATE, 'length', self::MODEL_BOTH),