Merge branch 'dev' of ssh://git.bgbg.live:18150/root/SEONexus into dev

# Conflicts:
#	code/composer.lock

code/app/home/BaseController.php

@@ -103,6 +103,7 @@ abstract class BaseController
         
         View::assign("DomainModel", $this->request->DomainModel);
         View::assign("TemplatesModel", $this->request->TemplatesModel);
+        
         View::assign("strPcPath", $strPcUrlTemp);
         View::assign("strNanUrlTemp", $strNanUrlTemp);
         View::assign("strNvUrlTemp", $strNvUrlTemp);

code/app/home/controller/Index.php

@@ -28,29 +28,50 @@ class Index extends BaseController
 
         $NovelModel = NovelModel::getInstance();
 
+        $strTemplatesModel = $Request->TemplatesModel->t_code;
+
+        switch ($strTemplatesModel) {
+            case 'default':
+                // 默认模板 630zw
+                // TODO  default模板h5 首页数据:  获取所有分类数据，然后 每个分类 随机获取 10个小说 ,所有分类数据 放到一个数组里， 前端一个循环渲染，排版都是一样的
+                $arrNovelCategory = [];
+
+                View::assign([
+                    'arrNovelCategory' => $arrNovelCategory,
+                ]);
+                break;
+            case 'kuangYu':
+                $strKey = sprintf('%s:H5:INDEX:ZUIJIAN:SEX:%s:%s', $Request->DomainModel->d_domain, 0, 8);
+                $arrNewsNovel = $NovelModel->getCommonNovelOnCache($strKey,  $intTTL, 8, 0, NULL, ['og_novel_update_time' => -1]);
+
+                $strKey = sprintf('%s:H5:INDEX:RANK:%s:SEX:%s', $Request->DomainModel->d_domain, 'daily', 0);
+                $arrDayRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'daily');
+
+                $strKey = sprintf('%s:H5:INDEX:RANK:%s:SEX:%s', $Request->DomainModel->d_domain, 'weekly', 0);
+                $arrWeekRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'weekly');
+
+                $strKey = sprintf('%s:H5:INDEX:RANK:%s:SEX:%s', $Request->DomainModel->d_domain, 'monthly', 0);
+                $arrMoonRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'monthly');
+
+                $strStatus = '已完结';
+                $strKey = sprintf('%s:H5:INDEX:RANK:%s:%s', $Request->DomainModel->d_domain, 'total', 'finished');
+                $arrEndNovelRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'total', $strStatus);
+
+                View::assign([
+                    'arrNewsNovel' => $arrNewsNovel,
+                    'arrDayRankNovel' => $arrDayRankNovel,
+                    'arrWeekRankNovel' => $arrWeekRankNovel,
+                    'arrMoonRankNovel' => $arrMoonRankNovel,
+                    'arrEndNovelRankNovel' => $arrEndNovelRankNovel,
+                    'strPageCode' => 'home',
+                ]);
+                break;
+        }
+
         // 推荐等级为9的连载的 随机15个小说
-
         $strKey = sprintf('%s:H5:INDEX:TUIJIAN:%s', $Request->DomainModel->d_domain, 8);
-
         $arrRecommendNovel = $NovelModel->getCommonNovelOnCache($strKey,  $intTTL, 8);
 
