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

# Conflicts:
#	code/app/home/controller/Novel.php
#	code/app/model/NovelModel.php
#	code/extend/template/taglib/Site.php
This commit is contained in:
Default
2025-04-17 17:40:41 +08:00
38 changed files with 2044 additions and 2095 deletions

View File

@@ -15,7 +15,7 @@ class Site extends TagLib
'cpurl' => ['attr' => 'n_id,n_py,c_sort,c_page', 'close' => 0],
'lcpurl' => ['attr' => 'n_id,n_py', 'close' => 0],
'nclurl' => ['attr' => 'n_id,n_py,order,page', 'close' => 0],
'nflurl' => ['attr' => 'gender,category,status,page', 'close' => 0],
'nflurl' => ['attr' => 'gender,category,status,order,page', 'close' => 0],
'grm' => ['attr' => 'domain,code,line,diff,start,end,index,type', 'close' => 0],
];
@@ -181,11 +181,12 @@ EOD;
$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'] : '';
$strParse = <<<EOD
<?php
\$strUrl = app(\\app\\services\\NovelService::class)->getNovelCategoryUrl("{$strGender}","{$strCategory}","{$strStatus}","{$intPage}");
\$strUrl = app(\\app\\services\\NovelService::class)->getNovelCategoryUrl("{$strGender}","{$strCategory}","{$strStatus}","{$strOrder}","{$intPage}");
echo \$strUrl;
?>
EOD;