diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php index e289d35..13f6b45 100644 --- a/app/index/controller/Common.php +++ b/app/index/controller/Common.php @@ -44,8 +44,8 @@ class Common extends BaseController $top_posts = Post::where('is_top', 1)->limit(8)->where('type', 3)->cacheAlways('top_post')->select(); View::assign('top_posts', $top_posts); - $list_site_last_visit = PostVisit::order('id desc') - ->group('ip,uid') + $list_site_last_visit = PostVisit::with(['post'])->order('id desc') + ->group('post_id,ip,uid') ->limit(6) ->cache(60) ->select(); @@ -59,6 +59,12 @@ class Common extends BaseController View::assign('total_week_hits', $total_week_hits); View::assign('total_day_hits', $total_day_hits); + $total_post_count = Post::cache(60)->where('status', 1)->where('type', 3)->count(); + View::assign('total_post_count', $total_post_count); + + $total_month_post_count = Post::cache(60)->where('status', 1)->where('type', 3)->where('publish_time', '>', strtotime(date('Y-m-1 00:00:00')))->count(); + View::assign('total_month_post_count', $total_month_post_count); + $this->userHubLogin(); } diff --git a/app/model/PostVisit.php b/app/model/PostVisit.php index 614c6b5..8adaeb3 100644 --- a/app/model/PostVisit.php +++ b/app/model/PostVisit.php @@ -14,6 +14,11 @@ class PostVisit extends Model { // + public function post() + { + return $this->belongsTo(Post::class, 'post_id'); + } + public function getAvatarSrcAttr() { $value = $this->getAttr('avatar'); diff --git a/view/index/common/_right.html b/view/index/common/_right.html index 48a65f4..dca7991 100644 --- a/view/index/common/_right.html +++ b/view/index/common/_right.html @@ -32,12 +32,13 @@ {/volist} - +