-        $strKey = sprintf('%s:H5:INDEX:ZUIJIAN:SEX:%s:%s', $Request->DomainModel->d_domain, 0, 8);
-        $arrNewsNovel = $NovelModel->getCommonNovelOnCache($strKey,  $intTTL, 8, 0, NULL, ['og_novel_update_time' => -1]);
-
-        $strKey = sprintf('%s:H5:INDEX:RANK:%s:SEX:%s', $Request->DomainModel->d_domain, 'daily', 0);
-        $arrDayRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'daily');
-
-        $strKey = sprintf('%s:H5:INDEX:RANK:%s:SEX:%s', $Request->DomainModel->d_domain, 'weekly', 0);
-        $arrWeekRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'weekly');
-
-        $strKey = sprintf('%s:H5:INDEX:RANK:%s:SEX:%s', $Request->DomainModel->d_domain, 'monthly', 0);
-        $arrMoonRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'monthly');
-
-        $strStatus = '已完结';
-        $strKey = sprintf('%s:H5:INDEX:RANK:%s:%s', $Request->DomainModel->d_domain, 'total', 'finished');
-        $arrEndNovelRankNovel = $NovelModel->getRankNovelOnCache($strKey, 10, 0, 'total', $strStatus);
-
-
         // Title 模板
         ConverterMovel::setVal([
             'strIndexTitle' => $this->request->DomainModel->d_index_title,
@@ -74,11 +95,11 @@ class Index extends BaseController
 
         View::assign([
             'arrRecommendNovel' => $arrRecommendNovel,
-            'arrNewsNovel' => $arrNewsNovel,
-            'arrDayRankNovel' => $arrDayRankNovel,
-            'arrWeekRankNovel' => $arrWeekRankNovel,
-            'arrMoonRankNovel' => $arrMoonRankNovel,
-            'arrEndNovelRankNovel' => $arrEndNovelRankNovel,
+            // 'arrNewsNovel' => $arrNewsNovel,
+            // 'arrDayRankNovel' => $arrDayRankNovel,
+            // 'arrWeekRankNovel' => $arrWeekRankNovel,
+            // 'arrMoonRankNovel' => $arrMoonRankNovel,
+            // 'arrEndNovelRankNovel' => $arrEndNovelRankNovel,
             'strPageCode' => 'home',
             'strTitle' => $strTitle,
             'strKeywords' => $strKeywords,
@@ -86,6 +107,7 @@ class Index extends BaseController
             'strHostNovelDescription' => $strHostNovelDescription,
             'strNewsNovelDescription' => $strNewsNovelDescription,
             'strRankNovelDescription' => $strRankNovelDescription,
+            // 'arrNovelCategory' => $arrNovelCategory,
         ]);
 
         $strView = $boolIsMobile ? '' : 'pc/index';
@@ -111,7 +133,7 @@ class Index extends BaseController
         $strKey = sprintf('%s:PC:INDEX:TUIJIAN:%s', $Request->DomainModel->d_domain, 13);
 
         $arrRecommendSerializationNovel = $NovelModel->getCommonNovelOnCache($strKey,  $intTTL, 13, 0, NULL);
-    
+
         // 推荐等级为9的完结的 随机12个小说
         $strKey = sprintf('%s:PC:INDEX:TUIJIAN:WANJIE:%s', $Request->DomainModel->d_domain, 12);
         $arrRecommendEndNovel = $NovelModel->getCommonNovelOnCache($strKey,  $intTTL, 12, 0, "已完结");

code/app/home/view/default/Index/index.html

@@ -13,23 +13,27 @@
 <div class="wrap-box" style="margin-top:0;">
     <h3 class="wrap-title"><span>封面推荐</span></h3>
     <div class="rec-focus">
-        {foreach $arrRecommendNovel as $key=>$vo }
+        {foreach $arrRecommendNovel as $key=>$Novel }
         <dl class="rec-focus-book">
-            <dt class="book-img"><a href="/{SiteModel['site_xiangqing_path']}/{vo.xsxq_id}.html.html"><img height="100" width="80"
-                        src="{$vo.xsxq_feng_mian_url}" alt="{$vo.xsxq_ming_zi}"></a></dt>
+            <dt class="book-img">
+                <a href='{site:nurl n_id="$Novel->n_id" n_py="$Novel->og_novel_pin_yin"/}'>
+                    <img height="100" width="80" alt="{$Novel.og_novel_book_name ?? ''} - {$Novel.og_novel_category ?? ''}最新章节在线免费阅读"
+                        src="{$Novel.n_cover_path ?? ''}" >
+                    </a>
+                </dt>
             <dd class="book-info">
-                <h2><a href="/{$SiteModel['site_xiangqing_path']}/{$vo.xsxq_id}.html">{$vo.xsxq_ming_zi}</a></h2>
-                <p>作者：{$vo.xsxq_zuozhe}</p>
-                <p>{$vo.xsxq_jie_shao}</p>
+                <h2><a href='{site:nurl n_id="$Novel->n_id" n_py="$Novel->og_novel_pin_yin"/}'>{$Novel.og_novel_book_name}</a></h2>
+                <p>作者：{$Novel.og_novel_author}</p>
+                <p>{$Novel.og_description}</p>
             </dd>
         </dl>
         {/foreach}
 
     </div>
-    {$strGanRaoMa|raw}
+    
 </div>
 
-{foreach $arrXiaoShuoFenLei as $category}
+{foreach $arrNovelCategory as $category}
 
 <div class="wrap-box">
     <h3 class="wrap-title">
@@ -62,7 +66,7 @@
 </div>
 
 {/foreach}
-{$strGanRaoMa|raw}
+
 {/block}
 
 {block name="customize"}

code/app/home/view/default/baseH5.html

@@ -3,23 +3,31 @@
 <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <meta name="renderer" content="webkit">
+    <meta charset="UTF-8" />
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="robots" content="index, follow" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta http-equiv="Cache-Control" content="no-cache,must-revalidate">
     <meta http-equiv="Cache-Control" content="no-siteapp">
-    <meta http-equiv="Cache-Control" content="no-transform">
-    <title></title>
-    <meta name="Keywords" content="" />
-    <meta name="description" content="">
+    <meta http-equiv="Cache-Control" content="no-transform, max-age=3600" />
     <meta name="viewport"
         content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0,user-scalable=no">
-
-    <link rel="canonical" href="{site:site  valcode='site_domain' encode='false'/}/">
+    <meta name="applicable-device" content="mobile" />
+    <title>{block name="title"}{/block}</title>
+    <meta name="keywords" content='{block name="keywords"}{/block}'>
+    <meta name="description" content='{block name="description"}{/block}'>
     <link rel="shortcut icon" href="/template/default/img/favicon.ico" type="image/x-icon">
-    
+
     <link href="/public/layer/need/layer.css" rel="stylesheet">
     <link href="/template/default/h5/css/style.css" rel="stylesheet" type="text/css">
     {block name="meta-other"}{/block}
+
+    {block name="head"}{/block}
+    {block name="head-css"}{/block}
     {block name="head-js"}{/block}
+    <script>
+        const strPcPath = `{$strPcPath}`;
+    </script>
 </head>
 
 <body class="{block name='body-class'}{/block}" id="{block name='body-id'}{/block}">
@@ -32,20 +40,17 @@
     </div>
     <div class="nav">
         <ul>
-            {if default_index_info_isopen }
-                <li><a href="/">首 页</a></li>
-                <li><a href="/nindex">小说首页</a></li>
-            {else}
-                <li><a href="/">首 页</a></li>
-            {/if}
-            <li><a href="/{SiteModel['site_fenlei_path']}/0-0-0-1.html">小说分类</a></li>
+            <!-- <li><a href="/">首 页</a></li>
+            <li><a href="/nindex">小说首页</a></li> -->
+            <li><a href="/">首 页</a></li>
+            <li><a href="//0-0-0-1.html">小说分类</a></li>
             <li><a href="/shujia">阅读记录</a></li>
         </ul>
     </div>
     <div class="clear"></div>
     <div class="novel_search">
-        <form id="novel_search" class="search-form" method="get" action="/search.html">
-            <input type="text" class="input-text input-key" name="key" placeholder="输入书名/作者进行搜索">
+        <form id="novel_search" class="search-form" method="get" action="{$strSearchIndexUrlTemp}">
+            <input type="text" class="input-text input-key" name="keyword" placeholder="输入书名/作者进行搜索">
             <button type="submit" class="btn-tosearch" form="novel_search" value="submit">搜 索</button>
         </form>
     </div>
@@ -53,8 +58,8 @@
     {block name="main"} {/block}
 
     <div class="novel_search">
-        <form id="novel_search" class="search-form" method="post" action="/search.html"><input type="text"
-                class="input-text input-key" name="key" placeholder="输入书名/作者进行搜索"><button type="submit"
+        <form id="novel_search" class="search-form" method="post" action="{$strSearchIndexUrlTemp}"><input type="text"
+                class="input-text input-key" name="keyword" placeholder="输入书名/作者进行搜索"><button type="submit"
                 class="btn-tosearch" form="novel_search" value="submit">搜 索</button></form>
     </div>
 
@@ -63,21 +68,18 @@
         <h3 class="wrap-title"><span>最新标签</span></h3>
         <div class="rec-focus" style="font-size:12px;">
             {foreach $arrRecommendNovel as $key=>$vo }
-            <a href="/{SiteModel['site_seo_path']}/{nis_id}.html">{$vo.nis_name}</a>&nbsp;&nbsp;
+            <a href="/">{$vo.og_novel_book_name}</a>&nbsp;&nbsp;
             {/foreach}
-            {ad:list code="YOUQING_LIANJIE_GUANG_GAO" order="desc" limit="2" id="ad"}
-            <a href="{$ad.gg_tiao_zhuan_di_zhi}">{$ad.gg_wen_zi}</a>&nbsp;&nbsp;
-            {/ad:list}
             <a href="/sitemap_index.xml">XML地图</a>&nbsp;&nbsp;
         </div>
     </div>
     <p style="font-size: 12px;text-align: center;"> 反馈邮箱:
-        {site:site  valcode="site_email" encode="false"/} Inc. All Rights Reserved.</p>
+        {site:cfg code="YOU_XIANG" encode="false"/} Inc. All Rights Reserved.</p>
     <p style="font-size: 12px;text-align: center;"> </p>
     <div class="footer">
         <ul>
             <li><a href="/">网站首页</a></li>
-            <li><a href="/{SiteModel['site_fenlei_path']}/0-0-0-1.html">小说分类</a></li>
+            <li><a href="/0-0-0-1.html">小说分类</a></li>
             <li><a href="/sitemap_index.xml">XML地图</a></li>
             <li><a href="/shujia">阅读记录</a></li>
         </ul>
@@ -93,7 +95,11 @@
 
     {/block}
 
-    {site:site  valcode='site_tongji' encode="false"/}
+    <!--  全局统计 -->
+    {site:cfg code="PUBLIC_TONGJI_CODE" encode="false"/}
+
+    <!--  站点统计 -->
+    {$DomainModel->d_statis|raw}
 </body>
 
 </html>

code/app/home/view/kuangYu/baseH5.html

@@ -98,7 +98,7 @@
 
     {block name="main"} {site:wz wz="主内容" /}{/block}
 
-    {include file="Public/footer" /}
+    {include file="public/footer" /}
 
     {block name="customize"}{/block}
 

code/app/home/view/kuangYu/basePc.html

@@ -66,7 +66,7 @@
 
     {block name="customize-footer-after"}{/block}
 
-    {include file="Pc/Public/footer" /}
+    {include file="pc/public/footer" /}
 
     {block name="customize"}{/block}
 

code/app/home/view/kuangYu/index/index.html

@@ -75,7 +75,7 @@
         <div class="book-slide">
             <ul class="clearfix">
                 {volist name="arrRecommendNovel" id="Novel" key="key"}
-                    {include file="Public/novelListS" start="0"/}
+                    {include file="public/novelListS" start="0"/}
                 {/volist}
             </ul>
         </div>
@@ -91,7 +91,7 @@
         <div class="book-list">
             <ul class="clearfix">
                 {volist name="arrNewsNovel" id="Novel" key="key"}
-                    {include file="Public/novelListH" start="9"/}
+                    {include file="public/novelListH" start="9"/}
                 {/volist}
             </ul>
         </div>
@@ -117,7 +117,7 @@
             <div class="top-list">
                 <ul class="clearfix">
                     {volist name="arrDayRankNovel" id="Novel" key="key"}
-                        {include file="Public/novelListH" start="17"/}
+                        {include file="public/novelListH" start="17"/}
                     {/volist}
                 </ul>
             </div>
@@ -127,7 +127,7 @@
             <div class="top-list">
                 <ul class="clearfix">
                     {volist name="arrWeekRankNovel" id="Novel" key="key"}
-                        {include file="Public/novelListH" start="27"/}
+                        {include file="public/novelListH" start="27"/}
                     {/volist}
                 </ul>
             </div>
@@ -137,7 +137,7 @@
             <div class="top-list">
                 <ul class="clearfix">
                     {volist name="arrMoonRankNovel" id="Novel" key="key"}
-                        {include file="Public/novelListH" start="37" /}
+                        {include file="public/novelListH" start="37" /}
                     {/volist}
                 </ul>
             </div>
@@ -147,7 +147,7 @@
             <div class="top-list">
                 <ul class="clearfix">
                     {volist name="arrEndNovelRankNovel" id="Novel" key="key"}
-                        {include file="Public/novelListH" start="47"/}
+                        {include file="public/novelListH" start="47"/}
                     {/volist}
                 </ul>
             </div>

code/app/home/view/kuangYu/novel/getArticleList.html

@@ -52,7 +52,7 @@
     <div class="top-index">
         <ul class="clearfix">
             {foreach $arrNewsNovel as $key => $vo}
-            {include file="Public/articleList" /}
+            {include file="public/articleList" /}
                     
             {/foreach}
         </ul>

code/app/home/view/kuangYu/novel/getLibrary.html

@@ -146,7 +146,7 @@
         <div class="book-list">
             <ul class="clearfix">
                 {volist name="arrNovel" id="Novel" key="key"}
-                {include file="Public/novelListH" start="0"/}
+                {include file="public/novelListH" start="0"/}
                 {/volist}
             </ul>
         </div>

code/app/home/view/kuangYu/novel/getNovelCatalog.html

@@ -72,6 +72,7 @@
                 <meta itemprop="position" content="1" />
             </li>
             <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+                <?php $arrNovel['category_pinyin'] ?? $arrNovel['category_pinyin'] = 'all'?>
                 <a href='{site:nflurl gender="all" category="$arrNovel[category_pinyin]"  status="all" page="1"/}' itemprop="item">
                     <span itemprop="name">{$arrNovel.og_novel_category}</span>
                 </a>
@@ -96,7 +97,7 @@
 
         <div class="attentions">
             <!-- 目录下拉分页-->
-            {include file="Public/allChapterPage" start="0"/}
+            {include file="public/allChapterPage" start="0"/}
         
             <ul class="clearfix">
                 {volist name="arrPage.data" id="Chapter" key="key"}
@@ -109,7 +110,7 @@
             </ul>
 
             <!-- 目录下拉分页-->
-            {include file="Public/allChapterPage" /}
+            {include file="public/allChapterPage" /}
             <div class="chapters-more">
             </div>
         </div>

code/app/home/view/kuangYu/novel/getNovelChannel.html

@@ -70,7 +70,7 @@
         <div class="book-slide">
             <ul class="clearfix">
                 {volist name="arrRecommendSerializationNovel" id="Novel" key="key"}
-                {include file="Public/novelListS" start="0"/}
+                {include file="public/novelListS" start="0"/}
                 {/volist}
             </ul>
         </div>
@@ -82,7 +82,7 @@
         <div class="book-slide">
             <ul class="clearfix">
                 {volist name="arrRecommendEndNovel" id="Novel" key="key"}
-                {include file="Public/novelListS" start="13"/}
+                {include file="public/novelListS" start="13"/}
                 {/volist}
             </ul>
         </div>
@@ -94,7 +94,7 @@
         <div class="book-list">
             <ul class="clearfix">
                 {volist name="arrNewsUpdateNovel" id="Novel" key="key"}
-                {include file="Public/novelListH" start="21"/}
+                {include file="public/novelListH" start="21"/}
                 {/volist}
             </ul>
         </div>

code/app/home/view/kuangYu/novel/getNovelChapter.html

@@ -71,6 +71,9 @@
 		}
 		
 	</script>
+	<script>
+        const strPcPath = `{$strPcPath}`;
+    </script>
 </head>
 
 <body class="skin-default">
@@ -147,6 +150,7 @@
 						<meta itemprop="position" content="1" />
 					</li>
 					<li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+						<?php $arrNovel['category_pinyin'] ?? $arrNovel['category_pinyin'] = 'all'?>
 						<a href='{site:nflurl gender="all" category="$arrNovel[category_pinyin]"  status="all" page="1"/}' itemprop="item">
 							<span itemprop="name">{$arrNovel.og_novel_category}</span>
 						</a>

code/app/home/view/kuangYu/novel/getNovelInfo.html

@@ -78,6 +78,7 @@
                 <meta itemprop="position" content="1" />
             </li>
             <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+                <?php $arrNovel['category_pinyin'] ?? $arrNovel['category_pinyin'] = 'all'?>
                 <a href='{site:nflurl gender="all" category="$arrNovel[category_pinyin]"  status="all" page="1"/}' itemprop="item">
                     <span itemprop="name">{$arrNovel.og_novel_category}</span>
                 </a>

code/app/home/view/kuangYu/novel/getNovelRank.html

@@ -55,10 +55,10 @@
             <ul class="clearfix">
                 {volist name="arrDayRankNovel" id="Novel" key="key"}
                 {if $key == 1}
-                {include file="Public/novelListH" start="0"/}
+                {include file="public/novelListH" start="0"/}
                 {/if}
                 {if $key >= 2}
-                {include file="Public/novelListRank" start="1"/}
+                {include file="public/novelListRank" start="1"/}
                 {/if}
                     
                 {/volist}
@@ -74,10 +74,10 @@
             <ul class="clearfix">
                 {volist name="arrWeekRankNovel" id="Novel" key="key"}
                 {if $key == 1}
-                {include file="Public/novelListH" start="10"/}
+                {include file="public/novelListH" start="10"/}
                 {/if}
                 {if $key >= 2}
-                {include file="Public/novelListRank" start="11"/}
+                {include file="public/novelListRank" start="11"/}
                 {/if}
                     
                 {/volist}
@@ -93,10 +93,10 @@
             <ul class="clearfix">
                 {volist name="arrMoonRankNovel" id="Novel" key="key"}
                 {if $key == 1}
-                {include file="Public/novelListH" start="20"/}
+                {include file="public/novelListH" start="20"/}
                 {/if}
                 {if $key >= 2}
-                {include file="Public/novelListRank" start="21"/}
+                {include file="public/novelListRank" start="21"/}
                 {/if}
                     
                 {/volist}
@@ -112,10 +112,10 @@
             <ul class="clearfix">
                 {volist name="arrTotalRankNovel" id="Novel" key="key"}
                 {if $key == 1}
-                {include file="Public/novelListH" start="30"/}
+                {include file="public/novelListH" start="30"/}
                 {/if}
                 {if $key >= 2}
-                {include file="Public/novelListRank" start="31"/}
+                {include file="public/novelListRank" start="31"/}
                 {/if}
                 {/volist}
             </ul>
@@ -130,10 +130,10 @@
             <ul class="clearfix">
                 {volist name="arrNewsNovelRankNovel" id="Novel" key="key"}
                 {if $key == 1}
-                {include file="Public/novelListH" start="40"/}
+                {include file="public/novelListH" start="40"/}
                 {/if}
                 {if $key >= 2}
-                {include file="Public/novelListRank" start="41"/}
+                {include file="public/novelListRank" start="41"/}
                 {/if}
                 {/volist}
             </ul>
@@ -148,10 +148,10 @@
             <ul class="clearfix">
                 {volist name="arrEdnNovelRankNovel" id="Novel" key="key"}
                 {if $key == 1}
-                {include file="Public/novelListH" start="50"/}
+                {include file="public/novelListH" start="50"/}
                 {/if}
                 {if $key >= 2}
-                {include file="Public/novelListRank" start="51"/}
+                {include file="public/novelListRank" start="51"/}
                 {/if}
                 {/volist}
             </ul>

code/app/home/view/kuangYu/novel/getSearchNovel.html

@@ -59,7 +59,7 @@
             {else}
             <ul class="clearfix">
                 {foreach $arrPage.data as $key=>$Novel}
-                {include file="Public/novelListH" start="0"/}
+                {include file="public/novelListH" start="0"/}
                 {/foreach} 
             </ul>
             {/if}

code/app/home/view/kuangYu/pc/getArticleList.html

@@ -68,7 +68,7 @@
                         </ul>
                     </li>
                     {foreach $arrNewsNovel as $key=>$Novel}
-                    {include file="Pc/Public/articleList" /} 
+                    {include file="pc/public/articleList" /} 
                     {/foreach} 
                 </ol>
             </div>

code/app/home/view/kuangYu/pc/getKanNovelInfo.html

@@ -79,6 +79,7 @@
                 <meta itemprop="position" content="1" />
             </li>
             <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+                <?php $arrNovel['category_pinyin'] ?? $arrNovel['category_pinyin'] = 'all'?>
                 <a href="{$strPcPath}/shuku/all/{$arrNovel.category_pinyin}/all/page1" itemprop="item">
                     <span itemprop="name">{$arrNovel.og_novel_category}</span>
                 </a>
@@ -158,6 +159,7 @@
             <div class="inf02">
                 <h4>小说信息</h4>
                 <p>类别：
+                    <?php $arrNovel['category_pinyin'] ?? $arrNovel['category_pinyin'] = 'all'?>
                     <a href='{$strPcPath}/shuku/all/{$arrNovel.category_pinyin}/all/page1' title="{$arrNovel.og_novel_category}">
                         {$arrNovel.og_novel_category}
                     </a>

code/app/home/view/kuangYu/pc/getLibrary.html

@@ -151,7 +151,7 @@
     <div class="result" mod="search_data_list">
         <ul>
             {volist name="arrNovel" id="Novel" key="key"}
-            {include file="Pc/Public/shuKuNovelList" start="0"/}
+            {include file="pc/public/shukuNovelList" start="0"/}
             {/volist}
         </ul>
         <!--页码切换 开始-->

code/app/home/view/kuangYu/pc/getNovelCatalog.html

@@ -75,6 +75,7 @@
                 <meta itemprop="position" content="1" />
             </li>
             <li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">
+                <?php $arrNovel['category_pinyin'] ?? $arrNovel['category_pinyin'] = 'all'?>
                 <a href='{$strPcPath}{site:nflurl gender="all" category="$arrNovel[category_pinyin]"  status="all" page="1"/}' itemprop="item">
                     <span itemprop="name">{$arrNovel.og_novel_category}</span>
                 </a>
@@ -110,7 +111,7 @@
             <div class="tit" btn="toggle_chapter_list"><span></span>章节列表</div>
 
             <!-- 目录下拉分页-->
-            {include file="Pc/Public/allChapterPage" /}   
+            {include file="pc/public/allChapterPage" /}   
             
             <div class="fL_con">
                 <ul>
@@ -126,7 +127,7 @@
             </div>
 
             <!-- 目录下拉分页-->
-            {include file="Pc/Public/allChapterPage" /}
+            {include file="pc/public/allChapterPage" /}
         </div>
     </div>
 </div>

code/app/home/view/kuangYu/pc/getNovelChannel.html

@@ -76,13 +76,13 @@
         </div>
         <ul class="f2_list" mod="hot_tj">
             {volist name="arrRecommendSerializationNovel" id="Novel" key="key"}
-            {include file="Pc/Public/endNovelList" start="0"/}
+            {include file="pc/public/endNovelList" start="0"/}
             {/volist}
         </ul>
     </div>
     <div class="adv">
         {volist name="arrAdBanner" id="Ad" key="key"}
-        {include file="Pc/Public/adBanner" /}
+        {include file="pc/public/adBanner" /}
         {/volist}
      
     </div>
@@ -96,14 +96,14 @@
         </div>
         <ul class="rec_R">
             {volist name="arrRecommendEndNovel" id="Novel" key="key"}
-            {include file="Pc/Public/endNovelList" start="13"/}
+            {include file="pc/public/endNovelList" start="13"/}
             {/volist}
         </ul>
     </div>
 
     <div class="adv">
         {volist name="arrAdBanner" id="Ad" key="key"}
-        {include file="Pc/Public/adBanner" /}
+        {include file="pc/public/adBanner" /}
         {/volist}
     </div>
 
@@ -126,7 +126,7 @@
                         </ul>
                     </li>
                     {volist name="arrNewsUpdateNovel" id="Novel" key="key"}
-                    {include file="Pc/Public/indexNewsUpdateList" start="21"/}
+                    {include file="pc/public/indexNewsUpdateList" start="21"/}
                     {/volist}
                 </ol>
             </div>

code/app/home/view/kuangYu/pc/getNovelChapter.html

@@ -66,6 +66,9 @@
 			}
 		}
 	</script>
