From 83671b171adeee6bd5d414ba6cc615d8b1018cd7 Mon Sep 17 00:00:00 2001 From: muzi_yd <1099438829@qq.com> Date: Sat, 13 Mar 2021 20:37:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BB=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Category.php | 33 ++++++------ app/admin/controller/SystemConfig.php | 2 + app/admin/controller/Theme.php | 70 ++++++++++++++++++++++++++ app/admin/view/article/add.html | 2 +- app/admin/view/article/edit.html | 4 +- app/admin/view/category/add.html | 23 +++++---- app/admin/view/category/edit.html | 20 +++++--- app/admin/view/category/index.html | 4 +- app/admin/view/theme/index.html | 50 ++++++++++++++++++ app/common.php | 1 + public/template/blog/info.json | 28 +++++++++++ public/template/blog/preview.jpg | Bin 0 -> 572848 bytes public/template/default/info.json | 1 - public/template/default/set.php | 1 - 14 files changed, 198 insertions(+), 41 deletions(-) create mode 100644 app/admin/controller/Theme.php create mode 100644 app/admin/view/theme/index.html create mode 100644 public/template/blog/info.json create mode 100644 public/template/blog/preview.jpg delete mode 100644 public/template/default/set.php diff --git a/app/admin/controller/Category.php b/app/admin/controller/Category.php index 31851bb..fce504c 100644 --- a/app/admin/controller/Category.php +++ b/app/admin/controller/Category.php @@ -19,6 +19,11 @@ use think\facade\Route as Url; */ class Category extends AuthController { + protected function initialize() + { + parent::initialize(); + $this->model = new aModel(); + } /** * 分类 * @return string @@ -57,31 +62,25 @@ class Category extends AuthController { $data = Util::postMore([ ['title',''], + ['en_title',''], ['pid',0], - ['title_en',''], - ['module',''], - ['controller',''], - ['action',''], - ['params',''], - ['rank',0], - ['is_menu',1], - ['status',1] + ['type',''], + ['sort',''], + ['meta_title',''], + ['keywords',''], + ['description',0], + ['link_str',1], + ['display',1] ]); - if ($data['name'] == "") return app("json")->fail("权限名称不能为空"); - if ($data['pid'] == "") return app("json")->fail("上级归属不能为空"); - if ($data['module'] == "") return app("json")->fail("模块名不能为空"); - if ($data['controller'] == "") return app("json")->fail("控制器名不能为空"); - if ($data['action'] == "") return app("json")->fail("方法名不能为空"); - $data['path'] = '/'.$data['module'].'/'.$data['controller'].'/'.$data['action']; + if ($data['title'] == "") return app("json")->fail("分类名称不能为空"); if ($id=="") { $data['create_user'] = $this->adminId; - $data['create_time'] = time(); - $res = aModel::insert($data); + $model = new aModel(); + $res = $model->save($data); }else { $data['update_user'] = $this->adminId; - $data['update_time'] = time(); $res = aModel::update($data,['id'=>$id]); } return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败"); diff --git a/app/admin/controller/SystemConfig.php b/app/admin/controller/SystemConfig.php index 3813410..ede4156 100644 --- a/app/admin/controller/SystemConfig.php +++ b/app/admin/controller/SystemConfig.php @@ -223,6 +223,8 @@ class SystemConfig extends AuthController $data['update_time'] = time(); $res = cModel::update($data,['id'=>$id]); } + //修改完需要更新缓存 + cache('systemConfig',null);//清除缓存 return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败"); } diff --git a/app/admin/controller/Theme.php b/app/admin/controller/Theme.php new file mode 100644 index 0000000..08ba7fc --- /dev/null +++ b/app/admin/controller/Theme.php @@ -0,0 +1,70 @@ +assign("theme_list",$themeList); + return $this->fetch(); + } + + /** + * 更新主题 + * @return string + * @throws \Exception + * @author 李玉坤 + * @date 2021-02-17 11:40 + */ + public function change_theme() + { + $data = Util::postMore([ + ['value',''], + ]); + if ($data['value'] == "") return app("json")->fail("主题不能为空"); + $res = cModel::update($data,['form_name'=>'web_template']); + cache('systemConfig',null);//清除缓存 + return $res ? app("json")->success("操作成功",'code') : app("json")->fail("操作失败"); + } +} \ No newline at end of file diff --git a/app/admin/view/article/add.html b/app/admin/view/article/add.html index 63aa8bb..0ff0050 100644 --- a/app/admin/view/article/add.html +++ b/app/admin/view/article/add.html @@ -11,7 +11,7 @@
-

基本样式

+

添加文章