This commit is contained in:
make
2025-05-07 11:25:47 +08:00
parent e404014c66
commit 5563b1da1f
6 changed files with 50 additions and 12 deletions

View File

@@ -92,7 +92,7 @@ abstract class BaseController
public function rending($strTemplate = '') public function rending($strTemplate = '')
{ {
// 全局使用的URL模板 // 全局使用的URL模板
$strPcUrlTemp = $this->request->DomainModel->getFomartSubject('PC_URL_PATH','',false); $strPcUrlTemp = $this->request->DomainModel->getFomartSubject('PC_PATH_URL','',false);
$strNanUrlTemp = $this->request->DomainModel->getFomartSubject('NAN_SHENG_URL','',false); $strNanUrlTemp = $this->request->DomainModel->getFomartSubject('NAN_SHENG_URL','',false);
$strNvUrlTemp = $this->request->DomainModel->getFomartSubject('NV_SHENG_URL','',false); $strNvUrlTemp = $this->request->DomainModel->getFomartSubject('NV_SHENG_URL','',false);
$strCategoryIndexUrlTemp = $this->request->DomainModel->getFomartSubject('CATEGORY_INDEX_URL','',false); $strCategoryIndexUrlTemp = $this->request->DomainModel->getFomartSubject('CATEGORY_INDEX_URL','',false);

View File

@@ -112,7 +112,7 @@ class SiteContext
{ {
if(config('app.default_app_type') == 'novel'){ if(config('app.default_app_type') == 'novel'){
// 全局使用的URL模板 // 全局使用的URL模板
$strPcUrlTemp = $this->DomainModel->getFomartSubject('PC_URL_PATH', '', false); $strPcUrlTemp = $this->DomainModel->getFomartSubject('PC_PATH_URL', '', false);
$strNanUrlTemp = $this->DomainModel->getFomartSubject('NAN_SHENG_URL', '', false); $strNanUrlTemp = $this->DomainModel->getFomartSubject('NAN_SHENG_URL', '', false);
$strNvUrlTemp = $this->DomainModel->getFomartSubject('NV_SHENG_URL', '', false); $strNvUrlTemp = $this->DomainModel->getFomartSubject('NV_SHENG_URL', '', false);
$strCategoryIndexUrlTemp = $this->DomainModel->getFomartSubject('CATEGORY_INDEX_URL', '', false); $strCategoryIndexUrlTemp = $this->DomainModel->getFomartSubject('CATEGORY_INDEX_URL', '', false);
@@ -137,7 +137,7 @@ class SiteContext
View::assign("strBookShelfUrlTemp", $strBookShelfUrlTemp); View::assign("strBookShelfUrlTemp", $strBookShelfUrlTemp);
View::assign("strUserUrlTemp", $strUserUrlTemp); View::assign("strUserUrlTemp", $strUserUrlTemp);
}else{ }else{
$strPcUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_PC_URL_PATH', '', false); $strPcUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_PC_PATH_URL', '', false);
$strRankUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_RANK_INDEX_URL', '', false); $strRankUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_RANK_INDEX_URL', '', false);
$strSearchListUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_SEARCH_LIST_URL', '', false); $strSearchListUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_SEARCH_LIST_URL', '', false);
$strHistoryUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_HISTORY_LIST_URL', '', false); $strHistoryUrlTemp = $this->DomainModel->getFomartSubject('VIDEO_HISTORY_LIST_URL', '', false);

View File

@@ -62,17 +62,16 @@
countdownElement.textContent = countdown; countdownElement.textContent = countdown;
if (countdown <= 0) { if (countdown <= 0) {
clearInterval(interval); clearInterval(interval);
// Check if there is a previous page in history
if (document.referrer) { if (document.referrer) {
window.history.back(); window.history.back();
} else { } else {
window.location.href = '/'; // Redirect to home if no previous page window.location.href = '/';
} }
} }
}, 1000); }, 1000);
} }
// Start the countdown when the script loads
window.onload = startCountdown; window.onload = startCountdown;
</script> </script>
</head> </head>

View File

@@ -275,10 +275,10 @@ $arrNovelSubjectFomartGroupData = [
'/user', '/user',
] ]
], ],
'PC_URL_PATH' => [ 'PC_PATH_URL' => [
'description' => 'pc端URL目录 模板', 'description' => 'pc端目录URL 模板1',
'sfg_id' => 107, 'sfg_id' => 107,
'arrSubjectFomart' => ['/pc', '/web', '/desktop', '/index', '/shouye', '/zhuomian'] 'arrSubjectFomart' => ['/pc']
], ],
'CATEGORY_INDEX_URL' => [ 'CATEGORY_INDEX_URL' => [
'description' => '书库首页URL 模板1', 'description' => '书库首页URL 模板1',
@@ -323,7 +323,7 @@ $arrNovelSubjectFomartGroupData = [
] ]
], ],
// 最新替换模板分组id 125 // 最新替换模板分组id 130
]; ];

View File

@@ -606,6 +606,45 @@ return [
] ]
], ],
// 最新替换模板分组id 125 // pc端目录URL
'PC_PATH_URL_T2' => [
'description' => 'pc端目录URL 模板2',
'sfg_id' => 126,
'arrSubjectFomart' => [
'/web',
]
],
'PC_PATH_URL_T3' => [
'description' => 'pc端目录URL 模板3',
'sfg_id' => 127,
'arrSubjectFomart' => [
'/desktop',
]
],
'PC_PATH_URL_T4' => [
'description' => 'pc端目录URL 模板4',
'sfg_id' => 128,
'arrSubjectFomart' => [
'/index',
]
],
'PC_PATH_URL_T5' => [
'description' => 'pc端目录URL 模板5',
'sfg_id' => 129,
'arrSubjectFomart' => [
'/shouye',
]
],
'PC_PATH_URL_T6' => [
'description' => 'pc端目录URL 模板6',
'sfg_id' => 130,
'arrSubjectFomart' => [
'/zhuomian',
]
],
// 最新替换模板分组id 130
]; ];

View File

@@ -355,7 +355,7 @@ $arrVideoSubjectFomartGroupData = [
] ]
], ],
'VIDEO_PC_URL_PATH' => [ 'VIDEO_PC_PATH_URL' => [
'description' => '视频pc端URL目录 模板', 'description' => '视频pc端URL目录 模板',
'sfg_id' => 1030, 'sfg_id' => 1030,
'arrSubjectFomart' => ['/pc', '/web', '/desktop', '/index', '/shouye', '/zhuomian'] 'arrSubjectFomart' => ['/pc', '/web', '/desktop', '/index', '/shouye', '/zhuomian']