diff --git a/app/common/model/Message.php b/app/common/model/Message.php index 4d09542..2c1c6f7 100644 --- a/app/common/model/Message.php +++ b/app/common/model/Message.php @@ -7,11 +7,8 @@ use think\model\concern\SoftDelete; class Message extends Model { use SoftDelete; - protected $pk = 'id'; //主键 - protected $autoWriteTimestamp = true; //开启自动时间戳 - protected $createTime = 'create_time'; - protected $updateTime = 'update_time'; protected $deleteTime = 'delete_time'; + protected $defaultSoftDelete = 0; //用户关联评论 public function user() diff --git a/app/common/model/MessageTo.php b/app/common/model/MessageTo.php index 1872a9e..faf8718 100644 --- a/app/common/model/MessageTo.php +++ b/app/common/model/MessageTo.php @@ -7,11 +7,9 @@ use think\Db; class MessageTo extends Model { - protected $pk = 'id'; //主键 - protected $autoWriteTimestamp = true; //开启自动时间戳 - protected $createTime = 'create_time'; - protected $updateTime = 'update_time'; - + use SoftDelete; + protected $deleteTime = 'delete_time'; + protected $defaultSoftDelete = 0; //用户关联评论 public function user() { diff --git a/view/index/article/add.html b/view/index/article/add.html index 2f9347a..ef1ac5d 100644 --- a/view/index/article/add.html +++ b/view/index/article/add.html @@ -213,7 +213,7 @@ layui.use('form', function(){ }); {/block} \ No newline at end of file diff --git a/view/index/article/detail.html b/view/index/article/detail.html index e551c89..ff24697 100644 --- a/view/index/article/detail.html +++ b/view/index/article/detail.html @@ -1,10 +1,8 @@ - {extend name="public/base" /} - {block name="title"}{$article.title}-{$sysInfo.webname}{/block} {block name="keywords"}{$article.title},{$article.tags}{/block} {block name="description"}{$article.title},{:getArtContent($article.content)}{/block} -{block name="column"}{include file="/public/column" /}{/block} +{block name="column"}
{/block} {block name="content"}