修改文档介绍，修复文档展示页的排序问题

Textloding · Textloding · commit 962097e6be84 · 2024-06-30T11:24:17.000+08:00
diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
@@ -59,17 +59,21 @@ public function show(Request $request, $slug, $version = null)
             $version = $document->versions()->where('version_number', $version)->firstOrFail();
         }
 
-        $articles = $document->has_chapters
-            ? $version->articles()->join('chapters', 'articles.chapter_id', '=', 'chapters.id')
+        if ($document->has_chapters) {
+            $chapters = $version->chapters()->orderBy('order')->get();
+            $articles = $version->articles()->join('chapters', 'articles.chapter_id', '=', 'chapters.id')
                 ->orderBy('chapters.order')
                 ->orderBy('articles.order')
                 ->select('articles.*')
                 ->with('chapter')
                 ->get()
-                ->groupBy('chapter_id')
-            : $version->articles()->orderBy('order')->get();
+                ->groupBy('chapter_id');
+        } else {
+            $chapters = collect([]);
+            $articles = $version->articles()->orderBy('order')->get();
+        }
 
-        return view('documents.show', compact('document', 'version', 'articles'));
+        return view('documents.show', compact('document', 'version', 'articles', 'chapters'));
     }
 
 }
diff --git a/resources/views/documents/show.blade.php b/resources/views/documents/show.blade.php
@@ -157,19 +157,19 @@
     </div>
     <div class="articles">
         @if($document->has_chapters)
-            @foreach($version->chapters as $chapter)
-                <div class="chapter">
-                    <div class="chapter-title">第{{ $chapter->order }}章: {{ $chapter->title }}</div>
-                    <div class="articles-list">
-                        @if(isset($articles[$chapter->id]) && $articles[$chapter->id]->isNotEmpty())
-                            @foreach($articles[$chapter->id] as $article)
-                                <a href="{{ route('articles.show', ['document_slug' => $document->slug, 'version' => $version->version_number, 'article_slug' => $article->slug, 'article_id' => $article->id]) }}" class="article-link">{{ $chapter->order }}.{{ $article->order }} {{ $article->title }}</a>
-                            @endforeach
-                        @else
-                            <div class="article-title">暂无文章</div>
-                        @endif
-                    </div>
+            @foreach($chapters as $chapter)  <!-- 使用排序后的章节 -->
+            <div class="chapter">
+                <div class="chapter-title">第{{ $chapter->order }}章: {{ $chapter->title }}</div>
+                <div class="articles-list">
+                    @if(isset($articles[$chapter->id]) && $articles[$chapter->id]->isNotEmpty())
+                        @foreach($articles[$chapter->id] as $article)
+                            <a href="{{ route('articles.show', ['document_slug' => $document->slug, 'version' => $version->version_number, 'article_slug' => $article->slug, 'article_id' => $article->id]) }}" class="article-link">{{ $chapter->order }}.{{ $article->order }} {{ $article->title }}</a>
+                        @endforeach
+                    @else
+                        <div class="article-title">暂无文章</div>
+                    @endif
                 </div>
+            </div>
             @endforeach
         @else
             <div class="articles-list">