+	<script>
+        const strPcPath = `{$strPcPath}`;
+    </script>
 	<script src="/public/js/yueduqsbs.js"></script>
 
 </head>
@@ -141,7 +144,7 @@
 						</li>
 						<li class="line"></li>
 						<li class="sign-in">
-							<img src="/template/kuangyu/reader/web/images{$strUserUrlTemp}-icon.png" class="headPortrait">
+							<img src="/template/kuangyu/reader/web/images/user-icon.png" class="headPortrait">
 							<a href="{$strPcPath}{$strUserUrlTemp}">123456</a>
 							<div class="dropdown">
 								<!-- <a href="{$strUserUrlTemp}/index/index.html">个人中心</a> -->

code/app/home/view/kuangYu/pc/getNovelInfo.html

@@ -70,6 +70,7 @@
 </h2>
 {/block}
 {block name="main"}
+<?php $arrNovel['category_pinyin'] ?? $arrNovel['category_pinyin'] = 'all'?>
 <div class="content">
     <nav class="breadcrumb" aria-label="breadcrumb">
         <ol itemscope itemtype="https://schema.org/BreadcrumbList">

code/app/home/view/kuangYu/pc/getNovelRank.html

@@ -65,10 +65,10 @@
                     <ol class="list" mod="rank_data_list">
                         {foreach $arrDayRankNovel as $key=>$Novel}
                             {if $key == 0}
