diff --git a/code/app/home/config/router.php b/code/app/home/config/router.php index fd08f05..b6bbb5e 100644 --- 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; diff --git a/code/app/home/view/default/Novel/getLibrary.html b/code/app/home/view/default/Novel/getLibrary.html index 76201ae..07f6454 100644 --- 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"} + + + +{if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'} + +{else} + + +{/if} + + +{if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'} + +{else} + +{/if} + +{/block} + {block name="head-js"}{/block} {block name='nav-active-class'}home{/block} {block name="body-class"}novel_home{/block} diff --git a/code/app/home/view/kuangYu/basePc.html b/code/app/home/view/kuangYu/basePc.html index 7c55109..68b2ef0 100644 --- a/code/app/home/view/kuangYu/basePc.html +++ b/code/app/home/view/kuangYu/basePc.html @@ -35,10 +35,10 @@
  • 首页
    • -
  • +
  • 男生
    • -
  • +
  • 女生
  • diff --git a/code/app/home/view/kuangYu/novel/getLibrary.html b/code/app/home/view/kuangYu/novel/getLibrary.html index e46db85..811a0ed 100644 --- 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"} - - -{if $strGender == 'all' && $strCategory == 'all' && $strStatus == 'all'} + + +{if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'} {else} - -{/if} + +{/if} -{if $strGender == 'all' && $strCategory == 'all' && $strStatus == 'all'} +{if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'} {else} {/if} {/block} + {block name="head-js"}{/block} {block name="logo-html"}

    - {$DomainModel->d_name}-{$strNovelSex}{$strSearchCategory}{$strSearchStatus}免费阅读 + {$DomainModel->d_name}-{$Request.route.strGender}{$Request.route.strCategory}{$Request.route.strStatus}免费阅读

    {/block} +{block name="strPageCode"} + +{/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" /} +
    -

    {$strDescription??''}

    +

    {site:replace code="NOVEL@GETLIBRARY@DESCRIPTION"}

    @@ -91,7 +101,7 @@
    @@ -110,14 +120,14 @@
    @@ -128,14 +138,14 @@
    @@ -146,14 +156,14 @@
    diff --git a/code/app/home/view/kuangYu/pc/getLibrary.html b/code/app/home/view/kuangYu/pc/getLibrary.html index cb5fde7..77464ab 100644 --- 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"} - - + + {if $Request.route.strGender == 'all' && $Request.route.strCategory == 'all' && $Request.route.strStatus == 'all'} {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')}" } @@ -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')}" } @@ -60,6 +60,10 @@ {/block} +{block name="strPageCode"} + +{/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
    + 6 + {$Request.route.strGender} + 5 所属频道 @@ -108,41 +115,42 @@ button_num="10" cache_life="86400" func="generateCategoryPager" export_name="res
    所属分类
      -
    • + 全部
      • - {eq name="$Request.route.strGender" value="all"} - {foreach $arrCategoryAll.man as $key=>$vo } -
    • {$vo}
      • - {/foreach} - {foreach $arrCategoryAll.women as $key=>$vo } -
    • {$vo}
      • - {/foreach} - {/eq} + btn="search_category">全部 + + {if $Request.route.strGender == "all" || $Request.route.strGender == ""} + {novel:category d_key="strCategoryPinyin" d_val="strCategoryName"} +
    • + {$strCategoryName} +
      • + {/novel:category} + {/if} + {eq name="$Request.route.strGender" value="$strNanUrl"} - {foreach $arrCategoryAll.man as $key=>$vo } -
    • {$vo}
      • - {/foreach} + {novel:category d_key="strCategoryPinyin" d_val="strCategoryName" n_sex="man"} +
    • {$strCategoryName}
      • + {/novel:category} {/eq} + {eq name="$Request.route.strGender" value="$strNvUrl"} - {foreach $arrCategoryAll.women as $key=>$vo } -
    • {$vo}
      • - {/foreach} + {novel:category d_key="strCategoryPinyin" d_val="strCategoryName" n_sex="women"} +
    • {$strCategoryName}
      • + {/novel:category} {/eq}
    是否完结
      -
    • 全部
      • - {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}
        - {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} - « + {if $resData.p_data.page == 1} +
      • «
        • {else}         « {/if} {/case} {case value="下一页"} - {if $Request.route.intPage >= resData.p_data.total} + {if $resData.p_data.page >= $resData.p_data.total}
      • »
        • {else}
      • »
        • diff --git a/code/app/home/view/kuangYu/pc/getNovelChannel.html b/code/app/home/view/kuangYu/pc/getNovelChannel.html index 8441805..6cf625d 100644 --- 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"} + param('strChannel'); ?> +{/block} + {block name="head"} +param('strChannel'); + +?> + - - - + + + {/block} + {block name="head-css"} -{eq name="strPageCode" value="boys"} +{eq name="strPageCode" value="man"} {else} @@ -38,9 +52,10 @@ {/block} + {block name="main"} - +{site:grm page_code="pc_index" diff="0" num="50" g_key="arrGrm" /}
        @@ -53,7 +68,7 @@
      • - {eq name="strPageCode" value="boys"} + {eq name="strPageCode" value="man"} 男生 @@ -75,15 +90,13 @@
          • - {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}
      - {volist name="arrAdBanner" id="Ad" key="key"} - {include file="pc/public/adBanner" /} - {/volist} +
      @@ -95,16 +108,15 @@

      完本推荐

      - {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}
    - {volist name="arrAdBanner" id="Ad" key="key"} - {include file="pc/public/adBanner" /} - {/volist} +
    @@ -125,9 +137,9 @@
  • 更新时间
    • - {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} diff --git a/code/app/home/view/kuangYu/pc/getNovelRank.html b/code/app/home/view/kuangYu/pc/getNovelRank.html index c625532..6afec31 100644 --- 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"} - - - - + + + + {/block} + {block name="head-css"} {/block} @@ -31,7 +34,15 @@ {/block} + +{block name="strPageCode"} + +{/block} + {block name="main"} + +{site:grm page_code="h5_rank" diff="0" num="100" g_key="arrGrm" /} +
    - - - +
    @@ -63,14 +70,14 @@
      - {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}