Merge remote-tracking branch 'origin/master'

app/Http/Controllers/PageController.php

@@ -36,6 +36,7 @@ class PageController extends Controller
     public function detail($slug)
     {
 
+        $recent_pages=null;
 
         $page = SitePage::where('status', '1')->where('dist_id', getDistId())->where('slug', $slug)->orWhere('id', $slug)->first();
 
@@ -55,12 +56,14 @@ class PageController extends Controller
             $previousPage = SitePage::where('dist_id', getDistId())
                 ->where('status', '1')
                 ->where('id', '<', $page->id)
+                ->where('page_type',0)
                 ->orderBy('id', 'desc')
                 ->first();
 
             $nextPage = SitePage::where('dist_id', getDistId())
                 ->where('status', '1')
                 ->where('id', '>', $page->id)
+                ->where('page_type',0)
                 ->orderBy('id', 'asc')
                 ->first();
 
@@ -68,9 +71,24 @@ class PageController extends Controller
             $paginator = [
                 'previous_page' => $previousPage ? true : false, // 是否有上一页
                 'previous_page_url' => $previousPage ? "/pages/" . ($previousPage->slug ?: $previousPage->id) : null, // 上一页的 URL
+                'previous_page_title' => $previousPage ? $previousPage->title : null, // 上一页的标题
                 'next_page' => $nextPage ? true : false, // 是否有下一页
-                'next_page_url' => $nextPage ? "/pages/" . ($nextPage->slug ?: $nextPage->id) : null // 下一页的 URL
+                'next_page_url' => $nextPage ? "/pages/" . ($nextPage->slug ?: $nextPage->id) : null, // 下一页的 URL
+                'next_page_title' => $nextPage ? $nextPage->title : null, // 下一页的标题
             ];
+
+            //Recent post
+            //获取最近的文章 数量有限制，当前文章不要放进去
+            $recent_pages_limit=10;
+            $recent_pages = SitePage::where('dist_id', getDistId())
+                ->where('status', '1')
+                ->where('id', '!=', $page->id)
+                ->where('page_type',0)
+                ->orderBy('id', 'desc')
+                ->limit($recent_pages_limit)
+                ->get();
+
+
         }
         else{
             $paginator = [];
@@ -109,6 +127,7 @@ class PageController extends Controller
         return $this->liquidRenderer->render($template_file,
             [
                 'page' => $page,
+                'recent_pages' => $recent_pages,
                 'breadcrumbs' => $breadcrumbs,
                 'paginator' => $paginator,
                 'csrf_token' => csrf_token(),