-                            {include file="Pc/Public/indexBoyRankOne" start="0"/}  
+                            {include file="pc/public/indexBoyRankOne" start="0"/}  
                             {/if}
                             {if $key >= 1}
-                            {include file="Pc/Public/indexBoyRankList" start="1"/}  
+                            {include file="pc/public/indexBoyRankList" start="1"/}  
                             {/if}
                         {/foreach} 
                     </ol>
@@ -89,10 +89,10 @@
                     <ol class="list" mod="rank_data_list">
                         {foreach $arrWeekRankNovel as $key=>$Novel}
                             {if $key == 0}
-                            {include file="Pc/Public/indexBoyRankOne" start="10"/}  
+                            {include file="pc/public/indexBoyRankOne" start="10"/}  
                             {/if}
                             {if $key >= 1}
-                            {include file="Pc/Public/indexBoyRankList" start="11"/}  
+                            {include file="pc/public/indexBoyRankList" start="11"/}  
                             {/if}
                         {/foreach}
                     </ol>
@@ -113,10 +113,10 @@
                     <ol class="list" mod="rank_data_list">
                         {foreach $arrMoonRankNovel as $key=>$Novel}
                             {if $key == 0}
-                            {include file="Pc/Public/indexBoyRankOne" start="20"/}  
+                            {include file="pc/public/indexBoyRankOne" start="20"/}  
                             {/if}
                             {if $key >= 1}
