diff --git a/code/app/home/config/router.php b/code/app/home/config/router.php index 074e91c..50a4169 100644 --- a/code/app/home/config/router.php +++ b/code/app/home/config/router.php @@ -38,8 +38,7 @@ Route::get('/pc/nvsheng-xiaoshuo', [Novel::class, 'getNovelChannel'])->append([ * 书库 - grok 推荐最优方案 * /shuku/strGender/category/status/page */ -Route::get('/shuku/all', [Novel::class, 'getLibrary'])->append(['boolIsMobile' => true]); -Route::get('/pc/shuku/all', [Novel::class, 'getLibrary'])->append(['boolIsMobile' => false]); + Route::get('/shuku/:strGender/:strCategory/:strStatus/page:intPage', [Novel::class, 'getLibrary']) ->pattern([ 'strGender' => 'nansheng-xiaoshuo|nvsheng-xiaoshuo|all', @@ -57,7 +56,8 @@ Route::get('/pc/shuku/:strGender/:strCategory/:strStatus/page:intPage', [Novel:: 'intPage' => '\d+' ]) ->append(['boolIsMobile' => false]); - +Route::get('/shuku/all', [Novel::class, 'getLibrary'])->append(['boolIsMobile' => true]); +Route::get('/pc/shuku/all', [Novel::class, 'getLibrary'])->append(['boolIsMobile' => false]); /** * 小说章节 diff --git a/code/app/home/controller/Novel.php b/code/app/home/controller/Novel.php index 1672d76..020590a 100644 --- a/code/app/home/controller/Novel.php +++ b/code/app/home/controller/Novel.php @@ -86,7 +86,7 @@ class Novel extends BaseController $boolIsMobile = $Request->param('boolIsMobile'); // 性别 - + $arrSex = [ 'all' => 0, 'nansheng-xiaoshuo' => 1, @@ -100,17 +100,15 @@ class Novel extends BaseController $intGender = $arrSex[$strGender]; // 分类 - // $strCategory = $Request->param('strCategory'); - if ($strCategory == 'all') { $strSearchCategory = NULL; - } else if (!in_array($strGender, CategoryModel::$arrCategoryPinYin)) { + } else if (!in_array($strCategory, CategoryModel::$arrCategoryPinYin)) { return response('Bad Request', 400); } else { - $strCategoryKey = array_search($strGender, CategoryModel::$arrCategoryPinYin); + $strCategoryKey = array_search($strCategory, CategoryModel::$arrCategoryPinYin); $strSearchCategory = CategoryModel::$arrCategory[$strCategoryKey]; } - + // 小说状态 // $strStatus = $Request->param('strStatus'); $arrStatus = [ @@ -140,7 +138,7 @@ class Novel extends BaseController $arrPage = $NovelModel->getCommonNovelPageOnCache($strKey, $intPage, $intLimit, $intLifeTime, $intGender, $strSearchStatus); - $strTemplate = NULL; + $strTemplate = ''; $intButtomNum = 5; if ($boolIsMobile == false) { $intButtomNum = 10; @@ -162,8 +160,6 @@ class Novel extends BaseController 'arrPaginator' => $arrPaginator, ]); - - return View::fetch($strTemplate); } @@ -349,7 +345,6 @@ class Novel extends BaseController // 精品推荐->同分类随机10条数据 // 最新要点->取新意章节， 随机提取一部分内容 大概150字数 - // {strNovelName}最新章节_{strNovelName}{strNovelAuthor}_{strNovelName}全文阅读_{strSiteName} // {strNovelName}免费全文阅读-{strNovelName}{strNovelAuthor}-{strSiteName} diff --git a/code/app/home/view/kuangyu/Novel/getLibrary.html b/code/app/home/view/kuangyu/Novel/getLibrary.html index c0acedc..8a3231b 100644 --- a/code/app/home/view/kuangyu/Novel/getLibrary.html +++ b/code/app/home/view/kuangyu/Novel/getLibrary.html @@ -32,25 +32,35 @@
@@ -62,10 +72,27 @@ {/volist} +
diff --git a/code/app/home/view/kuangyu/Novel/getNovelRank.html b/code/app/home/view/kuangyu/Novel/getNovelRank.html index 6b4d6bb..f5b1491 100644 --- a/code/app/home/view/kuangyu/Novel/getNovelRank.html +++ b/code/app/home/view/kuangyu/Novel/getNovelRank.html @@ -33,15 +33,15 @@
@@ -52,15 +52,15 @@
@@ -71,15 +71,15 @@
@@ -90,14 +90,14 @@
@@ -108,14 +108,14 @@
@@ -126,14 +126,14 @@
diff --git a/code/app/home/view/kuangyu/Pc/getLibrary.html b/code/app/home/view/kuangyu/Pc/getLibrary.html index e1f05ba..cd924c5 100644 --- a/code/app/home/view/kuangyu/Pc/getLibrary.html +++ b/code/app/home/view/kuangyu/Pc/getLibrary.html @@ -32,7 +32,7 @@
所属频道 @@ -70,28 +70,33 @@
diff --git a/code/app/home/view/kuangyu/Public/articleList.html b/code/app/home/view/kuangyu/Public/articleList.html index e626c47..7382b2b 100644 --- a/code/app/home/view/kuangyu/Public/articleList.html +++ b/code/app/home/view/kuangyu/Public/articleList.html @@ -1,5 +1,5 @@
  • - 我真是一条龙 + 我真是一条龙
    {$key+=1}
    • \ No newline at end of file diff --git a/code/app/home/view/kuangyu/Public/historyNovelList.html b/code/app/home/view/kuangyu/Public/historyNovelList.html index 1093df2..3b70b25 100644 --- a/code/app/home/view/kuangyu/Public/historyNovelList.html +++ b/code/app/home/view/kuangyu/Public/historyNovelList.html @@ -1,9 +1,9 @@
  • - +
    - 我真是一条龙 + {$Novel.og_novel_book_name ?? ''} 耽美百合 diff --git a/code/app/home/view/kuangyu/Public/novelListH-b.html b/code/app/home/view/kuangyu/Public/novelListH-b.html deleted file mode 100644 index 21d51dd..0000000 --- a/code/app/home/view/kuangyu/Public/novelListH-b.html +++ /dev/null @@ -1,14 +0,0 @@ -
  • - {$Novel.og_novel_book_name ?? ''} - {$Novel.og_novel_book_name ?? ''} -

    {$Novel.og_description ?? ''}

    -

    - - 作者：{$Novel.og_novel_author ?? ''} - - {$Novel->og_novel_category ?? ''} - {$Novel->og_novel_status ?? ''} -

    -
    • \ No newline at end of file diff --git a/code/app/home/view/kuangyu/Public/novelListH.html b/code/app/home/view/kuangyu/Public/novelListH.html index 0a5d5ee..f1ce23c 100644 --- a/code/app/home/view/kuangyu/Public/novelListH.html +++ b/code/app/home/view/kuangyu/Public/novelListH.html @@ -1,6 +1,6 @@
  • {$Novel.og_novel_book_name ?? ''} {$Novel.og_novel_book_name ?? ''}

    {$Novel.og_description ?? ''}

    @@ -9,7 +9,7 @@ 作者：{$Novel.og_novel_author ?? ''} {$Novel->og_novel_category ?? ''} - {$Novel->og_novel_status ?? ''} + {$Novel->og_novel_status ?? ''}

    • diff --git a/code/app/home/view/kuangyu/Public/novelListRank.html b/code/app/home/view/kuangyu/Public/novelListRank.html index e626c47..d610a63 100644 --- a/code/app/home/view/kuangyu/Public/novelListRank.html +++ b/code/app/home/view/kuangyu/Public/novelListRank.html @@ -1,5 +1,5 @@
  • - 我真是一条龙 -
    {$key+=1} + {$Novel.og_novel_book_name ?? ''} + {$key}
    • \ No newline at end of file diff --git a/code/app/home/view/kuangyu/Public/novelListS-b.html b/code/app/home/view/kuangyu/Public/novelListS-b.html deleted file mode 100644 index f11cfe5..0000000 --- a/code/app/home/view/kuangyu/Public/novelListS-b.html +++ /dev/null @@ -1,10 +0,0 @@ -
  • - - {$Novel.og_novel_book_name ?? ''} - {$Novel.og_novel_book_name ?? ''} - - 作者：{$Novel.og_novel_author ?? ''} - - -
    • \ No newline at end of file diff --git a/code/database/seeders/SystemConfigSeeder.php b/code/database/seeders/SystemConfigSeeder.php index 2e8c7fb..f239d47 100644 --- a/code/database/seeders/SystemConfigSeeder.php +++ b/code/database/seeders/SystemConfigSeeder.php @@ -54,9 +54,9 @@ class SystemConfigSeeder 'sc_description' => '代理商API域名-解析前缀dl-open. 后缀是.xyz ,但这里不需要填前缀和后缀', ], [ - 'sc_code' => 'LOGO_IS_IMT_OR_TEXT', - 'sc_val' => "2", - 'sc_description' => 'logo 是图片还是文字，1：图片，2：文字', + 'sc_code' => 'PUBLIC_TONGJI_CODE', + 'sc_val' => "", + 'sc_description' => '全局刚刚统计代码', ], ]; diff --git a/code/public/template/kuangyu/home/new_wap/css/style.css b/code/public/template/kuangyu/home/new_wap/css/style.css index b5233cf..0a392cd 100644 --- a/code/public/template/kuangyu/home/new_wap/css/style.css +++ b/code/public/template/kuangyu/home/new_wap/css/style.css @@ -1426,7 +1426,7 @@ aria { border-bottom: 1px solid #f0f1f2; } .book-nav ul { - padding: 0.75rem; + padding: 0.1rem 0.75rem; font-size: 0; letter-spacing: 0; overflow: hidden;