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

This commit is contained in:
make
2025-04-18 16:25:09 +08:00
16 changed files with 861 additions and 47 deletions

View File

@@ -5,16 +5,16 @@ declare(strict_types=1);
use app\home\controller\Index;
use app\home\controller\Novel;
use app\home\controller\User;
use app\services\SiteContext;
use think\facade\Route;
Route::get('/article/fenlei/:category', function (\think\Request $Request) {
return view('test/test01/index.html');
Route::get('/article/fenlei/:category', function (\think\Request $Request, SiteContext $SiteContext) {
return view($SiteContext->getHomeView());
});
/**
* 路由配置文件
*/
@@ -83,7 +83,7 @@ $arrRoutes = [
* 完整路由
* 暂时不需要开放
* 使用: {site:nflurl gender="$strGender" category="$CategoryPinyin" status="all" order="all" page="1"/}
*/
*/
// '/shuku/:strGender/:strCategory/:strStatus/:strOrder/page:intPage',
// '/books/:strGender/:strCategory/:strStatus/:strOrder/page:intPage',
// '/library/:strGender/:strCategory/:strStatus/:strOrder/page:intPage',

View File

@@ -204,13 +204,13 @@ class Novel extends BaseController
$arrPage = $NovelModel->getCustomPage01($strKey, $intPage, $intLimit, $intLifeTime, $intGender, $strSearchStatus);
$strTemplate = '';
$intButtomNum = 5;
$intButtonNum = 5;
if ($boolIsMobile == false) {
$intButtomNum = 10;
$intButtonNum = 10;
$strTemplate = 'pc/getLibrary';
}
$arrPaginator = CusteomPage02::generate($intPage, $arrPage['total'], $intLimit, $strBaseUrl, $intButtomNum);
$arrPaginator = CusteomPage02::generate($intPage, $arrPage['total'], $intLimit, $strBaseUrl, $intButtonNum);
// 更新值
ConverterMovel::setVal([
@@ -855,13 +855,13 @@ class Novel extends BaseController
$arrPage = $ChapterModel->findPaginatedWithCache($arrFilter, $intPage, $intLimit, $arrSort, $strKey, $intLifeTime);
$intButtomNum = 5;
$intButtonNum = 5;
if ($boolIsMobile == false) {
$intButtomNum = 10;
$intButtonNum = 10;
}
$strBaseUrl = app(NovelService::class)->getNovelCatalogUrl($intNId, $arrNovel['n_name_pinyin'], $strOrder, '{page}');
$arrPaginator = CusteomPage02::generate($intPage, $arrPage['total'], $intLimit, $strBaseUrl, $intButtomNum);
$arrPaginator = CusteomPage02::generate($intPage, $arrPage['total'], $intLimit, $strBaseUrl, $intButtonNum);
// 更新值
ConverterMovel::setVal([
@@ -941,11 +941,11 @@ class Novel extends BaseController
$arrPage = $NovelModel->findPaginatedWithCache($arrFilter, $intPage, $intLimit, [], $strKey);
$intButtomNum = 10;
$intButtonNum = 10;
$strBaseUrl = app(NovelService::class)->getNovelSearchUrl($strSearchKeywords, '{page}');
$arrPaginator = CusteomPage02::generate($intPage, $arrPage['total'], $intLimit, $strBaseUrl, $intButtomNum);
$arrPaginator = CusteomPage02::generate($intPage, $arrPage['total'], $intLimit, $strBaseUrl, $intButtonNum);
// 更新值
ConverterMovel::setVal([

View File

@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head>
{novel:info n_id="$DomainModel->n_id" n_key="arrNovel01" n_forge_id="1125940" /}
<title>{$arrNovel01.n_name} - 首页</title>
</head>
<body>
{$arrNovel01.n_description}
</body>
</html>

View File

@@ -1,9 +1,58 @@
<!-- {site:grm page_code="fdasfadsf" diff="fadsfdsa" num="10" g_key="arrGrm" /}
{php}var_dump($arrGrm);{/php} -->
<!-- {chapter:info n_id="1" c_sort_num="200" c_page="0" c_key="arrChapter01" /}
{$arrChapter01.c_name} -->
<!-- {chapter:pager page="1" limit="10" n_id="$Request.get.n_id" d_key="d_key" d_val="chapter" cache_life="1000" button_num="3" sort_type="dao" p_val="page_data" func="generateChapterPager"}
<li>
Index: {$d_key}
章节名称: {$chapter.c_name}
章节序号: {$chapter.c_sort_num}
</li>
{/chapter:pager}
{php}var_dump($page_data);{/php} -->
<!-- {chapter:list count="10" n_id="$Request.get.n_id" d_key="d_key" d_val="chapter" cache_life="1000"}
<li>
Index: {$d_key}
章节名称: {$chapter.c_name}
章节序号: {$chapter.c_sort_num}
</li>
{/chapter:list} -->
<!--
{novel:category d_key="key" d_val="val"}
<li>
键: {$key} - 值: {$val}
</li>
{/novel:category} -->
<!-- {novel:sex d_key="key" d_val="val"}
<li>
键: {$key} - 值: {$val}
</li>
{/novel:sex} -->
<!--
{novel:status d_key="key" d_val="val"}
<li>
键: {$key} - 值: {$val}
</li>
{/novel:status} -->
<!--
{novel:sort d_key="key" d_val="val"}
<li>
键: {$key} - 值: {$val}
</li>
{/novel:sort} -->
{novel:info n_id="33" n_key="arrNovel01" n_forge_id="1125940" /}
{$arrNovel01.n_name}
<!-- {$DomainModel->d_domain} -->
<!-- {site:replace code="INDEX@INDEX@TITLE"}