-                            {include file="Pc/Public/indexBoyRankList" start="21"/}  
+                            {include file="pc/public/indexBoyRankList" start="21"/}  
                             {/if}
                         {/foreach}
                     </ol>
@@ -137,10 +137,10 @@
                     <ol class="list" mod="rank_data_list">
                         {foreach $arrTotalRankNovel as $key=>$Novel}
                             {if $key == 0}
-                            {include file="Pc/Public/indexBoyRankOne" start="30"/}  
+                            {include file="pc/public/indexBoyRankOne" start="30"/}  
                             {/if}
                             {if $key >= 1}
-                            {include file="Pc/Public/indexBoyRankList" start="31"/}  
+                            {include file="pc/public/indexBoyRankList" start="31"/}  
                             {/if}
                         {/foreach}
                     </ol>
@@ -161,10 +161,10 @@
                     <ol class="list" mod="rank_data_list">
                         {foreach $arrNewsNovelRankNovel as $key=>$Novel}
                             {if $key == 0}
-                            {include file="Pc/Public/indexBoyRankOne" start="40"/}  
+                            {include file="pc/public/indexBoyRankOne" start="40"/}  
                             {/if}
                             {if $key >= 1}
-                            {include file="Pc/Public/indexBoyRankList" start="41"/}  
+                            {include file="pc/public/indexBoyRankList" start="41"/}  
                             {/if}
                         {/foreach}
                     </ol>
