From c4dcc1f6b6e578875e2b054e8cf617864b01387c Mon Sep 17 00:00:00 2001 From: augushong Date: Thu, 7 May 2020 21:33:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=8F=AF=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=94=A8=E4=BA=8E=E4=B8=8D=E5=90=8C=E8=80=8C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Category.php | 6 ++-- app/admin/controller/Post.php | 5 ++- app/admin/controller/Tag.php | 4 ++- app/common/ColumnFormat.php | 4 +-- app/model/Category.php | 2 +- .../20200418120809_create_table_post.php | 2 +- .../20200418120827_create_table_category.php | 32 ++++++++++--------- .../20200418120831_create_table_tag.php | 14 ++++---- view/admin/category/index.html | 4 +-- view/admin/common/left_post.html | 6 ++-- view/admin/post/create.html | 3 +- view/admin/post/edit.html | 7 ++-- view/admin/post/index.html | 4 +-- view/admin/tag/index.html | 6 ++-- 14 files changed, 57 insertions(+), 42 deletions(-) diff --git a/app/admin/controller/Category.php b/app/admin/controller/Category.php index 872cc49..fae787e 100644 --- a/app/admin/controller/Category.php +++ b/app/admin/controller/Category.php @@ -19,7 +19,7 @@ class Category extends Common { // - $list = ModelCategory::getListLevel(); + $list = ModelCategory::getListLevel('',$this->request->param('type',1)); if($this->request->isAjax()){ return json_message($list); @@ -39,7 +39,7 @@ class Category extends Common { // - $list = ModelCategory::getListLevel(); + $list = ModelCategory::getListLevel('',$this->request->param('type',1)); View::assign('list_category',$list); @@ -107,7 +107,7 @@ class Category extends Common $model_category = ModelCategory::find($id); - $list = ModelCategory::getListLevel(); + $list = ModelCategory::getListLevel('',$this->request->param('type',1)); View::assign('list_category',$list); View::assign('category',$model_category); diff --git a/app/admin/controller/Post.php b/app/admin/controller/Post.php index 13709b7..7384d1e 100644 --- a/app/admin/controller/Post.php +++ b/app/admin/controller/Post.php @@ -23,7 +23,10 @@ class Post extends Common { // - $list = ModelPost::with(['categorys.category','tags.tag'])->order('id desc')->paginate(); + $list = ModelPost::with(['categorys.category','tags.tag']) + ->where('type',$this->request->param('type',1)) + ->order('id desc') + ->paginate(); View::assign('list', $list); diff --git a/app/admin/controller/Tag.php b/app/admin/controller/Tag.php index dd4647b..f5d942f 100644 --- a/app/admin/controller/Tag.php +++ b/app/admin/controller/Tag.php @@ -19,7 +19,9 @@ class Tag extends Common { // - $list_tag = ModelTag::order('id desc')->paginate(); + $list_tag = ModelTag::order('id desc') + ->where('type',$this->request->param('type',1)) + ->paginate(); if($this->request->isAjax()){ return json_message($list_tag); diff --git a/app/common/ColumnFormat.php b/app/common/ColumnFormat.php index 8db97b6..55b0cc4 100644 --- a/app/common/ColumnFormat.php +++ b/app/common/ColumnFormat.php @@ -46,12 +46,12 @@ class ColumnFormat ->setDefault(''); } - public static function integerTypeStatus($name) + public static function integerTypeStatus($name,$default = 0) { return Column::make($name,'integer') ->setLimit(10) ->setSigned(false) - ->setDefault(0); + ->setDefault($default); } public static function integer($name) diff --git a/app/model/Category.php b/app/model/Category.php index 8ae886b..e0f2589 100644 --- a/app/model/Category.php +++ b/app/model/Category.php @@ -23,7 +23,7 @@ class Category extends Model * @param string $id * @return void */ - public static function getListLevel($id = '') + public static function getListLevel($id = '',$type = 1) { if(empty(self::$allCategory)){ diff --git a/database/migrations/20200418120809_create_table_post.php b/database/migrations/20200418120809_create_table_post.php index 4272c8d..238503b 100644 --- a/database/migrations/20200418120809_create_table_post.php +++ b/database/migrations/20200418120809_create_table_post.php @@ -45,7 +45,7 @@ class CreateTablePost extends Migrator $table->addColumn(ColumnFormat::stringUrl('jump_to_url')->setComment('跳转链接')); $table->addColumn(ColumnFormat::integerTypeStatus('jump_to_url_status')->setComment('0:不显示,1:显示连接,2:自动跳转')); $table->addColumn(ColumnFormat::integer('sort')->setComment('排序,越大越靠前')); - $table->addColumn(ColumnFormat::integerTypeStatus('type')->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签')); + $table->addColumn(ColumnFormat::integerTypeStatus('type',1)->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途')); $table->addColumn(Column::make('files','text')->setComment('附件')); $table->addColumn(Column::make('pictures','text')->setComment('相册')); $table->addColumn(ColumnFormat::stringShort('tpl_name')->setComment('模板名称')); diff --git a/database/migrations/20200418120827_create_table_category.php b/database/migrations/20200418120827_create_table_category.php index c915229..990f0a1 100644 --- a/database/migrations/20200418120827_create_table_category.php +++ b/database/migrations/20200418120827_create_table_category.php @@ -30,20 +30,22 @@ class CreateTableCategory extends Migrator public function change() { $table = $this->table('category') - ->setComment('分类表') - ->addColumn(ColumnFormat::stringNormal('title')) - ->addColumn(ColumnFormat::timestamp('create_time')) - ->addColumn(ColumnFormat::timestamp('update_time')) - ->addColumn(ColumnFormat::timestamp('delete_time')) - ->addColumn(ColumnFormat::integer('pid')->setComment('上级id')) - ->addColumn(ColumnFormat::integer('level')->setDefault(1)->setComment('层级')) - ->addColumn(ColumnFormat::stringShort('tpl_name')->setComment('模板名称')) - ->addColumn(ColumnFormat::stringUrl('title_img')->setComment('附图')) - ->addColumn(ColumnFormat::stringLong('desc')->setComment('副标题描述')) - ->addColumn(ColumnFormat::integerTypeStatus('status')->setComment('0:不显示,1:显示')) - ->addIndex('pid') - ->addIndex('status') - ->addIndex('delete_time') - ->create(); + ->setComment('分类表') + ->addColumn(ColumnFormat::stringNormal('title')) + ->addColumn(ColumnFormat::timestamp('create_time')) + ->addColumn(ColumnFormat::timestamp('update_time')) + ->addColumn(ColumnFormat::timestamp('delete_time')) + ->addColumn(ColumnFormat::integer('pid')->setComment('上级id')) + ->addColumn(ColumnFormat::integer('level')->setDefault(1)->setComment('层级')) + ->addColumn(ColumnFormat::stringShort('tpl_name')->setComment('模板名称')) + ->addColumn(ColumnFormat::stringUrl('title_img')->setComment('附图')) + ->addColumn(ColumnFormat::stringLong('desc')->setComment('副标题描述')) + ->addColumn(ColumnFormat::integerTypeStatus('status')->setComment('0:不显示,1:显示')) + ->addColumn(ColumnFormat::integerTypeStatus('type',1)->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途')) + ->addIndex('type') + ->addIndex('pid') + ->addIndex('status') + ->addIndex('delete_time') + ->create(); } } diff --git a/database/migrations/20200418120831_create_table_tag.php b/database/migrations/20200418120831_create_table_tag.php index 35deb93..118a096 100644 --- a/database/migrations/20200418120831_create_table_tag.php +++ b/database/migrations/20200418120831_create_table_tag.php @@ -30,11 +30,13 @@ class CreateTableTag extends Migrator public function change() { $table = $this->table('tag') - ->setComment('分类表') - ->addColumn(ColumnFormat::stringNormal('title')) - ->addColumn(ColumnFormat::timestamp('create_time')) - ->addColumn(ColumnFormat::timestamp('update_time')) - ->addColumn(ColumnFormat::timestamp('delete_time')) - ->create(); + ->setComment('分类表') + ->addColumn(ColumnFormat::stringNormal('title')) + ->addColumn(ColumnFormat::timestamp('create_time')) + ->addColumn(ColumnFormat::timestamp('update_time')) + ->addColumn(ColumnFormat::timestamp('delete_time')) + ->addColumn(ColumnFormat::integerTypeStatus('type',1)->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途')) + ->addIndex('type') + ->create(); } } diff --git a/view/admin/category/index.html b/view/admin/category/index.html index c4d8d81..42f35dc 100644 --- a/view/admin/category/index.html +++ b/view/admin/category/index.html @@ -32,7 +32,7 @@
- 新增 + 新增
@@ -54,7 +54,7 @@ diff --git a/view/admin/tag/index.html b/view/admin/tag/index.html index 46766eb..557de02 100644 --- a/view/admin/tag/index.html +++ b/view/admin/tag/index.html @@ -52,7 +52,7 @@ @@ -82,6 +82,7 @@ layer.confirm('确定要删除吗？', function () { $.get('{:url("delete")}', { id: $(item).parents('.item').data('id') + }, function (result) { layer.msg('删除成功'); @@ -95,7 +96,8 @@ title: '请输入标签,空格分隔可添加多个' }, function (value, index) { $.post('{:url("save")}', { - tags: value + tags: value, + type:'{$Request.param.type}' }, function (result) { layer.msg('添加成功') setTimeout(() => {
{$vo.tpl_name}
- 查看 + 查看 编辑
删除
diff --git a/view/admin/common/left_post.html b/view/admin/common/left_post.html index 4560347..3db2c5b 100644 --- a/view/admin/common/left_post.html +++ b/view/admin/common/left_post.html @@ -3,13 +3,13 @@ diff --git a/view/admin/post/create.html b/view/admin/post/create.html index 4ee117c..70b6868 100644 --- a/view/admin/post/create.html +++ b/view/admin/post/create.html @@ -366,7 +366,8 @@ } function loadTags() { $.get('{:url("Tag/index")}', { - page: tagPage + page: tagPage, + type:'{$Request.param.type}' }, function (result) { tagPage++; result.data.data.forEach(tag => { diff --git a/view/admin/post/edit.html b/view/admin/post/edit.html index b8da6ad..69f2ae4 100644 --- a/view/admin/post/edit.html +++ b/view/admin/post/edit.html @@ -380,7 +380,8 @@ } function loadTags() { $.get('{:url("Tag/index")}', { - page: tagPage + page: tagPage, + type:'{$Request.param.type}' }, function (result) { tagPage++; result.data.data.forEach(tag => { @@ -426,7 +427,9 @@ } function loadCategory() { - $.get('{:url("Category/index")}', function (result) { + $.get('{:url("Category/index")}', { + type:'{$Request.param.type}' + },function (result) { result.data.forEach(category => { var prefix = ''; diff --git a/view/admin/post/index.html b/view/admin/post/index.html index 09ce5b1..4f0f55a 100644 --- a/view/admin/post/index.html +++ b/view/admin/post/index.html @@ -32,7 +32,7 @@
@@ -74,7 +74,7 @@
查看 - 编辑 + 编辑
删除
 {:str_repeat('|--',$vo.level)} {$vo.title}
-
编辑
+
编辑
删除