diff --git a/code/app/admin/controller/Site.php b/code/app/admin/controller/Site.php index 6cf2825..0467ee3 100644 --- a/code/app/admin/controller/Site.php +++ b/code/app/admin/controller/Site.php @@ -179,6 +179,7 @@ class Site extends BaseController "d_img_log" => $Request->post('d_img_log'), "d_content_encode" => $Request->post('d_content_encode'), "t_cfg" => $Request->post('t_cfg'), + "info_id" => $Request->post('info_id'), ]; $arrRule = [ diff --git a/code/app/home/view/default/basePc.html b/code/app/home/view/default/basePc.html index c43080a..77d3f68 100644 --- a/code/app/home/view/default/basePc.html +++ b/code/app/home/view/default/basePc.html @@ -34,7 +34,6 @@ {/block} -
@@ -45,7 +44,7 @@
-

{$DomainModel->d_name}

+

{$DomainModel->d_name}

diff --git a/code/app/home/view/default/novel/getNovelInfo.html b/code/app/home/view/default/novel/getNovelInfo.html index 73b05e4..c352857 100644 --- a/code/app/home/view/default/novel/getNovelInfo.html +++ b/code/app/home/view/default/novel/getNovelInfo.html @@ -9,9 +9,30 @@ $Novel.n_id{extend name="baseH5" /} {site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} {/block} -{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}{/block} -{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}{/block} -{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}{/block} +{block name="title"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@TITLE"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /} + {/if} +{/block} + + +{block name="keywords"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@KEYWORDS"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"} + {/if} +{/block} + +{block name="description"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@DESCRIPTION"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"} + {/if} +{/block} {block name="head"} @@ -94,7 +115,6 @@ $Novel.n_id{extend name="baseH5" /} {/block} - {block name="head-js"} {/block} @@ -136,6 +156,10 @@ $Novel.n_id{extend name="baseH5" /} {block name="main"}

{$arrNovel['n_name']}最新章节 - {$arrNovel['n_author']} - {$DomainModel->d_name}

+{if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} +

{$DomainModel->d_index_description}

+{/if} +
diff --git a/code/app/home/view/default/pc/getNovelInfo.html b/code/app/home/view/default/pc/getNovelInfo.html index f9e06c7..4143056 100644 --- a/code/app/home/view/default/pc/getNovelInfo.html +++ b/code/app/home/view/default/pc/getNovelInfo.html @@ -9,9 +9,30 @@ {site:grm page_code="pc_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} {/block} -{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE"}{/block} -{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS"}{/block} -{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION"}{/block} +{block name="title"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@TITLE"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /} + {/if} +{/block} + + +{block name="keywords"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@KEYWORDS"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"} + {/if} +{/block} + +{block name="description"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@DESCRIPTION"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"} + {/if} +{/block} {block name="head"} @@ -137,6 +158,10 @@

《{$arrNovel.n_name ?? ''}》{$arrNovel.n_name ?? '章节'}

+ {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} +

{$DomainModel->d_index_description}

+ {/if} + {$arrNovel.strFocus ?? ""} 。看小说就来{$DomainModel->d_name} {$DomainModel->d_domain}...

相邻推荐： diff --git a/code/app/home/view/haoZi/baseH5.html b/code/app/home/view/haoZi/baseH5.html index 5f8e2e6..b729099 100644 --- a/code/app/home/view/haoZi/baseH5.html +++ b/code/app/home/view/haoZi/baseH5.html @@ -41,7 +41,13 @@

    + {if $DomainModel->info_id > 0}
  • 首页
    • +
  • 小说首页
    • + {else} +
  • 首页
    • + {/if} +
  • 排行
  • 全本
  • 分类
    • diff --git a/code/app/home/view/haoZi/basePc.html b/code/app/home/view/haoZi/basePc.html index 80992dc..d39ec12 100644 --- a/code/app/home/view/haoZi/basePc.html +++ b/code/app/home/view/haoZi/basePc.html @@ -33,6 +33,17 @@
      + {if $DomainModel->info_id > 0} +
    • + 首 页 +
      • +
    • 小说首页
      • + {else} +
    • + 首 页 +
      • + {/if} +
    • 首页
    • 总排行
      • diff --git a/code/app/home/view/haoZi/novel/getNovelInfo.html b/code/app/home/view/haoZi/novel/getNovelInfo.html index e84a00b..26c0aed 100644 --- a/code/app/home/view/haoZi/novel/getNovelInfo.html +++ b/code/app/home/view/haoZi/novel/getNovelInfo.html @@ -9,9 +9,29 @@ {site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} {/block} -{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}{/block} -{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}{/block} -{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}{/block} +{block name="title"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@TITLE"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /} + {/if} +{/block} + +{block name="keywords"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@KEYWORDS"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"} + {/if} +{/block} + +{block name="description"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@DESCRIPTION"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"} + {/if} +{/block} {block name="head"} @@ -104,6 +124,9 @@ {block name="main"}

      {$arrNovel['n_name']}最新章节 - {$arrNovel['n_author']} - {$DomainModel->d_name}

      +{if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} +

      {$DomainModel->d_index_description}

      +{/if}
    + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} +

    {$DomainModel->d_index_description}

    + {/if}

    {$arrNovel.strFocus ?? ""} 。看小说就来{$DomainModel->d_name} {$DomainModel->d_domain}...

diff --git a/code/app/home/view/kuangYu/novel/getNovelInfo.html b/code/app/home/view/kuangYu/novel/getNovelInfo.html index 295d528..d108a18 100644 --- a/code/app/home/view/kuangYu/novel/getNovelInfo.html +++ b/code/app/home/view/kuangYu/novel/getNovelInfo.html @@ -9,9 +9,29 @@ {site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} {/block} -{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}{/block} -{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}{/block} -{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}{/block} +{block name="title"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@TITLE"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /} + {/if} +{/block} + +{block name="keywords"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@KEYWORDS"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"} + {/if} +{/block} + +{block name="description"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@DESCRIPTION"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"} + {/if} +{/block} {block name="head"} @@ -128,6 +148,9 @@

{$arrNovel['n_name']}最新章节 - {$arrNovel['n_author']} - {$DomainModel->d_name}

+ {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} +

{$DomainModel->d_index_description}

+ {/if} diff --git a/code/app/home/view/kuangYu/pc/getNovelInfo.html b/code/app/home/view/kuangYu/pc/getNovelInfo.html index 4e6f453..943b85a 100644 --- a/code/app/home/view/kuangYu/pc/getNovelInfo.html +++ b/code/app/home/view/kuangYu/pc/getNovelInfo.html @@ -9,9 +9,29 @@ {site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} {/block} -{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}{/block} -{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}{/block} -{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}{/block} +{block name="title"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@TITLE"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /} + {/if} +{/block} + +{block name="keywords"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@KEYWORDS"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"} + {/if} +{/block} + +{block name="description"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@DESCRIPTION"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"} + {/if} +{/block} {block name="head"} @@ -117,6 +137,9 @@

{$arrNovel['n_name']}最新章节 - {$arrNovel['n_author']} - {$DomainModel->d_name}

+ {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} +

{$DomainModel->d_index_description}

+ {/if}
diff --git a/code/app/home/view/shikong/novel/getNovelInfo.html b/code/app/home/view/shikong/novel/getNovelInfo.html index 141ea74..d13bd3f 100644 --- a/code/app/home/view/shikong/novel/getNovelInfo.html +++ b/code/app/home/view/shikong/novel/getNovelInfo.html @@ -9,9 +9,29 @@ $Novel.n_id{extend name="baseH5" /} {site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} {/block} -{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}{/block} -{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}{/block} -{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}{/block} +{block name="title"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@TITLE"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /} + {/if} +{/block} + +{block name="keywords"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@KEYWORDS"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"} + {/if} +{/block} + +{block name="description"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@DESCRIPTION"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"} + {/if} +{/block} {block name="head"} @@ -146,7 +166,9 @@ $Novel.n_id{extend name="baseH5" /} {$arrGrm[3]|raw}

{$arrNovel['n_name']}最新章节 - {$arrNovel['n_author']} - {$DomainModel->d_name}

- + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} +

{$DomainModel->d_index_description}

+ {/if}
{$arrGrm[4]|raw} diff --git a/code/app/home/view/xiongMao/novel/getNovelInfo.html b/code/app/home/view/xiongMao/novel/getNovelInfo.html index 6a68867..b172574 100644 --- a/code/app/home/view/xiongMao/novel/getNovelInfo.html +++ b/code/app/home/view/xiongMao/novel/getNovelInfo.html @@ -9,10 +9,29 @@ {site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} {/block} -{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}{/block} -{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}{/block} -{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}{/block} +{block name="title"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@TITLE"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /} + {/if} +{/block} +{block name="keywords"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@KEYWORDS"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"} + {/if} +{/block} + +{block name="description"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@DESCRIPTION"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"} + {/if} +{/block} {block name="head"} @@ -130,6 +149,9 @@

{$arrNovel['n_name']}最新章节 - {$arrNovel['n_author']} - {$DomainModel->d_name}

+{if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} +

{$DomainModel->d_index_description}

+{/if}
diff --git a/code/app/home/view/xiongMao/pc/getNovelInfo.html b/code/app/home/view/xiongMao/pc/getNovelInfo.html index 56aa021..4bddac4 100644 --- a/code/app/home/view/xiongMao/pc/getNovelInfo.html +++ b/code/app/home/view/xiongMao/pc/getNovelInfo.html @@ -9,9 +9,29 @@ {site:grm page_code="h5_novel_info" diff="$arrNovel.n_id" num="120" g_key="arrGrm" /} {/block} -{block name="title"}{site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /}{/block} -{block name="keywords"}{site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"}{/block} -{block name="description"}{site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"}{/block} +{block name="title"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@TITLE"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@TITLE" diff="$Request.route.intNovelId" /} + {/if} +{/block} + +{block name="keywords"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@KEYWORDS"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@KEYWORDS" diff="$Request.route.intNovelId"} + {/if} +{/block} + +{block name="description"} + {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} + {site:replace code="INDEX@INDEX@DESCRIPTION"} + {else} + {site:replace code="NOVEL@GETNOVELINFO@DESCRIPTION" diff="$Request.route.intNovelId"} + {/if} +{/block} {block name="head"} @@ -120,6 +140,9 @@

{$arrNovel['n_name']}最新章节 - {$arrNovel['n_author']} - {$DomainModel->d_name}

+ {if $DomainModel->info_id == $Request.route.intNovelId || empty($Request.route.intNovelId)} +

{$DomainModel->d_index_description}

+ {/if}
diff --git a/code/app/services/SiteContext.php b/code/app/services/SiteContext.php index 533cfd5..41c2b85 100644 --- a/code/app/services/SiteContext.php +++ b/code/app/services/SiteContext.php @@ -157,10 +157,10 @@ class SiteContext * 变量转换 * * @param string $strCode - * @param string $strDiff + * @param string|null $strDiff * @return string */ - public function converterTemplate(string $strCode, string $strDiff = "0"): string + public function converterTemplate(string $strCode, string | Null $strDiff = "0"): string { $strTitleTemplate = $this->DomainModel->getFomartSubject($strCode, $strDiff); diff --git a/doc/域名.xlsx b/doc/域名.xlsx index b3c6831..99c9af4 100644 Binary files a/doc/域名.xlsx and b/doc/域名.xlsx differ