@@ -185,10 +185,10 @@
                     <ol class="list" mod="rank_data_list">
                         {foreach $arrEdnNovelRankNovel as $key=>$Novel}
                             {if $key == 0}
-                            {include file="Pc/Public/indexBoyRankOne" start="50"/}  
+                            {include file="pc/public/indexBoyRankOne" start="50"/}  
                             {/if}
                             {if $key >= 1}
-                            {include file="Pc/Public/indexBoyRankList" start="51"/}  
+                            {include file="pc/public/indexBoyRankList" start="51"/}  
                             {/if}
                         {/foreach}
                     </ol>

code/app/home/view/kuangYu/pc/getSearchNovel.html

@@ -63,7 +63,7 @@
         {else}
         <ul>
             {foreach $arrPage.data as $key=>$Novel}
-            {include file="Pc/Public/shuKuNovelList" start="0"/}
+            {include file="pc/public/shukuNovelList" start="0"/}
             {/foreach} 
         </ul>
         {/if}

code/app/home/view/kuangYu/pc/index.html

@@ -45,7 +45,7 @@
                 <ul id="mod_index_lb_nv_pic">
                     {volist name="arrRecommendSerializationNovel" id="Novel" key="key"}
                     {if $key < 6} 
-                    {include file="Pc/Public/swiperListImg" start="1" /} 
+                    {include file="pc/public/swiperListImg" start="1" /} 
                     {/if} 
                     {/volist}
                 </ul>
