diff --git a/app/admin/controller/Article.php b/app/admin/controller/Article.php index 6aa980e..e87d10b 100644 --- a/app/admin/controller/Article.php +++ b/app/admin/controller/Article.php @@ -114,8 +114,17 @@ class Article extends AuthController if (!$ainfo)return app("json")->fail("数据不存在"); aModel::where('id',$id)->save($data); if (!empty($content)){ - //更新文档 - DocumentArticle::where('id',$id)->save(['content'=>$content]); + $contentInfo = DocumentArticle::where('id',$id)->find(); + if (!$contentInfo){ + $updateData = [ + 'id' => $id, + 'content' => $content + ]; + DocumentArticle::insert($updateData); + }else{ + //更新文档 + DocumentArticle::where('id',$id)->save(['content'=>$content]); + } } } $res = true; @@ -184,7 +193,12 @@ class Article extends AuthController $category = cModel::systemPage($where); $category = get_tree_list($category); $info = aModel::get($where['id']); - $info->content = DocumentArticle::get($where['id'])->content; + $content = DocumentArticle::get($where['id']); + if ($content){ + $info->content = $content->content; + }else{ + $info->content = ''; + } $this->assign("category",$category); $this->assign("info",$info); return $this->fetch(); diff --git a/app/admin/view/article/add.html b/app/admin/view/article/add.html index 0ff0050..09a836d 100644 --- a/app/admin/view/article/add.html +++ b/app/admin/view/article/add.html @@ -216,6 +216,9 @@ $(".add-form").submit(function () { let Arr = $('.add-form').serializeArray(); let checkResult = true; + let content= tinyMCE.activeEditor.getContent(); + $("#content").val(content); + $.each(Arr,function (index,item) { try { switch (item.name) { diff --git a/app/admin/view/article/edit.html b/app/admin/view/article/edit.html index d07b335..465e2c9 100644 --- a/app/admin/view/article/edit.html +++ b/app/admin/view/article/edit.html @@ -230,6 +230,8 @@ $(".add-form").submit(function () { let Arr = $('.add-form').serializeArray(); let checkResult = true; + let content= tinyMCE.activeEditor.getContent(); + $("#content").val(content); $.each(Arr,function (index,item) { try { switch (item.name) { diff --git a/public/template/default/pc/index/index.html b/public/template/default/pc/index/index.html index c7fe02a..79f1775 100644 --- a/public/template/default/pc/index/index.html +++ b/public/template/default/pc/index/index.html @@ -21,8 +21,11 @@
@@ -713,7 +248,7 @@
-

近期热门

+

近期热门https://www.zyxpp.com/wp-admin/admin-ajax.php