muzi
/
apeblog
mirror of https://github.com/1099438829/apeblog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正

This commit is contained in:
1099438829 2021-02-19 18:23:18 +08:00
parent 9ac722fbf3
commit d832049d77
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/admin/model/AdminNotify.php
View File

@ -24,13 +24,13 @@ class AdminNotify extends BaseModel
$model = new self; $model = new self;
if ($where['start_time'] != "" && $where['end_time'] != "") if ($where['start_time'] != "" && $where['end_time'] != "")
{ {
$model = $model->where("add_time","between",[strtotime($where['start_time']." 00:00:00"),strtotime($where['end_time']." 23:59:59")]); $model = $model->where("create_time","between",[strtotime($where['start_time']." 00:00:00"),strtotime($where['end_time']." 23:59:59")]);
} }
if ($where['title'] != '') $model = $model->where("title|content","like","%$where[title]%"); if ($where['title'] != '') $model = $model->where("title|content","like","%$where[title]%");
if ($where['is_read'] != '') $model = $model->where("is_read",$where['is_read']); if ($where['is_read'] != '') $model = $model->where("is_read",$where['is_read']);
if ($where['aid'] != '') $model = $model->where("aid",$where['aid']); if ($where['aid'] != '') $model = $model->where("aid",$where['aid']);
$model = $model->order("is_read"); $model = $model->order("is_read");
$model = $model->order("add_time desc"); $model = $model->order("create_time desc");
return $model->paginate(10)->appends($where); return $model->paginate(10)->appends($where);
} }
@ -57,7 +57,7 @@ class AdminNotify extends BaseModel
$model = new self; $model = new self;
$model = $model->where("is_read",0); $model = $model->where("is_read",0);
$count = self::counts($model); $count = self::counts($model);
$model = $model->order("add_time desc"); $model = $model->order("create_time desc");
$model = $model->page(1,$num); $model = $model->page(1,$num);
$data = $model->select(); $data = $model->select();
if ($data) $data = $data->toArray(); if ($data) $data = $data->toArray();

3
app/admin/model/DocumentCategory.php
View File

@ -14,9 +14,6 @@ use app\admin\model\BaseModel;
*/ */
class DocumentCategory extends BaseModel class DocumentCategory extends BaseModel
{ {
// 开启自动写入时间戳字段
protected $autoWriteTimestamp = 'datetime';
/** /**
* 列表 * 列表
* @param $where * @param $where

2
app/admin/model/ModelTrait.php
View File

@ -209,7 +209,7 @@ trait ModelTrait
* @param string $ceil * @param string $ceil
* @return array * @return array
*/ */
public static function getModelTime($where,$model=null,$prefix='add_time',$data='data',$field=' - '){ public static function getModelTime($where,$model=null,$prefix='create_time',$data='data',$field=' - '){
if ($model == null) $model = new self; if ($model == null) $model = new self;
if(!isset($where[$data])) return $model; if(!isset($where[$data])) return $model;
switch ($where[$data]){ switch ($where[$data]){

2
app/admin/view/admin_notify/index.html
View File

@ -75,7 +75,7 @@
<div class="panel-heading" role="tab" id="heading{$vo.id}"> <div class="panel-heading" role="tab" id="heading{$vo.id}">
<h4 class="panel-title"> <h4 class="panel-title">
<a role="button" class="collapsed {if $vo.is_read == 0}active{/if}" data-toggle="collapse" data-parent="#accordion" href="#collapse{$vo.id}" aria-expanded="false" aria-controls="collapse{$vo.id}" onclick="isRead('{$vo.id}')"> <a role="button" class="collapsed {if $vo.is_read == 0}active{/if}" data-toggle="collapse" data-parent="#accordion" href="#collapse{$vo.id}" aria-expanded="false" aria-controls="collapse{$vo.id}" onclick="isRead('{$vo.id}')">
{$vo.title} <span class="mytb">{$vo.add_time|date="Y-m-d H:i:s"}</span> {$vo.title} <span class="mytb">{$vo.create_time|date="Y-m-d H:i:s"}</span>
</a> </a>
</h4> </h4>
</div> </div>

6
app/admin/view/user/index.html
View File

@ -13,11 +13,11 @@
<div class="card-body"> <div class="card-body">
<form class="form-inline searchForm" onsubmit="return false;"> <form class="form-inline searchForm" onsubmit="return false;">
<div class="form-group"> <div class="form-group">
<label for="add_time">留言时间</label> <label for="create_time">留言时间</label>
<div class="input-group"> <div class="input-group">
<input class="form-control js-datetimepicker" type="text" id="add_time" name="add_time" value="" data-side-by-side="true" data-locale="zh-cn" data-format="YYYY-MM-DD" placeholder="开始时间"> <input class="form-control js-datetimepicker" type="text" id="create_time" name="create_time" value="" data-side-by-side="true" data-locale="zh-cn" data-format="YYYY-MM-DD" placeholder="开始时间">
<span class="input-group-addon">~</span> <span class="input-group-addon">~</span>
<input class="form-control js-datetimepicker" type="text" name="add_time" value="" data-side-by-side="true" data-locale="zh-cn" data-format="YYYY-MM-DD" placeholder="结束时间"> <input class="form-control js-datetimepicker" type="text" name="create_time" value="" data-side-by-side="true" data-locale="zh-cn" data-format="YYYY-MM-DD" placeholder="结束时间">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">