From 1ec8c0725051f32e4f0f813c09f441cd08f3d483 Mon Sep 17 00:00:00 2001 From: augushong Date: Sat, 18 Apr 2020 23:14:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=88=86=E7=B1=BB=E5=92=8C?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=9A=84=E6=A8=A1=E6=9D=BF=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +-- app/admin/controller/Nav.php | 1 - app/admin/controller/System.php | 5 ++ app/index/controller/BaseController.php | 46 +++++++++++ app/index/controller/Index.php | 7 +- composer.lock | 10 +-- config/view_type.php | 14 ++++ .../20200417060522_create_table_nav.php | 1 + .../20200418120809_create_table_post.php | 1 + .../20200418120827_create_table_category.php | 3 + view/admin/category/create.html | 55 ++++++++++++- view/admin/category/edit.html | 32 +++++++- view/admin/common/left_system.html | 3 + view/admin/nav/create.html | 6 ++ view/admin/nav/edit.html | 6 ++ view/admin/post/create.html | 11 ++- view/admin/post/edit.html | 22 +++-- view/admin/system/theme.html | 80 +++++++++++++++++++ 18 files changed, 285 insertions(+), 30 deletions(-) create mode 100644 app/index/controller/BaseController.php create mode 100644 config/view_type.php create mode 100644 view/admin/system/theme.html diff --git a/README.md b/README.md index 0b5966d..f4da542 100644 --- a/README.md +++ b/README.md @@ -8,17 +8,11 @@ #### 介绍 -基于thinkphp6的系统后台管理模板,实现了几个通用的功能,基于ThinkPHP6,Layui,Jquery,支持各类数据库. +基于thinkphp6的系统后台管理模板. -本项目的定位是实现几个基本的功能,节约您的一些开发时间,没有过多的开发设计限制. +基于ThinkPHP6,Layui,Jquery,支持各类数据库. -您可以使用本模板,节省这部分时间. - -类似的功能还有服务器信息/系统配置等. - -实现功能的同时没有制定更多的开发规则,您完全可以把本项目的代码修按照您的意愿改掉. - -这不是一个页面齐全，功能丰富的后台，但如果你想自定义开发又想节约一些时间，那么本模板很适合你。 +已实现很好用的`上传文件管理`,`内容管理`,`导航轮播管理(支持小程序)`的后台功能. #### 最新演示 diff --git a/app/admin/controller/Nav.php b/app/admin/controller/Nav.php index 7b18422..c789c1e 100644 --- a/app/admin/controller/Nav.php +++ b/app/admin/controller/Nav.php @@ -18,7 +18,6 @@ class Nav extends Common public function index(Request $request) { // - $type = $request->param('type',1); $list = ModelNav::order('sort asc')->order('id asc')->where('type',$type)->paginate(); diff --git a/app/admin/controller/System.php b/app/admin/controller/System.php index 41bceee..1e4f063 100644 --- a/app/admin/controller/System.php +++ b/app/admin/controller/System.php @@ -33,6 +33,11 @@ class System extends Common return View::fetch(); } + public function theme() + { + + return View::fetch(); + } public function update() { diff --git a/app/index/controller/BaseController.php b/app/index/controller/BaseController.php new file mode 100644 index 0000000..7025b8c --- /dev/null +++ b/app/index/controller/BaseController.php @@ -0,0 +1,46 @@ +isUseTpls && strpos($template,'@') === false && stripos($template,'/') === false){ + + if($template === ''){ + $config_auto_rule = Config::get('view.auto_rule'); + if (2 == $config_auto_rule) { + $template = $this->request->action(true); + } elseif (3 == $config_auto_rule) { + $template = $this->request->action(); + } else { + $template = Str::snake($this->request->action()); + } + } + return View::fetch(get_system_config('index_tpl_name').$template,$vars); + }else{ + return View::fetch($template,$vars); + } + + } +} diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index 1536908..089b0a9 100644 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -5,7 +5,7 @@ namespace app\index\controller; use think\facade\View; use think\Request; -class Index +class Index extends BaseController { /** * 显示资源列表 @@ -15,7 +15,10 @@ class Index public function index() { // - return View::fetch(); + + dump($this->request->action()); + + return $this->fetch(''); } /** diff --git a/composer.lock b/composer.lock index 469cd99..e3c61c3 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "league/flysystem", - "version": "1.0.66", + "version": "1.0.67", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21" + "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21", - "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", + "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", "shasum": "", "mirrors": [ { @@ -94,7 +94,7 @@ "sftp", "storage" ], - "time": "2020-03-17T18:58:12+00:00" + "time": "2020-04-16T13:21:26+00:00" }, { "name": "league/flysystem-cached-adapter", diff --git a/config/view_type.php b/config/view_type.php new file mode 100644 index 0000000..98d7510 --- /dev/null +++ b/config/view_type.php @@ -0,0 +1,14 @@ + [ + '' => '普通', + + '_product' => '产品', + '_case' => '案例', + '_about' => '关于', + ], + 'post' => [ + '' => '普通', + ] +]; diff --git a/database/migrations/20200417060522_create_table_nav.php b/database/migrations/20200417060522_create_table_nav.php index 63fa2d5..24bd696 100644 --- a/database/migrations/20200417060522_create_table_nav.php +++ b/database/migrations/20200417060522_create_table_nav.php @@ -39,6 +39,7 @@ class CreateTableNav extends Migrator $table->addColumn(ColumnFormat::timestamp('delete_time')); $table->addColumn(Column::make('type','integer')->setLimit(10)->setSigned(false)->setComment('类型,用于区分业务场景:1:PC导航,2:PC轮播图,3:PC友情链接')); $table->addColumn(Column::make('img','string')->setLimit(100)->setComment('图片')); + $table->addColumn(ColumnFormat::stringLong('desc')->setComment('副标题描述')); $table->addColumn(Column::make('target','string')->setLimit(10)->setSigned(false)->setComment('网页链接打开对象,_BLANK,_SELF,iframe_name')); $table->addColumn(Column::make('xcx_type','integer')->setLimit(10)->setComment('小程序打开方式,1:小程序导航页面,2:普通页面,3:web-view,4:其他小程序,5:电话')); $table->addColumn(Column::make('value','string')->setLimit(100)->setComment('对象值,有可能是网页链接,小程序导航页面路径,小程序普通页面路径,电话')); diff --git a/database/migrations/20200418120809_create_table_post.php b/database/migrations/20200418120809_create_table_post.php index f42d101..4272c8d 100644 --- a/database/migrations/20200418120809_create_table_post.php +++ b/database/migrations/20200418120809_create_table_post.php @@ -48,6 +48,7 @@ class CreateTablePost extends Migrator $table->addColumn(ColumnFormat::integerTypeStatus('type')->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签')); $table->addColumn(Column::make('files','text')->setComment('附件')); $table->addColumn(Column::make('pictures','text')->setComment('相册')); + $table->addColumn(ColumnFormat::stringShort('tpl_name')->setComment('模板名称')); $table->addIndex('type'); $table->addIndex('status'); $table->addIndex('delete_time'); diff --git a/database/migrations/20200418120827_create_table_category.php b/database/migrations/20200418120827_create_table_category.php index b2cb3ea..f781b68 100644 --- a/database/migrations/20200418120827_create_table_category.php +++ b/database/migrations/20200418120827_create_table_category.php @@ -37,6 +37,9 @@ class CreateTableCategory extends Migrator ->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('副标题描述')) ->addIndex('pid') ->create(); } diff --git a/view/admin/category/create.html b/view/admin/category/create.html index 03fe094..0eb944b 100644 --- a/view/admin/category/create.html +++ b/view/admin/category/create.html @@ -48,14 +48,42 @@ + - +
+
副标题/描述
+
+ +
+
+
+
附图
+
+ +
+
上传
+
+
+ +
+
+
+
+
模板
+
+ +
+
+
@@ -73,8 +101,27 @@ diff --git a/view/admin/category/edit.html b/view/admin/category/edit.html index 18bb5bf..f3e338e 100644 --- a/view/admin/category/edit.html +++ b/view/admin/category/edit.html @@ -57,7 +57,34 @@ - +
+
副标题/描述
+
+ +
+
+
+
附图
+
+ +
+
上传
+
+
+ +
+
+
+
+
模板
+
+ +
+
@@ -79,7 +106,8 @@ var form = layui.form; form.val('*',{ - pid:'{$category.pid}' + pid:'{$category.pid}', + tpl_name:'{$category->getData("tpl_name")}', }) }) diff --git a/view/admin/common/left_system.html b/view/admin/common/left_system.html index 04bbe6d..5e53fa0 100644 --- a/view/admin/common/left_system.html +++ b/view/admin/common/left_system.html @@ -8,6 +8,9 @@
  • 第三方管理
    • +
  • + 主题管理 +
  • 用户协议管理
    • diff --git a/view/admin/nav/create.html b/view/admin/nav/create.html index 0a9a2f0..fa23c6f 100644 --- a/view/admin/nav/create.html +++ b/view/admin/nav/create.html @@ -48,6 +48,12 @@ +
    +
    副标题/描述
    +
    + +
    +
    {if $Request.param.show_img == 1 }
    diff --git a/view/admin/nav/edit.html b/view/admin/nav/edit.html index 54f0331..b96417c 100644 --- a/view/admin/nav/edit.html +++ b/view/admin/nav/edit.html @@ -47,6 +47,12 @@ class="layui-input">
    +
    +
    副标题/描述
    +
    + +
    +
    {if $Request.param.show_img == 1 }
    diff --git a/view/admin/post/create.html b/view/admin/post/create.html index 9e9280d..ca958c8 100644 --- a/view/admin/post/create.html +++ b/view/admin/post/create.html @@ -213,7 +213,16 @@
    越大越靠前
    - +
    +
    模板
    +
    + +
    +
    diff --git a/view/admin/post/edit.html b/view/admin/post/edit.html index 8d78fc3..061da93 100644 --- a/view/admin/post/edit.html +++ b/view/admin/post/edit.html @@ -217,7 +217,16 @@
    越大越靠前
    - +
    +
    模板
    +
    + +
    +
    @@ -338,6 +347,7 @@ status: '{$post->getData("status")}', is_top: '{$post->getData("is_top")}', jump_to_url_status: '{$post->getData("jump_to_url_status")}', + tpl_name: '{$post->getData("tpl_name")}', }) form.on('submit(save)', function (data) { @@ -350,7 +360,7 @@ console.log(formData); $.post('{:url("update")}', formData, function (result) { - + layer.msg('添加成功') setTimeout(() => { location.href = result.data.jump_to_url @@ -417,7 +427,7 @@ function loadCategory() { $.get('{:url("Category/index")}', function (result) { - + result.data.forEach(category => { var prefix = ''; for (let prefixLevelIndex = 0; prefixLevelIndex < category.level; prefixLevelIndex++) { @@ -430,10 +440,10 @@ domCategory.find('input').attr('title', prefix + category.title) if (categoryList.indexOf(category.id) >= 0) { - + domCategory.find('input').attr('checked', 'checked') - - + + } domCategory.appendTo('.category-list') diff --git a/view/admin/system/theme.html b/view/admin/system/theme.html new file mode 100644 index 0000000..294a102 --- /dev/null +++ b/view/admin/system/theme.html @@ -0,0 +1,80 @@ + + + + + + + + 系统管理 + {include file="common/_require"} + + + + + + +
    + {include file="common/_header"} + + {include file="common/left_system"} + +
    + +
    +
    + + 首页 + 系统设置 + +
    +
    +
    +
    + 系统管理 +
    +
    +
    +
    选择主题
    +
    +
    + +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + + + {include file="common/_footer"} + + +
    ` + + + \ No newline at end of file