debug

2025-04-20 21:50:58 +08:00
parent 34206fe268
commit 3216cffb5e
15 changed files with 352 additions and 233 deletions
--- a/code/app/home/config/router.php
+++ b/code/app/home/config/router.php
@@ -80,9 +80,12 @@ $arrRoutes = [
        // 书库
        'library' => [
            /**
+             * /shuku/nansheng-xiaoshuo/all/all/all/page1
+             * '/:strGender?/:strCategory?/:strStatus?/:strOrder?/:intPage?';
             * 完整路由
             * 使用： {site:nflurl gender="$strGender" category="$CategoryPinyin"  status="all" order="all" page="1"/}
             */
+            // '/shuku/:strGender?/:strCategory?/:strStatus?/:strOrder?/page:intPage?',
            '/shuku/:strGender/:strCategory/:strStatus/:strOrder/page:intPage',
            '/books/:strGender/:strCategory/:strStatus/:strOrder/page:intPage',
            '/library/:strGender/:strCategory/:strStatus/:strOrder/page:intPage',
@@ -109,12 +112,12 @@ $arrRoutes = [
             * 使用 ：gender 传空/或者不传，控制器会默认值是 all 
             * {site:nflurl gender="" category="$CategoryPinyin"  status="all" order="all" page="1"/}
             */
-            '/shuku/:strCategory/:strStatus/page:intPage',
-            '/books/:strCategory/:strStatus/page:intPage',
-            '/library/:strCategory/:strStatus/page:intPage',
-            '/fenlei/:strCategory/:strStatus/page:intPage',
-            '/class/:strCategory/:strStatus/page:intPage',
-            '/category/:strCategory/:strStatus/page:intPage',
+            // '/shuku/:strCategory/:strStatus/page:intPage',
+            // '/books/:strCategory/:strStatus/page:intPage',
+            // '/library/:strCategory/:strStatus/page:intPage',
+            // '/fenlei/:strCategory/:strStatus/page:intPage',
+            // '/class/:strCategory/:strStatus/page:intPage',
+            // '/category/:strCategory/:strStatus/page:intPage',

            /**
             * default 模板
@@ -122,12 +125,12 @@ $arrRoutes = [
             * 使用 ：gender 传空/或者不传，控制器会默认值是 all 
             * {site:nflurl gender="" category="$CategoryPinyin"  status="all" order="all" page="1"/}
             */
-            '/shuku/:strCategory/:strOrder/page:intPage',
-            '/books/:strCategory/:strOrder/page:intPage',
-            '/library/:strCategory/:strOrder/page:intPage',
-            '/fenlei/:strCategory/:strOrder/page:intPage',
-            '/class/:strCategory/:strOrder/page:intPage',
-            '/category/:strCategory/:strOrder/page:intPage',
+            // '/shuku/:strCategory/:strOrder/page:intPage',
+            // '/books/:strCategory/:strOrder/page:intPage',
+            // '/library/:strCategory/:strOrder/page:intPage',
+            // '/fenlei/:strCategory/:strOrder/page:intPage',
+            // '/class/:strCategory/:strOrder/page:intPage',
+            // '/category/:strCategory/:strOrder/page:intPage',
            

            /**
@@ -136,12 +139,12 @@ $arrRoutes = [
             * 使用 ：gender 传空/或者不传，控制器会默认值是 all 
             * {site:nflurl gender="" category="$CategoryPinyin"  status="all" order="all" page="1"/}
             */
-            '/shuku/:strCategory/page:intPage',
-            '/books/:strCategory/page:intPage',
-            '/library/:strCategory/page:intPage',
-            '/fenlei/:strCategory/page:intPage',
-            '/class/:strCategory/page:intPage',
-            '/category/:strCategory/page:intPage',
+            // '/shuku/:strCategory/page:intPage',
+            // '/books/:strCategory/page:intPage',
+            // '/library/:strCategory/page:intPage',
+            // '/fenlei/:strCategory/page:intPage',
+            // '/class/:strCategory/page:intPage',
+            // '/category/:strCategory/page:intPage',

            /**
             * kuangyu 模板
@@ -155,6 +158,13 @@ $arrRoutes = [
            '/fenlei/:strGender/:strCategory/:strStatus/page:intPage',
            '/class/:strGender/:strCategory/:strStatus/page:intPage',
            '/category/:strGender/:strCategory/:strStatus/page:intPage',
+
+            // '/shuku/:strGender/page:intPage',
+            // '/books/:strGender/page:intPage',
+            // '/library/:strGender/page:intPage',
+            // '/fenlei/:strGender/page:intPage',
+            // '/class/:strGender/page:intPage',
+            // '/category/:strGender/page:intPage',
        ],
        // 书库首页
        'library-index' => [
@@ -267,11 +277,14 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) {
                            return view($strView);
                        })
                        ->pattern([
-                            // 'strGender' => '[a-z\-]+',
-                            'strCategory' => '[a-z\-]+',
-                            'strStatus' => 'all|lianzai|wanjie',
-                            // 'strOrder' => '[a-z\-]+',
-                            'intPage' => '\d+'
+                            'strGender' => '[a-z\-]*', // 允许空值
+                            'strCategory' => '[a-z\-]*', // 允许空值
+                            'strStatus' => '(all|lianzai|wanjie)?', // 允许空值
+                            'strOrder' => '[a-z\-]*', // 允许空值
+                            'intPage' => '\d*', // 允许空值
+                            // 'strCategory' => 'all|xuanhuan-xiuzhen|junshi-xiaoshuo|wangyou-xiaoshuo|kehuan-xiaoshuo|zhongsheng-chuanyue|dushi-xiaoshuo|lingyi-xiaoshuo|yanqing-xiaoshuo|qita-xiaoshuo',
+
+
                        ]);
                        break;

@@ -305,7 +318,7 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) {
                        } 
                        Route::get($strRoute, function () use ($strView) {
                            return view($strView);
-                        })->append(['strChannel' => 'boys']);
+                        })->append(['strChannel' => 'man']);

                        //Route::get($strRoute,  [Novel::class, 'getNovelChannel'])->append(['boolIsMobile' => $boolIsMobile, 'strChannel' => 'boys']);
                        break;
@@ -318,7 +331,7 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) {
                        } 
                        Route::get($strRoute, function () use ($strView) {
                            return view($strView);
-                        })->append(['strChannel' => 'girls']);
+                        })->append(['strChannel' => 'women']);

                        //Route::get($strRoute,  [Novel::class, 'getNovelChannel'])->append(['boolIsMobile' => $boolIsMobile, 'strChannel' => 'girls']);
                        break;
--- a/code/app/home/view/default/Novel/getLibrary.html
+++ b/code/app/home/view/default/Novel/getLibrary.html
@@ -4,6 +4,43 @@
 {block name="keywords"}{site:replace code="NOVEL@GETLIBRARY@KEYWORDS"}{/block}
 {block name="description"}{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}{/block}

+{block name="head"}
+<!-- 社交媒体标签 -->
+<meta property="og:title" content='{site:replace code="NOVEL@GETLIBRARY@TITLE"}' />
+<meta property="og:description" content='{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}' />
+{if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'}
+<meta property="og:url" content="https://{$DomainModel->d_domain}{$strCategoryIndexUrlTemp}" />
+{else}
+
+<meta property="og:url"
+    content='https://{$DomainModel->d_domain}{site:nflurl  category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}' />
+{/if}
+<meta property="og:type" content="book" />
+<!-- 结构化数据 -->
+{if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'}
+<script type="application/ld+json">
+    {
+      "@context": "https://{$DomainModel->d_domain}{$strCategoryIndexUrlTemp}",
+      "@type": "book",
+      "headline": '{site:replace code="NOVEL@GETLIBRARY@TITLE"}'
+      "description": '{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}',
+      "datePublished": "{:date('Y-m-d')}"
+    }
+</script>
+{else}
+<script type="application/ld+json">
+    {
+      "@context": 'https://{$DomainModel->d_domain}{site:nflurl  category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}',
+      "@type": "book",
+      "headline": '{site:replace code="NOVEL@GETLIBRARY@TITLE"}',
+      "description": '{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}',
+      "datePublished": "{:date('Y-m-d')}"
+    }
+</script>
+{/if}
+
+{/block}
+
 {block name="head-js"}{/block}
 {block name='nav-active-class'}home{/block}
 {block name="body-class"}novel_home{/block}
--- a/code/app/home/view/kuangYu/basePc.html
+++ b/code/app/home/view/kuangYu/basePc.html
@@ -35,10 +35,10 @@
                <li class=' {if $strPageCode == "home"}on{/if} '>
                    <a href="{$strPcPath}/" target="_self" title="首页">首页</a>
                </li>
-                <li class=' {if $strPageCode == "boys"}on{/if} '>
+                <li class=' {if $strPageCode == "man"}on{/if} '>
                    <a href="{$strPcPath}{$strNanUrlTemp}" target="_self" title="男生">男生</a>
                </li>
-                <li class=' {eq name="strPageCode" value="girls"}on {/eq}'>
+                <li class=' {eq name="strPageCode" value="women"}on {/eq}'>
                    <a href="{$strPcPath}{$strNvUrlTemp}" target="_self" title="女生">女生</a>
                </li>
                <li class=' {eq name="strPageCode" value="library"}on {/eq}'>
--- a/code/app/home/view/kuangYu/novel/getLibrary.html
+++ b/code/app/home/view/kuangYu/novel/getLibrary.html
@@ -1,54 +1,71 @@
 {extend name="baseH5" /}
-{block name="title"}{$strTitle??''}{/block}
-{block name="keywords"}{$strKeywords??''}{/block}
-{block name="description"}{$strDescription??''}{/block}
+
+{block name="title"}{site:replace code="NOVEL@GETLIBRARY@TITLE"}{/block}
+{block name="keywords"}{site:replace code="NOVEL@GETLIBRARY@KEYWORDS"}{/block}
+{block name="description"}{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}{/block}
+
 {block name="head"}
 <!-- 社交媒体标签 -->
-<meta property="og:title" content="{$strTitle??''}" />
-<meta property="og:description" content="{$strDescription??''}" />
-{if $strGender == 'all' && $strCategory == 'all' && $strStatus == 'all'}
+<meta property="og:title" content='{site:replace code="NOVEL@GETLIBRARY@TITLE"}' />
+<meta property="og:description" content='{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}' />
+{if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'}
 <meta property="og:url" content="https://{$DomainModel->d_domain}{$strCategoryIndexUrlTemp}" />
 {else}
-<meta property="og:url"
-    content='https://{$DomainModel->d_domain}{site:nflurl gender="$strGender" category="$strCategory"  status="$strStatus" page="$intPage"/}' />
-{/if}

+<meta property="og:url"
+    content='https://{$DomainModel->d_domain}{site:nflurl gender="$Request.route.strGender" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}' />
+{/if}
 <meta property="og:type" content="book" />
 <!-- 结构化数据 -->
-{if $strGender == 'all' && $strCategory == 'all' && $strStatus == 'all'}
+{if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'}
 <script type="application/ld+json">
    {
      "@context": "https://{$DomainModel->d_domain}{$strCategoryIndexUrlTemp}",
      "@type": "book",
-      "headline": "{$strTitle??''}",
-      "description": "{$strDescription??''}",
+      "headline": '{site:replace code="NOVEL@GETLIBRARY@TITLE"}',
+      "description": '{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}',
      "datePublished": "{:date('Y-m-d')}"
    }
 </script>
 {else}
 <script type="application/ld+json">
    {
-      "@context": "https://{$DomainModel->d_domain}{site:nflurl gender="$strGender" category="$strCategory"  status="$strStatus" page="$intPage"/}",
+      "@context": 'https://{$DomainModel->d_domain}{site:nflurl gender="$Request.route.strGender" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}',
      "@type": "book",
-      "headline": "{$strTitle??''}",
-      "description": "{$strDescription??''}",
+      "headline": '{site:replace code="NOVEL@GETLIBRARY@TITLE"}',
+      "description": '{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}',
      "datePublished": "{:date('Y-m-d')}"
    }
 </script>
 {/if}

 {/block}
+
 {block name="head-js"}{/block}

 {block name="logo-html"}
 <h1 class="logo">
-    <a href="/">{$DomainModel->d_name}-{$strNovelSex}{$strSearchCategory}{$strSearchStatus}免费阅读</a>
+    <a href="/">{$DomainModel->d_name}-{$Request.route.strGender}{$Request.route.strCategory}{$Request.route.strStatus}免费阅读</a>
 </h1>
 {/block}

+{block name="strPageCode"}
+    <?php $strPageCode = 'library'; ?>
+{/block}
+
 {block name="main"}
+
+{novel:pagerexp page="$Request.get.page" limit="30"
+n_category="$Request.route.strCategory"
+n_sex="$Request.route.strGender"
+n_status="$Request.route.strStatus" 
+d_key="d_key" 
+button_num="10" cache_life="86400" func="generateCategoryPager" export_name="resData" /}
+
+{site:grm page_code="pc_novel_library" diff="$resData.p_data.page" num="70" g_key="arrGrm" /}
+
 <div class="wrap">
-    <p class="site-description">{$strDescription??''}</p>
+    <p class="site-description">{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}</p>
    <nav class="breadcrumb" aria-label="breadcrumb">
        <ol itemscope itemtype="https://schema.org/BreadcrumbList">
            <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
@@ -70,16 +87,16 @@
    <div class="mod mod-nav">
        <div id="book-nav" class="book-nav">
            <ul class="clearfix">
-                <li class='{eq name="strGender" value="all"}on {/eq}'>
-                    <a href='{site:nflurl gender="all" category="$strCategory"  status="$strStatus" page="$intPage"/}'
+                <li class='{eq name="$Request.route.strGender" value="all"}on {/eq} {eq name="$Request.route.strGender" value=""}on  {/eq}'>
+                    <a href='{site:nflurl gender="all" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
                        title="全部">全部</a>
                </li>
-                <li class='{eq name="strGender" value="$strNanUrl"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strNanUrlTemp" category="$strCategory"  status="$strStatus" page="$intPage"/}'
+                <li class='{eq name="$Request.route.strGender" value="$strNanUrl"}on {/eq}'>
+                    <a href='{site:nflurl gender="$strNanUrl" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
                        title="男生">男生</a>
                </li>
-                <li class='{eq name="strGender" value="$strNvUrl"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strNvUrlTemp" category="$strCategory"  status="$strStatus" page="$intPage"/}'
+                <li class='{eq name="$Request.route.strGender" value="$strNvUrl"}on {/eq}'>
+                    <a href='{site:nflurl gender="$strNvUrl" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
                        title="女生">女生</a>
                </li>
            </ul>
@@ -87,56 +104,52 @@
        <div id="book-nav" class="book-nav">
            <ul class="clearfix">

-                <li class='{eq name="strCategory" value="all"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strGender" category="all"  status="$strStatus" page="$intPage"/}'
+                <li class='{eq name="$Request.route.strCategory" value="all"}on {/eq} {eq name="$Request.route.strCategory" value=""}on  {/eq}'>
+                    <a href='{site:nflurl gender="$Request.route.strGender" category="all"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
                        btn="search_category">全部</a>
                </li>
-                {eq name="strGender" value="all"}
-                {foreach $arrCategoryAll.man as $key=>$vo }
-                <li class='{eq name="key" value="$strCategory"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strGender" category="$key"  status="$strStatus" page="$intPage"/}'
-                        btn="search_category">{$vo}</a>
+                {if $Request.route.strGender == "all" || $Request.route.strGender == ""}
+                {novel:category d_key="strCategoryPinyin" d_val="strCategoryName"}
+                <li class='{eq name="strCategoryPinyin" value="$Request.route.strCategory"}on {/eq}'>
+                    <a href='{site:nflurl gender="$Request.route.strGender" category="$strCategoryPinyin"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
+                        btn="search_category">{$strCategoryName}</a>
                </li>
-                {/foreach}
-                {foreach $arrCategoryAll.women as $key=>$vo }
-                <li class='{eq name="key" value="$strCategory"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strGender" category="$key"  status="$strStatus" page="$intPage"/}'
-                        btn="search_category">{$vo}</a>
+                {/novel:category}
+                {/if}
+
+                {eq name="$Request.route.strGender" value="$strNanUrl"}
+                    {novel:category d_key="strCategoryPinyin" d_val="strCategoryName" n_sex="man"}
+                <li class='{eq name="strCategoryPinyin" value="$Request.route.strCategory"}on {/eq}'>
+                    <a href='{site:nflurl gender="$Request.route.strGender" category="$strCategoryPinyin"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
+                        btn="search_category">{$strCategoryName}</a>
                </li>
-                {/foreach}
+                {/novel:category}
                {/eq}
-                {eq name="strGender" value="$strNanUrl"}
-                {foreach $arrCategoryAll.women as $key=>$vo }
-                <li class='{eq name="key" value="$strCategory"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strGender" category="$key"  status="$strStatus" page="$intPage"/}'
-                        btn="search_category">{$vo}</a>
+
+                {eq name="$Request.route.strGender" value="$strNvUrl"}
+                    {novel:category d_key="strCategoryPinyin" d_val="strCategoryName" n_sex="women"}
+                <li class='{eq name="strCategoryPinyin" value="$Request.route.strCategory"}on {/eq}'>
+                    <a href='{site:nflurl gender="$Request.route.strGender" category="$strCategoryPinyin"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
+                        btn="search_category">{$strCategoryName}</a>
                </li>
-                {/foreach}
-                {/eq}
-                {eq name="strGender" value="$strNvUrl"}
-                {foreach $arrCategoryAll.women as $key=>$vo }
-                <li class='{eq name="key" value="$strCategory"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strGender" category="$key"  status="$strStatus" page="$intPage"/}'
-                        btn="search_category">{$vo}</a>
-                </li>
-                {/foreach}
-                {/eq}
+                {/novel:category}
+                    {/eq}


            </ul>
        </div>
        <div id="book-nav" class="book-nav">
            <ul class="clearfix">
-                <li class='{eq name="strStatus" value="all"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strGender" category="$strCategory"  status="all" page="$intPage"/}'
+                <li class='{eq name="$Request.route.strStatus" value="all"}on {/eq} {eq name="$Request.route.strStatus" value=""}on  {/eq}'>
+                    <a href={site:nflurl gender="$Request.route.strGender" category="$Request.route.strCategory"  status="all" page="$Request.route.intPage"/}'
                        btn="search_category">全部</a>
                </li>
-                <li class='{eq name="strStatus" value="lianzai"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strGender" category="$strCategory"  status="lianzai" page="$intPage"/}'
+                <li class='{eq name="$Request.route.strStatus" value="lianzai"}on {/eq}'>
+                    <a href={site:nflurl gender="$Request.route.strGender" category="$Request.route.strCategory"  status="lianzai" page="$Request.route.intPage"/}'
                        btn="search_category">连载</a>
                </li>
-                <li class='{eq name="strStatus" value="wanjie"}on {/eq}'>
-                    <a href='{site:nflurl gender="$strGender" category="$strCategory"  status="wanjie" page="$intPage"/}'
+                <li class='{eq name="$Request.route.strStatus" value="wanjie"}on {/eq}'>
+                    <a href={site:nflurl gender="$Request.route.strGender" category="$Request.route.strCategory"  status="wanjie" page="$Request.route.intPage"/}'
                        btn="search_category">完本</a>
                </li>
            </ul>
@@ -145,7 +158,7 @@
    <div class="mod new-book">
        <div class="book-list">
            <ul class="clearfix">
-                {volist name="arrNovel" id="Novel" key="key"}
+                {volist name="$resData.data" id="Novel" key="key"}
                {include file="public/novelListH" start="0"/}
                {/volist}
            </ul>
@@ -153,17 +166,17 @@

        <div class="pages">
            <ul class="pager">
-                {volist name="arrPaginator" id="vo" key="k"}
+                {volist name="$resData.p_data.pager" id="vo" key="k"}
                {switch $vo.label}
                {case value="上一页"}
-                {if $intPage == 1}
+                {if $resData.p_data.page == 1}
                <li class="disabled"><span>«</span></li>
                {else}
                <li><a href="{$vo.url}">«</a></li>
                {/if}
                {/case}
                {case value="下一页"}
-                {if $intPage >= $intTotalPage}
+                {if $resData.p_data.page >= $resData.p_data.total}
                <li class="disabled"><span>»</span></li>
                {else}
                <li><a href="{$vo.url}">»</a></li>
--- a/code/app/home/view/kuangYu/novel/getNovelChannel.html
+++ b/code/app/home/view/kuangYu/novel/getNovelChannel.html
@@ -1,22 +1,28 @@
 {extend name="baseH5" /}
-{block name="title"}{$strTitle??''}{/block}
-{block name="keywords"}{$strKeywords??''}{/block}
-{block name="description"}{$strDescription??''}{/block}
+
+{block name="title"}{site:replace code="NOVEL@GETNOVELCHANNEL@TITLE"}{/block}
+{block name="keywords"}{site:replace code="NOVEL@GETNOVELCHANNEL@KEYWORDS"}{/block}
+{block name="description"}{site:replace code="NOVEL@GETNOVELCHANNEL@DESCRIPTION"}{/block}
+
 {block name="head"}
+<?php 
+$strPageCode = $Request->param('strChannel');
+
+?>
 <!-- 社交媒体标签 -->
-<meta property="og:title" content="{$strTitle??''}" />
-<meta property="og:description" content="{$strDescription??''}" />
+<meta property="og:title" content='{site:replace code="NOVEL@GETNOVELCHANNEL@TITLE"}' />
+<meta property="og:description" content='{site:replace code="NOVEL@GETNOVELCHANNEL@DESCRIPTION"}' />
 <meta property="og:url"
-    content="https://{$DomainModel->d_domain}{$strPageCode == 'boys' ? $strNanUrlTemp : $strNvUrlTemp }" />
+    content="https://{$DomainModel->d_domain}{$strPageCode == 'man' ? $strNanUrlTemp : $strNvUrlTemp }" />
 <meta property="og:type" content="book" />
 <!-- 结构化数据 -->
 <script type="application/ld+json">
 {
   @context": "https://schema.org”,
  "@type": "book",
-  "headline": "{$strTitle??''}",
-  "description": "{$strDescription??''}",
-  "url": "https://{$DomainModel->d_domain}/{$strPageCode == 'boys' ? $strNanUrlTemp : $strNvUrlTemp }",
+  "headline": '{site:replace code="NOVEL@GETNOVELCHANNEL@TITLE"}',
+  "description": '{site:replace code="NOVEL@GETNOVELCHANNEL@DESCRIPTION"}',
+  "url": "https://{$DomainModel->d_domain}/{$strPageCode == 'man' ? $strNanUrlTemp : $strNvUrlTemp }",
  "datePublished": "{:date('Y-m-d')}"
 }
 </script>
@@ -25,7 +31,7 @@

 {block name="logo-html"}
 <h1 class="logo">
-    {eq name="strPageCode" value="boys"}
+    {eq name="strPageCode" value="man"}
    <a href="/">{$DomainModel->d_name}-男生小说免费阅读</a>
    {else}
    <a href="/">{$DomainModel->d_name}-女生小说免费阅读</a>
@@ -34,10 +40,13 @@
 {/block}

 {block name="main"}
+
+{site:grm page_code="pc_index" diff="0" num="50" g_key="arrGrm"  /}
+
 <!--wrap-->
 <div class="wrap">

-    <p class="site-description">{$strDescription??''}</p>
+    <p class="site-description">{site:replace code="NOVEL@GETNOVELCHANNEL@DESCRIPTION"}</p>

    <nav class="breadcrumb" aria-label="breadcrumb">
        <ol itemscope itemtype="https://schema.org/BreadcrumbList">
@@ -48,7 +57,7 @@
                <meta itemprop="position" content="1" />
            </li>
            <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
-                {eq name="strPageCode" value="boys"}
+                {eq name="strPageCode" value="man"}
                <a href="{$strNanUrlTemp}" itemprop="item">
                    <span itemprop="name">男生</span>
                </a>
@@ -69,9 +78,9 @@
        </div>
        <div class="book-slide">
            <ul class="clearfix">
-                {volist name="arrRecommendSerializationNovel" id="Novel" key="key"}
+                {novel:list count="8" sort_type="tuijian" n_status="lianzai" n_sex="$strPageCode" d_key="key" d_val="Novel" p_val="page_data" cache_life="86400"}
                {include file="public/novelListS" start="0"/}
-                {/volist}
+                {/novel:list}
            </ul>
        </div>
    </div>
@@ -81,9 +90,9 @@
        </div>
        <div class="book-slide">
            <ul class="clearfix">
-                {volist name="arrRecommendEndNovel" id="Novel" key="key"}
+                {novel:list count="8" sort_type="tuijian" n_status="wanjie" n_sex="$strPageCode" d_key="key" d_val="Novel" p_val="page_data" cache_life="86400"}
                {include file="public/novelListS" start="13"/}
-                {/volist}
+                {/novel:list}
            </ul>
        </div>
    </div>
@@ -93,9 +102,9 @@
        </div>
        <div class="book-list">
            <ul class="clearfix">
-                {volist name="arrNewsUpdateNovel" id="Novel" key="key"}
+                {novel:list count="8" sort_type="update" n_sex="$strPageCode"  d_key="key" d_val="Novel" p_val="page_data" cache_life="86400"}
                {include file="public/novelListH" start="21"/}
-                {/volist}
+                {/novel:list}
            </ul>
        </div>
    </div>
--- a/code/app/home/view/kuangYu/novel/getNovelRank.html
+++ b/code/app/home/view/kuangYu/novel/getNovelRank.html
@@ -1,11 +1,13 @@
 {extend name="baseH5" /}
-{block name="title"}{$strTitle??''}{/block}
-{block name="keywords"}{$strKeywords??''}{/block}
-{block name="description"}{$strDescription??''}{/block}
+
+{block name="title"}{site:replace code="NOVEL@GETNOVELRANK@TITLE"}{/block}
+{block name="keywords"}{site:replace code="NOVEL@GETNOVELRANK@KEYWORDS"}{/block}
+{block name="description"}{site:replace code="NOVEL@GETNOVELRANK@DESCRIPTION"}{/block}
+
 {block name="head"}
 <!-- 社交媒体标签 -->
-<meta property="og:title" content="{$strTitle??''}" />
-<meta property="og:description" content="{$strDescription??''}" />
+<meta property="og:title" content='{site:replace code="NOVEL@GETNOVELRANK@TITLE"}' />
+<meta property="og:description" content='{site:replace code="NOVEL@GETNOVELRANK@DESCRIPTION"}' />
 <meta property="og:url" content="https://{$DomainModel->d_domain}/paihang/all" />
 <meta property="og:type" content="book" />
 <!-- 结构化数据 -->
@@ -13,8 +15,8 @@
 {
  "@context": "https://{$DomainModel->d_domain}/paihang/all",
  "@type": "book",
-  "headline": "{$strTitle??''}",
-  "description": "{$strDescription??''}",
+  "headline": '{site:replace code="NOVEL@GETNOVELRANK@TITLE"}',
+  "description": '{site:replace code="NOVEL@GETNOVELRANK@DESCRIPTION"}',
  "datePublished": "{:date('Y-m-d')}"
 }
 </script>
@@ -27,9 +29,17 @@
 </h1>
 {/block}

+{block name="strPageCode"}
+    <?php $strPageCode = 'rank'; ?>
+{/block}
+
+
 {block name="main"}
+
+{site:grm page_code="h5_rank" diff="0" num="100" g_key="arrGrm" /}
+
 <div class="wrap">
-    <p class="site-description">{$strDescription??''}</p>
+    <p class="site-description">{site:replace code="NOVEL@GETNOVELRANK@DESCRIPTION"}</p>

    <nav class="breadcrumb" aria-label="breadcrumb">
        <ol itemscope itemtype="https://schema.org/BreadcrumbList">
@@ -53,7 +63,7 @@
        </div>
        <div class="top-index">
            <ul class="clearfix">
-                {volist name="arrDayRankNovel" id="Novel" key="key"}
+                {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                {if $key == 1}
                {include file="public/novelListH" start="0"/}
                {/if}
@@ -61,7 +71,7 @@
                {include file="public/novelListRank" start="1"/}
                {/if}
                    
-                {/volist}
+                {/novel:list}
            </ul>
        </div>
    </div>
@@ -72,7 +82,7 @@
        </div>
        <div class="top-index">
            <ul class="clearfix">
-                {volist name="arrWeekRankNovel" id="Novel" key="key"}
+                {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                {if $key == 1}
                {include file="public/novelListH" start="10"/}
                {/if}
@@ -80,7 +90,7 @@
                {include file="public/novelListRank" start="11"/}
                {/if}
                    
-                {/volist}
+                {/novel:list}
            </ul>
        </div>
    </div>
@@ -91,7 +101,7 @@
        </div>
        <div class="top-index">
            <ul class="clearfix">
-                {volist name="arrMoonRankNovel" id="Novel" key="key"}
+                {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                {if $key == 1}
                {include file="public/novelListH" start="20"/}
                {/if}
@@ -99,7 +109,7 @@
                {include file="public/novelListRank" start="21"/}
                {/if}
                    
-                {/volist}
+                {/novel:list}
            </ul>
        </div>
    </div>
@@ -110,14 +120,14 @@
        </div>
        <div class="top-index">
            <ul class="clearfix">
-                {volist name="arrTotalRankNovel" id="Novel" key="key"}
+                {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                {if $key == 1}
                {include file="public/novelListH" start="30"/}
                {/if}
                {if $key >= 2}
                {include file="public/novelListRank" start="31"/}
                {/if}
-                {/volist}
+                {/novel:list}
            </ul>
        </div>
    </div>
@@ -128,14 +138,14 @@
        </div>
        <div class="top-index">
            <ul class="clearfix">
-                {volist name="arrNewsNovelRankNovel" id="Novel" key="key"}
+                {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                {if $key == 1}
                {include file="public/novelListH" start="40"/}
                {/if}
                {if $key >= 2}
                {include file="public/novelListRank" start="41"/}
                {/if}
-                {/volist}
+                {/novel:list}
            </ul>
        </div>
    </div>
@@ -146,14 +156,14 @@
        </div>
        <div class="top-index">
            <ul class="clearfix">
-                {volist name="arrEdnNovelRankNovel" id="Novel" key="key"}
+                {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                {if $key == 1}
                {include file="public/novelListH" start="50"/}
                {/if}
                {if $key >= 2}
                {include file="public/novelListRank" start="51"/}
                {/if}
-                {/volist}
+                {/novel:list}
            </ul>
        </div>
    </div>
--- a/code/app/home/view/kuangYu/pc/getLibrary.html
+++ b/code/app/home/view/kuangYu/pc/getLibrary.html
@@ -6,8 +6,8 @@

 {block name="head"}
 <!-- 社交媒体标签 -->
-<meta property="og:title" content="{$strTitle??''}" />
-<meta property="og:description" content="{$strDescription??''}" />
+<meta property="og:title" content='{site:replace code="NOVEL@GETLIBRARY@TITLE"}' />
+<meta property="og:description" content='{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}' />
 {if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'}
 <meta property="og:url" content="https://{$DomainModel->d_domain}{$strCategoryIndexUrlTemp}" />
 {else}
@@ -22,8 +22,8 @@
    {
      "@context": "https://{$DomainModel->d_domain}{$strCategoryIndexUrlTemp}",
      "@type": "book",
-      "headline": "{$strTitle??''}",
-      "description": "{$strDescription??''}",
+      "headline": '{site:replace code="NOVEL@GETLIBRARY@TITLE"}',
+      "description": '{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}',
      "datePublished": "{:date('Y-m-d')}"
    }
 </script>
@@ -32,8 +32,8 @@
    {
      "@context": 'https://{$DomainModel->d_domain}{site:nflurl gender="$Request.route.strGender" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}',
      "@type": "book",
-      "headline": "{$strTitle??''}",
-      "description": "{$strDescription??''}",
+      "headline": '{site:replace code="NOVEL@GETLIBRARY@TITLE"}',
+      "description": '{site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}',
      "datePublished": "{:date('Y-m-d')}"
    }
 </script>
@@ -60,6 +60,10 @@
 </h2>
 {/block}

+{block name="strPageCode"}
+    <?php $strPageCode = 'library'; ?>
+{/block}
+
 {block name="main"}

 {novel:pagerexp page="$Request.get.page" limit="30"
@@ -91,16 +95,19 @@ button_num="10" cache_life="86400" func="generateCategoryPager" export_name="res
    <div class="find">
        <div class="opt">
            <div class="optCl" mod="search_channel">
+                6
+                {$Request.route.strGender}
+                5
                <span class="optTit">所属频道</span>
                <ul>
-                    <li><a class='{eq name="$Request.route.strGender" value="all"}on {/eq}'
+                    <li><a class='{eq name="$Request.route.strGender" value="all"}on {/eq} {eq name="$Request.route.strGender" value=""}on  {/eq}'
                            href='{$strPcPath}{site:nflurl gender="all" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
                            btn="search_category">全部</a></li>
                    <li><a class='{eq name="$Request.route.strGender" value="$strNanUrl"}on {/eq}'
-                            href='{$strPcPath}{site:nflurl gender="$strNanUrlTemp" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
+                            href='{$strPcPath}{site:nflurl gender="$strNanUrl" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
                            btn="search_category">男生</a></li>
                    <li><a class='{eq name="$Request.route.strGender" value="$strNvUrl"}on {/eq}'
-                            href='{$strPcPath}{site:nflurl gender="$strNvUrlTemp" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
+                            href='{$strPcPath}{site:nflurl gender="$strNvUrl" category="$Request.route.strCategory"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
                            btn="search_category">女生</a></li>

                </ul>
@@ -108,41 +115,42 @@ button_num="10" cache_life="86400" func="generateCategoryPager" export_name="res
            <div class="optCl" mod="search_channel">
                <span class="optTit">所属分类</span>
                <ul>
-                    <li><a class='{eq name="$Request.route.strCategory" value="all"}on {/eq}'
+                    <li>
+                        <a class='{eq name="$Request.route.strCategory" value="all"}on {/eq} {eq name="$Request.route.strCategory" value=""}on  {/eq}'
                            href='{$strPcPath}{site:nflurl gender="$Request.route.strGender" category="all"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
-                            btn="search_category">全部</a></li>
-                    {eq name="$Request.route.strGender" value="all"}
-                    {foreach $arrCategoryAll.man as $key=>$vo }
-                    <li><a class='{eq name="key" value="$Request.route.strCategory"}on {/eq}'
-                            href='{$strPcPath}{site:nflurl gender="$Request.route.strGender" category="$key"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
-                            btn="search_category">{$vo}</a></li>
-                    {/foreach}
-                    {foreach $arrCategoryAll.women as $key=>$vo }
-                    <li><a class='{eq name="key" value="$Request.route.strCategory"}on {/eq}'
-                            href='{$strPcPath}{site:nflurl gender="$Request.route.strGender" category="$key"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
-                            btn="search_category">{$vo}</a></li>
-                    {/foreach}
-                    {/eq}
+                            btn="search_category">全部</a>
+                    </li>
+                    {if $Request.route.strGender == "all" || $Request.route.strGender == ""}
+                    {novel:category d_key="strCategoryPinyin" d_val="strCategoryName"}
+                    <li>
+                        <a class='{eq name="strCategoryPinyin" value="$Request.route.strCategory"}on {/eq}'
+                            href='{$strPcPath}{site:nflurl gender="$Request.route.strGender" category="$strCategoryPinyin"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
+                            btn="search_category">{$strCategoryName}</a>
+                        </li>
+                    {/novel:category}
+                    {/if}
+
                    {eq name="$Request.route.strGender" value="$strNanUrl"}
-                    {foreach $arrCategoryAll.man as $key=>$vo }
-                    <li><a class='{eq name="key" value="$Request.route.strCategory"}on {/eq}'
-                            href='{$strPcPath}{site:nflurl gender="$Request.route.strGender" category="$key"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
-                            btn="search_category">{$vo}</a></li>
-                    {/foreach}
+                    {novel:category d_key="strCategoryPinyin" d_val="strCategoryName" n_sex="man"}
+                    <li><a class='{eq name="strCategoryPinyin" value="$Request.route.strCategory"}on {/eq}'
+                            href='{$strPcPath}{site:nflurl gender="$Request.route.strGender" category="$strCategoryPinyin"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
+                            btn="search_category">{$strCategoryName}</a></li>
+                    {/novel:category}
                    {/eq}
+
                    {eq name="$Request.route.strGender" value="$strNvUrl"}
-                    {foreach $arrCategoryAll.women as $key=>$vo }
-                    <li><a class='{eq name="key" value="$Request.route.strCategory"}on {/eq}'
-                            href='{$strPcPath}{site:nflurl gender="$Request.route.strGender" category="$key"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
-                            btn="search_category">{$vo}</a></li>
-                    {/foreach}
+                    {novel:category d_key="strCategoryPinyin" d_val="strCategoryName" n_sex="women"}
+                    <li><a class='{eq name="strCategoryPinyin" value="$Request.route.strCategory"}on {/eq}'
+                            href='{$strPcPath}{site:nflurl gender="$Request.route.strGender" category="$strCategoryPinyin"  status="$Request.route.strStatus" page="$Request.route.intPage"/}'
+                            btn="search_category">{$strCategoryName}</a></li>
+                    {/novel:category}
                    {/eq}
                </ul>
            </div>
            <div class="optCl">
                <span class="optTit">是否完结</span>
                <ul>
-                    <li><a class='{eq name="$Request.route.strStatus" value="all"}on {/eq}'
+                    <li><a class='{eq name="$Request.route.strStatus" value="all"}on {/eq} {eq name="$Request.route.strStatus" value=""}on  {/eq}'
                            href='{$strPcPath}{site:nflurl gender="$Request.route.strGender" category="$Request.route.strCategory"  status="all" page="$Request.route.intPage"/}'
                            btn="search_category">全部</a></li>
                    <li><a class='{eq name="$Request.route.strStatus" value="lianzai"}on {/eq}'
@@ -160,24 +168,24 @@ button_num="10" cache_life="86400" func="generateCategoryPager" export_name="res
    <!--搜索结果 开始-->
    <div class="result" mod="search_data_list">
        <ul>
-            {volist name="resData.data" id="Novel" key="d_key"}
+            {volist name="$resData.data" id="Novel" key="key"}
            {include file="pc/public/shukuNovelList" start="0"/}
            {/volist}
        </ul>
        <!--页码切换 开始-->
        <div class="changepage">
            <ul class="pagination">
-                {volist name="resData.p_data.pager" id="vo" key="k"}
+                {volist name="$resData.p_data.pager" id="vo" key="k"}
                {switch $vo.label}
                {case value="上一页"}
-                {if $Request.route.intPage == 1}
-                <span>«</span>
+                {if $resData.p_data.page == 1}
+                <li class="disabled"><span>«</span></li>
                {else}
                <a href="{$vo.url}">«</a>
                {/if}
                {/case}
                {case value="下一页"}
-                {if $Request.route.intPage >= resData.p_data.total}
+                {if $resData.p_data.page >= $resData.p_data.total}
                <li class="disabled"><span>»</span></li>
                {else}
                <li><a href="{$strPcPath}{$vo.url}">»</a></li>
--- a/code/app/home/view/kuangYu/pc/getNovelChannel.html
+++ b/code/app/home/view/kuangYu/pc/getNovelChannel.html
@@ -1,28 +1,42 @@
 {extend name="basePc" /}
-{block name="title"}{$strTitle??''}{/block}
-{block name="keywords"}{$strKeywords??''}{/block}
-{block name="description"}{$strDescription??''}{/block}
+
+{block name="title"}{site:replace code="NOVEL@GETNOVELCHANNEL@TITLE"}{/block}
+{block name="keywords"}{site:replace code="NOVEL@GETNOVELCHANNEL@KEYWORDS"}{/block}
+{block name="description"}{site:replace code="NOVEL@GETNOVELCHANNEL@DESCRIPTION"}{/block}
+
+{block name="strPageCode"}
+    <?php $strPageCode = $Request->param('strChannel'); ?>
+{/block}
+
 {block name="head"}

+<?php 
+$strPageCode = $Request->param('strChannel');
+
+?>
+
 <!-- 社交媒体标签 -->
-<meta property="og:title" content="{$strTitle??''}" />
-<meta property="og:description" content="{$strDescription??''}" />
-<meta property="og:url" content="https://{$DomainModel->d_domain}{$strPageCode == 'boys' ? $strNanUrlTemp : $strNvUrlTemp }" />
+<meta property="og:title" content='{site:replace code="NOVEL@GETNOVELCHANNEL@TITLE"}' />
+<meta property="og:description" content='{site:replace code="NOVEL@GETNOVELCHANNEL@DESCRIPTION"}' />
+<meta property="og:url"
+    content="https://{$DomainModel->d_domain}{$strPageCode == 'man' ? $strNanUrlTemp : $strNvUrlTemp }" />
 <meta property="og:type" content="book" />
 <!-- 结构化数据 -->
 <script type="application/ld+json">
 {
-  "@context": "https://{$DomainModel->d_domain}{$strPageCode == 'boys' ? $strNanUrlTemp : $strNvUrlTemp }",
+   @context": "https://schema.org”,
  "@type": "book",
-  "headline": "{$strTitle??''}",
-  "description": "{$strDescription??''}",
+  "headline": '{site:replace code="NOVEL@GETNOVELCHANNEL@TITLE"}',
+  "description": '{site:replace code="NOVEL@GETNOVELCHANNEL@DESCRIPTION"}',
+  "url": "https://{$DomainModel->d_domain}/{$strPageCode == 'man' ? $strNanUrlTemp : $strNvUrlTemp }",
  "datePublished": "{:date('Y-m-d')}"
 }
 </script>
 {/block}
+
 {block name="head-css"}

-{eq name="strPageCode" value="boys"}
+{eq name="strPageCode" value="man"}
 <link rel="canonical" href="https://{$DomainModel->d_domain}/{$strNanUrlTemp}">
 {else}
 <link rel="canonical" href="https://{$DomainModel->d_domain}/{$strNvUrlTemp}">
@@ -38,9 +52,10 @@
    </a>
 </h2>
 {/block}
+
 {block name="main"}

-
+{site:grm page_code="pc_index" diff="0" num="50" g_key="arrGrm"  /}

 <div class="content">

@@ -53,7 +68,7 @@
                <meta itemprop="position" content="1" />
            </li>
            <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
-                {eq name="strPageCode" value="boys"}
+                {eq name="strPageCode" value="man"}
                <a href="{$strPcPath}{$strNanUrlTemp}" itemprop="item">
                    <span itemprop="name">男生</span>
                </a>
@@ -75,15 +90,13 @@
            <span class="log_line"></span>
        </div>
        <ul class="f2_list" mod="hot_tj">
-            {volist name="arrRecommendSerializationNovel" id="Novel" key="key"}
+            {novel:list count="12" sort_type="tuijian" n_status="lianzai" n_sex="$strPageCode" d_key="key" d_val="Novel" p_val="page_data" cache_life="86400"}
            {include file="pc/public/endNovelList" start="0"/}
-            {/volist}
+            {/novel:list}
        </ul>
    </div>
    <div class="adv">
-        {volist name="arrAdBanner" id="Ad" key="key"}
-        {include file="pc/public/adBanner" /}
-        {/volist}
+       
     
    </div>
    
@@ -95,16 +108,15 @@
            <h2>完本推荐</h2>
        </div>
        <ul class="rec_R">
-            {volist name="arrRecommendEndNovel" id="Novel" key="key"}
+            {novel:list count="8" sort_type="tuijian" n_status="wanjie" n_sex="$strPageCode" d_key="key" d_val="Novel" p_val="page_data" cache_life="86400"}
+
            {include file="pc/public/endNovelList" start="13"/}
-            {/volist}
+            {/novel:list}
        </ul>
    </div>

    <div class="adv">
-        {volist name="arrAdBanner" id="Ad" key="key"}
-        {include file="pc/public/adBanner" /}
-        {/volist}
+    
    </div>

    <div class="f4 area">
@@ -125,9 +137,9 @@
                            <li class="sj">更新时间</li>
                        </ul>
                    </li>
-                    {volist name="arrNewsUpdateNovel" id="Novel" key="key"}
+                    {novel:list count="30" sort_type="update" n_sex="$strPageCode"  d_key="key" d_val="Novel" p_val="page_data" cache_life="86400"}
                    {include file="pc/public/indexNewsUpdateList" start="21"/}
-                    {/volist}
+                    {/novel:list}
                </ol>
            </div>
        </div>
--- a/code/app/home/view/kuangYu/pc/getNovelRank.html
+++ b/code/app/home/view/kuangYu/pc/getNovelRank.html
@@ -1,24 +1,27 @@
 {extend name="basePc" /}
-{block name="title"}{$strTitle??''}{/block}
-{block name="keywords"}{$strKeywords??''}{/block}
-{block name="description"}{$strDescription??''}{/block}
+
+{block name="title"}{site:replace code="NOVEL@GETNOVELRANK@TITLE"}{/block}
+{block name="keywords"}{site:replace code="NOVEL@GETNOVELRANK@KEYWORDS"}{/block}
+{block name="description"}{site:replace code="NOVEL@GETNOVELRANK@DESCRIPTION"}{/block}
+
 {block name="head"}
 <!-- 社交媒体标签 -->
-<meta property="og:title" content="{$strTitle??''}" />
-<meta property="og:description" content="{$strDescription??''}" />
-<meta property="og:url" content="https://{$DomainModel->d_domain}{$strRankUrlTemp}" />
-<meta property="og:type" content="article" />
+<meta property="og:title" content='{site:replace code="NOVEL@GETNOVELRANK@TITLE"}' />
+<meta property="og:description" content='{site:replace code="NOVEL@GETNOVELRANK@DESCRIPTION"}' />
+<meta property="og:url" content="https://{$DomainModel->d_domain}/paihang/all" />
+<meta property="og:type" content="book" />
 <!-- 结构化数据 -->
 <script type="application/ld+json">
 {
-  "@context": "https://{$DomainModel->d_domain}{$strRankUrlTemp}",
-  "@type": "NewsArticle",
-  "headline": "{$strTitle??''}",
-  "description": "{$strDescription??''}",
+  "@context": "https://{$DomainModel->d_domain}/paihang/all",
+  "@type": "book",
+  "headline": '{site:replace code="NOVEL@GETNOVELRANK@TITLE"}',
+  "description": '{site:replace code="NOVEL@GETNOVELRANK@DESCRIPTION"}',
  "datePublished": "{:date('Y-m-d')}"
 }
 </script>
 {/block}
+
 {block name="head-css"}
 <link rel="canonical" href="https://{$DomainModel->d_domain}{$strRankUrlTemp}">
 {/block}
@@ -31,7 +34,15 @@
    </a>
 </h2>
 {/block}
+
+{block name="strPageCode"}
+    <?php $strPageCode = 'rank'; ?>
+{/block}
+
 {block name="main"}
+
+{site:grm page_code="h5_rank" diff="0" num="100" g_key="arrGrm" /}
+
 <div class="content content_back">

    <nav class="breadcrumb" aria-label="breadcrumb">
@@ -49,11 +60,7 @@
            </li>
        </ol>
    </nav>
-    <!--大标题 开始-->
-    <!-- <div class="rank_bt">
-        <a href="{$strPcPath}/rank.html" class="all_btn">完整榜单</a>
-    </div> -->
-    <!--大标题 结束-->
+   
    <!--各种榜单 开始-->
    <div class="ki_li">
        <div class="com_R">
@@ -63,14 +70,14 @@
            <div class="list_wrap">
                <div class="swi">
                    <ol class="list" mod="rank_data_list">
-                        {foreach $arrDayRankNovel as $key=>$Novel}
+                        {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                            {if $key == 0}
                            {include file="pc/public/indexBoyRankOne" start="0"/}  
                            {/if}
                            {if $key >= 1}
                            {include file="pc/public/indexBoyRankList" start="1"/}  
                            {/if}
-                        {/foreach} 
+                        {/novel:list} 
                    </ol>
                </div>
                <!-- <span class="more">
@@ -87,14 +94,14 @@
            <div class="list_wrap">
                <div class="swi">
                    <ol class="list" mod="rank_data_list">
-                        {foreach $arrWeekRankNovel as $key=>$Novel}
+                        {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                            {if $key == 0}
                            {include file="pc/public/indexBoyRankOne" start="10"/}  
                            {/if}
                            {if $key >= 1}
                            {include file="pc/public/indexBoyRankList" start="11"/}  
                            {/if}
-                        {/foreach}
+                        {/novel:list}
                    </ol>
                </div>
                <!-- <span class="more">
@@ -111,14 +118,14 @@
            <div class="list_wrap">
                <div class="swi">
                    <ol class="list" mod="rank_data_list">
-                        {foreach $arrMoonRankNovel as $key=>$Novel}
+                        {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                            {if $key == 0}
                            {include file="pc/public/indexBoyRankOne" start="20"/}  
                            {/if}
                            {if $key >= 1}
                            {include file="pc/public/indexBoyRankList" start="21"/}  
                            {/if}
-                        {/foreach}
+                        {/novel:list}
                    </ol>
                </div>
                <!-- <span class="more">
@@ -135,14 +142,14 @@
            <div class="list_wrap">
                <div class="swi">
                    <ol class="list" mod="rank_data_list">
-                        {foreach $arrTotalRankNovel as $key=>$Novel}
+                        {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                            {if $key == 0}
                            {include file="pc/public/indexBoyRankOne" start="30"/}  
                            {/if}
                            {if $key >= 1}
                            {include file="pc/public/indexBoyRankList" start="31"/}  
                            {/if}
-                        {/foreach}
+                        {/novel:list}
                    </ol>
                </div>
                <!-- <span class="more">
@@ -159,14 +166,14 @@
            <div class="list_wrap">
                <div class="swi">
                    <ol class="list" mod="rank_data_list">
-                        {foreach $arrNewsNovelRankNovel as $key=>$Novel}
+                        {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                            {if $key == 0}
                            {include file="pc/public/indexBoyRankOne" start="40"/}  
                            {/if}
                            {if $key >= 1}
                            {include file="pc/public/indexBoyRankList" start="41"/}  
                            {/if}
-                        {/foreach}
+                        {/novel:list}
                    </ol>
                </div>
                <!-- <span class="more">
@@ -183,14 +190,14 @@
            <div class="list_wrap">
                <div class="swi">
                    <ol class="list" mod="rank_data_list">
-                        {foreach $arrEdnNovelRankNovel as $key=>$Novel}
+                        {novel:list count="10" sort_type="news" d_key="key" d_val="Novel"  cache_life="86400"}
                            {if $key == 0}
                            {include file="pc/public/indexBoyRankOne" start="50"/}  
                            {/if}
                            {if $key >= 1}
                            {include file="pc/public/indexBoyRankList" start="51"/}  
                            {/if}
-                        {/foreach}
+                        {/novel:list}
                    </ol>
                </div>
                <!-- <span class="more">
--- a/code/app/home/view/kuangYu/pc/index.html
+++ b/code/app/home/view/kuangYu/pc/index.html
@@ -287,7 +287,7 @@ button_num="10" cache_life="86400" func="generateCategoryPager" export_name="res
                    </li>
                    {novel:list count="30"  sort_type="update"  d_key="d_key" d_val="Novel"
                p_val="page_data" cache_life="86400"}
-                    {include file="pc/public/indexNewsUpdateList" start="95"/}
+                    {include file="pc/public/indexNewsUpdateList" start="70"/}
                    {/novel:list}
                </ol>
            </div>
--- a/code/app/home/view/kuangYu/pc/public/indexNewsUpdateList.html
+++ b/code/app/home/view/kuangYu/pc/public/indexNewsUpdateList.html
@@ -5,7 +5,7 @@
            <a href='{$strPcPath}{site:nflurl gender="all" category="$Novel.n_category_pinyin"  status="all" page="1"/}' >{$Novel->n_category ?? ''}</a></li>
        <li class="sm">
            <h3>
-                {$arrGrm[$d_key+[start]]|raw}
+                {$arrGrm[$key+[start]]|raw}
                <a href='{$strPcPath}{site:nurl n_id="$Novel->n_id" n_py="$Novel->n_name_pinyin"/}' title="{$Novel.n_name  ?? ''}" >
                {$Novel.n_name  ?? ''}</a>
            </h3>
--- a/code/app/services/NovelService.php
+++ b/code/app/services/NovelService.php
@@ -158,10 +158,10 @@ class NovelService
    {
        $strKey = 'CATEGORY_INFO_URL';
        $strUrl = $this->getPageUrl($strKey, [
-            'strGender' => $strGender ?? '',
-            'strCategory' => $strCategory ?? '',
-            'strStatus' => $strStatus ?? '',
-            'strOrder' => $strOrder ?? '',
+            'strGender' => $strGender ?? 'all',
+            'strCategory' => $strCategory ?? 'all',
+            'strStatus' => $strStatus ?? 'all',
+            'strOrder' => $strOrder ?? 'all',
            'intPage' => $intPage ?? 1,
        ]);
        $strUrl = preg_replace('#/{2,}#', '/', $strUrl);
@@ -234,9 +234,16 @@ class NovelService
     *
     * @return array
     */
-    public function getCategoryFilter(): array
+    public function getCategoryFilter(string $n_sex=''): array
    {
-        return array_combine(CategoryModel::$arrCategoryPinYin, CategoryModel::$arrCategory);
+        if($n_sex == 'man'){
+            return CategoryModel::$arrCategoryAll['man'];
+        }else if($n_sex == 'women'){
+            return CategoryModel::$arrCategoryAll['women'];
+        }else{
+            return array_combine(CategoryModel::$arrCategoryPinYin, CategoryModel::$arrCategory);
+        }
+        
    }

    /**
--- a/code/extend/template/taglib/Novel.php
+++ b/code/extend/template/taglib/Novel.php
@@ -14,7 +14,7 @@ class Novel extends TagLib
                'sort' => ['attr' => 'd_key,d_val'],
                'status' => ['attr' => 'd_key,d_val'],
                'sex' => ['attr' => 'd_key,d_val'],
-                'category' => ['attr' => 'd_key,d_val'],
+                'category' => ['attr' => 'd_key,d_val,n_sex'],
        ];

        private function customBuildVar($mixedArgs)
@@ -309,10 +309,13 @@ EOT;

                $d_key = $tag['d_key'] ?? 'd_key';
                $d_val = $tag['d_val'] ?? 'd_val';
+                $n_sex = $tag['n_sex'] ?? '';
+
+                $n_sex = $this->customBuildVar($n_sex);

                $strParse = <<<EOT
 <?php
-\$arrCategory = app(\\app\\services\\NovelService::class)->getCategoryFilter();
+\$arrCategory = app(\\app\\services\\NovelService::class)->getCategoryFilter( {$n_sex});

 if (!empty(\$arrCategory) && is_array(\$arrCategory)):

--- a/code/extend/template/taglib/Site.php
+++ b/code/extend/template/taglib/Site.php
@@ -207,11 +207,11 @@ EOD;
     */
    public function tagNFLUrl($tag)
    {
-        $strGender = isset($tag['gender']) ? $tag['gender'] : '';
-        $strCategory = isset($tag['category']) ? $tag['category'] : '';
-        $strStatus = isset($tag['status']) ? $tag['status'] : '';
-        $strOrder = isset($tag['order']) ? $tag['order'] : '';
-        $intPage = isset($tag['page']) ? $tag['page'] : '';
+        $strGender = isset($tag['gender']) ? $tag['gender'] : 'all';
+        $strCategory = isset($tag['category']) ? $tag['category'] : 'all';
+        $strStatus = isset($tag['status']) ? $tag['status'] : 'all';
+        $strOrder = isset($tag['order']) ? $tag['order'] : 'all';
+        $intPage = isset($tag['page']) ? $tag['page'] : 1;
       
        $strGender = $this->customBuildVar($strGender);
        $strCategory = $this->customBuildVar($strCategory);