Kaynağa Gözat

Merge pull request #2385 from visuddhinanda/development

Development
visuddhinanda 6 gün önce
ebeveyn
işleme
87b51e5020

+ 2 - 7
api-v13/app/Http/Controllers/Library/AnthologyReadController.php

@@ -55,13 +55,8 @@ class AnthologyReadController extends Controller
         $artResource = $artResult['data'];
         $artArray    = $artResource->toArray($fakeRequest);
 
-        // content 统一包装成 book.read 期望的格式:
-        // [ ['id'=>..., 'level'=>1, 'text'=>[[ html_string ]]], ... ]
-        $content = [[
-            'id'    => $articleId,
-            'level' => 100,
-            'text'  => [[$artArray['html'] ?? $artArray['content'] ?? 'null']],
-        ]];
+
+        $content = $artArray['html'] ?? $artArray['content'] ?? 'null';
 
         // ── 4. 计算翻页(pagination) ─────────────────────────────────────────
 

+ 4 - 2
api-v13/resources/views/library/book/read.blade.php

@@ -139,7 +139,7 @@
         <button type="button" class="btn-close" data-bs-dismiss="offcanvas"></button>
     </div>
     <div class="offcanvas-body">
-        @include('library.book._toc', ['toc' => $book['toc'] ?? []])
+        @include('library.book.toc', ['toc' => $book['toc'] ?? []])
     </div>
 </div>
 
@@ -151,7 +151,7 @@
         <div class="toc-sidebar card">
             <div class="card-body">
                 <h5>目录</h5>
-                @include('library.book._toc', ['toc' => $book['toc'] ?? []])
+                @include('library.book.toc', ['toc' => $book['toc'] ?? []])
             </div>
         </div>
 
@@ -295,6 +295,7 @@
                         <option value="thai">泰文</option>
                     </select>
                 </div>
+                @isset($commentaryChannels)
                 <div class="mb-4">
                     <label class="form-label">注疏版本</label>
                     <select class="form-select" id="commentary">
@@ -304,6 +305,7 @@
                         @endforeach
                     </select>
                 </div>
+                @endisset
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-link" data-bs-dismiss="modal">取消</button>

+ 1 - 1
api-v13/resources/views/library/layouts/app.blade.php

@@ -9,7 +9,7 @@
     <title>@yield('title', '巴利书库')</title>
     @stack('styles')
 
-    @vite(['resources/css/main.css', 'resources/js/app.js'])
+    @vite(['resources/js/app.js'])
 
 </head>
 

+ 0 - 1
api-v13/vite.config.ts

@@ -16,7 +16,6 @@ export default defineConfig({
                 'resources/css/modules/tipitaka.css',
                 'resources/css/modules/anthology.css',
                 'resources/css/reader.css', // 全站阅读页(待建)
-                // 'resources/css/main.css', // 全站阅读页(待建)
                 'resources/js/app.js',
                 'resources/js/reader.js',
                 'resources/js/modules/term-tooltip.js',