From e0e87a1f3bdc31c6b6c248fe77a9caaafb70f012 Mon Sep 17 00:00:00 2001
From: make <make.chaofanai@gmail.com>
Date: Fri, 18 Apr 2025 16:24:50 +0800
Subject: [PATCH] debug

---
 code/app/home/view/default/Pc/index.html | 14 ++++++++------
 code/app/services/SiteContext.php        |  2 ++
 doc/TemplateTag.md                       |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/code/app/home/view/default/Pc/index.html b/code/app/home/view/default/Pc/index.html
index 7468ff6..906eb7a 100644
--- a/code/app/home/view/default/Pc/index.html
+++ b/code/app/home/view/default/Pc/index.html
@@ -55,7 +55,7 @@
         <div class="layout layout-col1">
             <h2 class="layout-tit">经典推荐</h2>
             <ul class="txt-list txt-list-row3">
-                {foreach $arrRecommendEndNovel as $key=>$Novel }
+                {foreach $arrRecommendEndNovel as $key=>$Novel   }
                 <li>
                     <span class="s1">[{$Novel->n_category ?? ''}</span>
                     <span class="s2"><a
@@ -69,7 +69,8 @@
 
     <div class="row">
         <div class="layout">
-            {foreach $arrAllCategoryNovel as $category}
+            {foreach $arrCategoryAll as $category}
+            {foreach $arrCategoryAll as $category}
             <div class="tp-box">
                 <h2>{$category.xsfl_name}</h2> <!-- 分类标题 -->
                 <div class="top">
@@ -103,6 +104,7 @@
                 </ul>
             </div>
             {/foreach}
+            {/foreach}
         </div>
     </div>
 
@@ -110,20 +112,20 @@
         <div class="layout layout2 layout-col1 fr">
             <h2 class="layout-tit">最新入库小说</h2>
             <ul class="txt-list txt-list-row3">
-                {foreach $arrNewsNovel as $key=>$Novel }
+                {novel:list count="50" sort_type="news" d_key="d_key" d_val="Novel" p_val="page_data" cache_life="0"}
                 <li>
                     <span class="s1">[{$Novel->n_category ?? ''}]</span>
                     <span class="s2"><a
                             href='{$strPcPath}{site:nurl n_id="$Novel->n_id" n_py="$Novel->n_name_pinyin"/}'>{$Novel->n_name}</a></span>
                     <span class="s5"><a href='{site:souurl key="$Novel->n_author" p="1"/}'>{$Novel->n_author}</a></span>
                 </li>
-                {/foreach}
+                {/novel:list}
             </ul>
         </div>
         <div class="layout layout2 layout-col2 fl">
             <h2 class="layout-tit">最近更新小说列表</h2>
             <ul class="txt-list txt-list-row5">
-                {foreach $arrNewsUpdateNovel as $key=>$Novel }
+                {novel:list count="50" sort_type="update" d_key="d_key" d_val="Novel" p_val="page_data" cache_life="0"}
                 <li>
                     <span class="s1">[{$Novel->n_category ?? ''}]</span>
                     <span class="s2"><a
@@ -135,7 +137,7 @@
                     <span class="s4"><a href='{site:souurl key="$Novel->n_author" p="1"/}'>{$Novel->n_author}</a></span>
                     <span class="s5">{:date('m-d')}</span>
                 </li>
-                {/foreach}
+                {/novel:list}
 
             </ul>
         </div>
diff --git a/code/app/services/SiteContext.php b/code/app/services/SiteContext.php
index 4af3a05..0404968 100644
--- a/code/app/services/SiteContext.php
+++ b/code/app/services/SiteContext.php
@@ -5,6 +5,7 @@ namespace app\services;
 use app\model\ConverterMovel;
 use app\model\DomainModel;
 use app\model\TemplatesModel;
+use app\model\CategoryModel;
 use think\facade\Request;
 use think\facade\Config;
 use think\exception\HttpException;
@@ -82,6 +83,7 @@ class SiteContext
         View::assign('Request', $this->Request);
         View::assign('DomainModel', $this->DomainModel);
         View::assign('TemplatesModel', $this->TemplatesModel);
+        View::assign('arrCategoryAll', CategoryModel::$arrCategoryAll);
 
         ConverterMovel::setVal([
             'strSiteName' => $this->DomainModel->d_name,
diff --git a/doc/TemplateTag.md b/doc/TemplateTag.md
index 380e66f..c78a1af 100644
--- a/doc/TemplateTag.md
+++ b/doc/TemplateTag.md
@@ -82,7 +82,7 @@
 # 传参与默认值(传参用下面的变量名，名称不需要$符号, 值的话如果用第三方变量作为值，需要带$符号)：
         $count ?? '10';  # 查询条数
         $n_category ?? "all";  # 查询分类
-        $sort_type ?? "all";  # 排序方式
+        $sort_type ?? "all";  # 排序方式  news  tuijian update
         $n_status ?? "all";  # 查询状态
         $n_sex ?? "all";  # 查询性别
         $diff_key ?? "";  # 缓存键值差异