@@ -53,7 +53,7 @@
             <ol id="btn_index_lb_nv"> 
                 {volist name="arrRecommendSerializationNovel" id="Novel" key="key"}
                     {if $key < 6} 
-                        {include file="Pc/Public/swiperListText"  /} 
+                        {include file="pc/public/swiperListText"  /} 
                     {/if} 
                 {/volist} 
             </ol>
@@ -76,13 +76,13 @@
         <div class="md">
             {volist name="arrRecommendSerializationNovel" id="Novel" key="key"}
                 {if  $key > 5 && $key < 10} 
-                    {include file="Pc/Public/hostListImg" start="5" /} 
+                    {include file="pc/public/hostListImg" start="5" /} 
                 {/if} 
             {/volist} 
             {volist name="arrRecommendSerializationNovel" id="Novel" key="key"}
                 {if $key > 9 } 
                     {$arrGRM[$key+9]|raw}
-                    {include file="Pc/Public/hostListText" start="9"/} 
+                    {include file="pc/public/hostListText" start="9"/} 
                 {/if} 
             {/volist} 
             
@@ -97,14 +97,14 @@
         </div>
         <ul class="f2_list" mod="hot_tj">
             {volist name="arrRecommendEndNovel" id="Novel" key="key"}
-            {include file="Pc/Public/endNovelList"  start="13" /}
+            {include file="pc/public/endNovelList"  start="13" /}
             {/volist}
         </ul>
     </div>
     
     <div class="adv">
         {volist name="arrAdBanner" id="Ad" key="key"}
-        {include file="Pc/Public/adBanner" /}
+        {include file="pc/public/adBanner" /}
         {/volist}
     </div>
     
@@ -118,14 +118,14 @@
         </div>
         {volist name="arrBoyNewsNovel" id="Novel" key="key"}
             {if $key == 1}
-            {include file="Pc/Public/indexBoyNewsOne"  start="25" /}
+            {include file="pc/public/indexBoyNewsOne"  start="25" /}
             {/if}
         {/volist} 
         <div class="f3_C">
             <ul>
                 {volist name="arrBoyNewsNovel" id="Novel" key="key"}
                     {if $key >= 2}
-                    {include file="Pc/Public/indexBoyNewsList" start="26" /}  
+                    {include file="pc/public/indexBoyNewsList" start="26" /}  
                     {/if}
                 {/volist} 
             </ul>
@@ -141,10 +141,10 @@
                 <ol class="list" mod="rank_data_list">
                     {foreach $arrBoyWeekRankNovel as $key=>$Novel}
                         {if $key == 1}
-                        {include file="Pc/Public/indexBoyRankOne" start="30"/}  
+                        {include file="pc/public/indexBoyRankOne" start="30"/}  
                         {/if}
                         {if $key >= 2}
-                        {include file="Pc/Public/indexBoyRankList" start="31"/}  
+                        {include file="pc/public/indexBoyRankList" start="31"/}  
                         {/if}
                     {/foreach}  
                 </ol>
@@ -154,10 +154,10 @@
                 <ol class="list" mod="rank_data_list">
                     {foreach $arrBoyMoonRankNovel as $key=>$Novel}
                         {if $key == 1}
-                        {include file="Pc/Public/indexBoyRankOne" start="41"/}  
+                        {include file="pc/public/indexBoyRankOne" start="41"/}  
                         {/if}
                         {if $key >= 2}
-                        {include file="Pc/Public/indexBoyRankList" start="42"/}  
+                        {include file="pc/public/indexBoyRankList" start="42"/}  
                         {/if}
                     {/foreach}  
                 </ol>
@@ -167,10 +167,10 @@
                 <ol class="list" mod="rank_data_list">
                     {foreach $arrBoyTotalRankNovel as $key=>$Novel}
                         {if $key == 1}
-                        {include file="Pc/Public/indexBoyRankOne" start="53"/}  
+                        {include file="pc/public/indexBoyRankOne" start="53"/}  
                         {/if}
                         {if $key >= 2}
-                        {include file="Pc/Public/indexBoyRankList" start="54"/}  
+                        {include file="pc/public/indexBoyRankList" start="54"/}  
                         {/if}
                     {/foreach}  
                 </ol>
@@ -181,7 +181,7 @@
     
     <div class="adv">
         {volist name="arrAdBanner" id="Ad" key="key"}
-        {include file="Pc/Public/adBanner" /}
+        {include file="pc/public/adBanner" /}
         {/volist}
     </div>
 
@@ -193,14 +193,14 @@
         </div>
         {volist name="arrGirlNewsNovel" id="Novel" key="key"}
             {if $key == 1}
