diff --git a/code/app/home/config/router.php b/code/app/home/config/router.php index 4323084..fb78f48 100644 --- a/code/app/home/config/router.php +++ b/code/app/home/config/router.php @@ -149,38 +149,57 @@ $arrRoutes = [ * /voddetail/strVideoPinyin-1 */ 'video_info' => [ - '/voddetail/:strVideoPinyin-:intVideoId', - '/vodinfo/:strVideoPinyin-:intVideoId', - '/vod/:strVideoPinyin-:intVideoId', + '/voddetail/:strPinyin-:intVId', + '/vodinfo/:strPinyin-:intVId', + '/vod/:strPinyin-:intVId', - '/video-info/:strVideoPinyin-:intVideoId', - '/video-detail/:strVideoPinyin-:intVideoId', - '/video/:strVideoPinyin-:intVideoId', + '/video-info/:strPinyin-:intVId', + '/video-detail/:strPinyin-:intVId', + '/video/:strPinyin-:intVId', - '/shipin/:strVideoPinyin-:intVideoId', - '/shipin-xiangqing/:strVideoPinyin-:intVideoId', - '/shipin-neiron/:strVideoPinyin-:intVideoId', + '/shipin/:strPinyin-:intVId', + '/shipin-xiangqing/:strPinyin-:intVId', + '/shipin-neiron/:strPinyin-:intVId', ], - // 视频播放 /vodplay/strVideoPinyin-10-wuxian-1 + // 视频播放 /vodplay/strPinyin-10-wuxian-1 'video_play' => [ - '/vodplay/:strVideoPinyin-:intVideoId-:strPlayType-:intPlayIndex', - '/vodbf/:strVideoPinyin-:intVideoId-:strPlayType-:intPlayIndex', - '/vodseed/:strVideoPinyin-:intVideoId-:strPlayType-:intPlayIndex', + '/vodplay/:strPinyin-:intVId-:strPlayType-:intPlayIndex', + '/vodbf/:strPinyin-:intVId-:strPlayType-:intPlayIndex', + '/vodseed/:strPinyin-:intVId-:strPlayType-:intPlayIndex', - '/video-play/:strVideoPinyin-:intVideoId-:strPlayType-:intPlayIndex', - '/video-bofang/:strVideoPinyin-:intVideoId-:strPlayType-:intPlayIndex', - '/video-show/:strVideoPinyin-:intVideoId-:strPlayType-:intPlayIndex', + '/video-play/:strPinyin-:intVId-:strPlayType-:intPlayIndex', + '/video-bofang/:strPinyin-:intVId-:strPlayType-:intPlayIndex', + '/video-show/:strPinyin-:intVId-:strPlayType-:intPlayIndex', - '/shipin-play/:strVideoPinyin-:intVideoId-:strPlayType-:intPlayIndex', - '/shipin-bofang/:strVideoPinyin-:intVideoId-:strPlayType-:intPlayIndex', - '/shipin-kan/:strVideoPinyin-:intVideoId-:strPlayType-:intPlayIndex', + '/shipin-play/:strPinyin-:intVId-:strPlayType-:intPlayIndex', + '/shipin-bofang/:strPinyin-:intVId-:strPlayType-:intPlayIndex', + '/shipin-kan/:strPinyin-:intVId-:strPlayType-:intPlayIndex', ], //排行榜 - 'video_rank_index' => ['/paihang/index', '/rank/index', '/paihang-quan', '/top/index', '/paihang-bang', '/ranks/index', '/sort/index', '/order/index', '/total/index'], + 'video_rank_index' => ['/paihang/index', '/rank/index', '/paihang-quan', '/top/index', '/paihang-bang', '/ranks/index', '/sort/index', '/order/index', '/phb/index'], + + //排行榜 + 'video_rank_list' => [ + '/paihang/:strClass/:strCategory/:strSortType', + '/rank:strCategory/:strClass-:strSortType', + '/:strClass/:strCategory/:strSortType-paihang', + + '/:strCategory/:strClass-:strSortType-top', + '/:strClass-:strSortType/paihangbang-:strCategory', + '/:strClass-:strSortType/:strCategory-ranks', + + '/sort:strCategory/:strClass-:strSortType', + '/:strClass/:strCategory/:strSortType-order', + '/:strClass-:strSortType/:strCategory-phb', + + ], + + //搜索 + 'video_search' => ['/search', '/explore', '/sousuo', '/find', '/query', '/keywords'], // 视频站点url -- end @@ -404,7 +423,38 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) { 'strClass' => '[a-z\-]*', // 允许空值 ]); break; - + + case 'video_rank_index': + $strView = 'pc/getRank.html'; + if ($platform == 'h5') { + $strView = 'video/getRank.html'; + } + //视频排行榜 首页 + Route::get($strRoute, function () use ($strView) { + return view($strView); + }) + ->pattern([ + + ]); + break; + + case 'video_rank_list': + $strView = 'pc/getRankList.html'; + if ($platform == 'h5') { + $strView = 'video/getRankList.html'; + } + //视频分类 分页 + Route::get($strRoute, function () use ($strView) { + return view($strView); + }) + ->pattern([ + 'strClass' => '[a-z\-]*', // 允许空值 + 'strCategory' => '[a-z\-]*', // 允许空值 + 'strSortType' => '[a-z\-]*', // 允许空值 + 'intPage' => '\d*', // 允许空值 + ]); + break; + case 'video_category': $strView = 'pc/getCategory.html'; if ($platform == 'h5') { @@ -433,7 +483,7 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) { Route::get($strRoute, function () use ($strView) { return view($strView); }) - ->pattern(['intVideoId' => '\d+', 'strVideoPinyin' => '[\w-]+',]); + ->pattern(['intVId' => '\d+', 'strPinyin' => '[\w-]+',]); break; case 'video_play': @@ -445,10 +495,21 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) { Route::get($strRoute, function () use ($strView) { return view($strView); }) - ->pattern(['intVideoId' => '\d+', 'intPlayIndex' => '\d+', 'strPlayType' => '[\w-]+','strVideoPinyin' => '[\w-]+',]); + ->pattern(['intVId' => '\d+', 'intPlayIndex' => '\d+', 'strPlayType' => '[\w-]+','strPinyin' => '[\w-]+',]); break; + case 'video_search': + //搜素 + $strView = 'pc/getSearchVideo.html'; + if ($platform == 'h5') { + $strView = 'video/getSearchVideo.html'; + } + Route::get($strRoute, function () use ($strView) { + return view($strView); + })->ext('html'); + break; + // 视频站点url -- end diff --git a/code/app/home/view/videoDadi/base.html b/code/app/home/view/videoDadi/base.html index 7edd6a5..2763160 100644 --- a/code/app/home/view/videoDadi/base.html +++ b/code/app/home/view/videoDadi/base.html @@ -69,11 +69,11 @@ - +
-
@@ -165,7 +169,11 @@ - {site:site valcode="site_tongji" encode="false"/} + + {site:cfg code="PUBLIC_TONGJI_CODE" encode="false"/} + + + {$DomainModel->d_statis|raw} diff --git a/code/app/home/view/videoDadi/index.md b/code/app/home/view/videoDadi/index.md index d7ec7cf..120b38b 100644 --- a/code/app/home/view/videoDadi/index.md +++ b/code/app/home/view/videoDadi/index.md @@ -8,8 +8,8 @@ $v_lang = $tag['v_lang'] ?? "all"; // 语言 $v_area = $tag['v_area'] ?? "all"; // 地区 $v_year = $tag['v_year'] ?? "all"; // 年份 -2. 排行榜标签 怎加 分类查询 -{video:ranklist v_category="$val.v_category_en" +2. 排行榜标签 增加 分类查询 +{video:ranklist v_class="dianying" v_category="$val.v_category_en" diff --git a/code/app/home/view/videoDadi/index/index.html b/code/app/home/view/videoDadi/index/index.html index d74384d..401768c 100644 --- a/code/app/home/view/videoDadi/index/index.html +++ b/code/app/home/view/videoDadi/index/index.html @@ -58,12 +58,11 @@
- 更多更多

- 火爆推荐 + 火爆推荐

@@ -83,14 +82,14 @@
- {foreach $arrVideo.v_play_url as $key=>$arrPlayUrlType } + {foreach $arrVideo.v_play_url as $strPlayGroupName=>$arrPlayUrlType }
@@ -143,15 +145,15 @@
无需安装任何插件

- {$key} + {$strPlayGroupName}

@@ -174,7 +176,7 @@

{$arrVideo.v_name}

{$arrVideo.v_description} - {$arrVideo.v_name}   + {$arrVideo.v_name}  

@@ -197,8 +199,8 @@