-            {include file="Pc/Public/indexBoyNewsOne" start="55"/}
+            {include file="pc/public/indexBoyNewsOne" start="55"/}
             {/if}
         {/volist} 
         <div class="f3_C">
             <ul>
                 {volist name="arrGirlNewsNovel" id="Novel" key="key"}
                     {if $key >= 2}
-                    {include file="Pc/Public/indexBoyNewsList" start="56"/}  
+                    {include file="pc/public/indexBoyNewsList" start="56"/}  
                     {/if}
                 {/volist} 
             </ul>
@@ -216,10 +216,10 @@
                 <ol class="list" mod="rank_data_list">
                     {volist name="arrGirlWeekRankNovel" id="Novel" key="key"}
                         {if $key == 1}
-                        {include file="Pc/Public/indexBoyRankOne"  start="59"/}  
+                        {include file="pc/public/indexBoyRankOne"  start="59"/}  
                         {/if}
                         {if $key >= 2}
-                        {include file="Pc/Public/indexBoyRankList"  start="60"/}  
+                        {include file="pc/public/indexBoyRankList"  start="60"/}  
                         {/if}
                     {/volist}  
                 </ol>
@@ -229,10 +229,10 @@
                 <ol class="list" mod="rank_data_list">
                     {volist name="arrGirlMoonRankNovel" id="Novel" key="key"}
                         {if $key == 1}
-                        {include file="Pc/Public/indexBoyRankOne"  start="71"/}  
+                        {include file="pc/public/indexBoyRankOne"  start="71"/}  
                         {/if}
                         {if $key >= 2}
-                        {include file="Pc/Public/indexBoyRankList"  start="72" /}  
+                        {include file="pc/public/indexBoyRankList"  start="72" /}  
                         {/if}
                     {/volist}  
                 </ol>
@@ -242,10 +242,10 @@
                 <ol class="list" mod="rank_data_list">
                     {volist name="arrBGirlTotalRankNovel" id="Novel" key="key"}
                         {if $key == 1}
-                        {include file="Pc/Public/indexBoyRankOne"  start="83"/}  
+                        {include file="pc/public/indexBoyRankOne"  start="83"/}  
                         {/if}
                         {if $key >= 2}
-                        {include file="Pc/Public/indexBoyRankList" start="84"/}  
+                        {include file="pc/public/indexBoyRankList" start="84"/}  
                         {/if}
                     {/volist}  
                 </ol>
@@ -256,7 +256,7 @@
 
     <div class="adv">
         {volist name="arrAdBanner" id="Ad" key="key"}
-        {include file="Pc/Public/adBanner" /}
+        {include file="pc/public/adBanner" /}
         {/volist}
     </div>
     
@@ -279,7 +279,7 @@
                         </ul>
                     </li>
                     {volist name="arrNewsUpdateNovel" id="Novel" key="key"}
-                        {include file="Pc/Public/indexNewsUpdateList" start="95"/}  
+                        {include file="pc/public/indexNewsUpdateList" start="95"/}  
                     {/volist} 
                 </ol>
             </div>

code/app/home/view/kuangYu/pc/public/indexBoyNewsList.html

@@ -1,4 +1,5 @@
 <li>
+    <?php $Novel['category_pinyin'] ?? $Novel['category_pinyin'] = 'all'?>
     <h3>
         {$arrGRM[$key+[start]]|raw}
         <a href='{$strPcPath}{site:nurl n_id="$Novel->n_id" n_py="$Novel->og_novel_pin_yin"/}' title="{$Novel->og_novel_book_name ?? ''}" >
@@ -7,7 +8,7 @@
     </h3>
     <div class="book_inf">
         <span class="aut">{$Novel->og_novel_author ?? ''}</span>
-        <span class="tag"><a href="{$strPcPath}/shuku/all/{$Novel->category_pinyin ?? 'all'}/all/page1" >{$Novel->og_novel_category ?? ''}</a></span>
+        <span class="tag"><a href="{$strPcPath}/shuku/all/{$Novel->category_pinyin}/all/page1" >{$Novel->og_novel_category ?? ''}</a></span>
         <a href='{$strPcPath}{site:nurl n_id="$Novel->n_id" n_py="$Novel->og_novel_pin_yin"/}' title="{$Novel->og_novel_book_name ?? ''}"  class="book_cov">
             <img class="lazyload_book_cover lazyload-img"
             src="/static/img/default.jpg" data-src="{$Novel.n_cover_path ?? ''}"

code/app/home/view/kuangYu/pc/public/indexNewsUpdateList.html

@@ -1,6 +1,7 @@
 <li>
     <ul>
         <li class="lb">
+            <?php $Novel['category_pinyin'] ?? $Novel['category_pinyin'] = 'all'?>
             <a href='{$strPcPath}{site:nflurl gender="all" category="$Novel[category_pinyin]"  status="all" page="1"/}' >{$Novel->og_novel_category ?? ''}</a></li>
         <li class="sm">
             <h3>

code/app/home/view/kuangYu/pc/user/index.html

@@ -58,7 +58,7 @@
                 <div class="tabBd">
                     <ul class="hotBookBd  ">
                         {volist name="arrMoonRankNovel" id="Novel" key="key"}
-                        {include file="Pc/Public/endNovelList" start="0"/}
+                        {include file="pc/public/endNovelList" start="0"/}
                         {/volist}
 
                     </ul>

code/app/home/view/kuangYu/推广SEO过程设计记录/index.md

@@ -51,6 +51,7 @@ pc-首页
     4.收录推送
     5.友情链接
     6.热搜词  顶部收索框下面展示，全站通用，每个站点随机展示10条
+    7.需要指定一个小说id 的内容页面  展示为首页，然后现在的首页路径改成   nindex