diff --git a/code/app/home/config/router.php b/code/app/home/config/router.php index 8a5d53b..799d510 100644 --- a/code/app/home/config/router.php +++ b/code/app/home/config/router.php @@ -499,13 +499,25 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) { case 'video_search': //搜素 - $strView = 'pc/getSearchVideo.html'; + // $strView = 'pc/getSearchVideo.html'; + // if ($platform == 'h5') { + // $strView = 'video/getSearchVideo.html'; + // } + // Route::get($strRoute, function () use ($strView) { + // return view($strView); + // })->ext('html'); + // break; + + // 首页 if ($platform == 'h5') { - $strView = 'video/getSearchVideo.html'; + Route::get($strRoute, function (\think\Request $Request, SiteContext $SiteContext) { + return view($SiteContext->getHomeView('h5')); + }); + } else { + Route::get($strRoute, function (\think\Request $Request, SiteContext $SiteContext) { + return view($SiteContext->getHomeView('pc')); + }); } - Route::get($strRoute, function () use ($strView) { - return view($strView); - })->ext('html'); break; case 'video_history': @@ -668,13 +680,25 @@ foreach ($arrRoutes['prefixes'] as $platform => $prefixes) { case 'search': //搜素 - $strView = 'pc/getSearchNovel.html'; + // $strView = 'pc/getSearchNovel.html'; + // if ($platform == 'h5') { + // $strView = 'novel/getSearchNovel.html'; + // } + // Route::get($strRoute, function () use ($strView) { + // return view($strView); + // })->ext('html'); + // break; + + // 首页 if ($platform == 'h5') { - $strView = 'novel/getSearchNovel.html'; + Route::get($strRoute, function (\think\Request $Request, SiteContext $SiteContext) { + return view($SiteContext->getHomeView('h5')); + }); + } else { + Route::get($strRoute, function (\think\Request $Request, SiteContext $SiteContext) { + return view($SiteContext->getHomeView('pc')); + }); } - Route::get($strRoute, function () use ($strView) { - return view($strView); - })->ext('html'); break; case 'user': diff --git a/code/app/home/view/videoBoKu/video/getVideoInfo.html b/code/app/home/view/videoBoKu/video/getVideoInfo.html index d141fd1..bf5e9f4 100644 --- a/code/app/home/view/videoBoKu/video/getVideoInfo.html +++ b/code/app/home/view/videoBoKu/video/getVideoInfo.html @@ -2,11 +2,14 @@ {block name="get-data"} -{if $Request.route.intVId} -{video:info v_id="$Request.route.intVId" v_key="arrVideo" /} +{if $Request.route.intVId && $Request.route.intVForgeId} + {video:info v_id="$Request.route.intVId" v_key="arrVideo" v_fid="$Request.route.intVForgeId" /} +{elseif $Request.route.intVId} + {video:info v_id="$Request.route.intVId" v_key="arrVideo" /} {else} -{video:info v_id="$DomainModel->info_id" n_key="arrVideo" n_forge_id="0" /} + {video:info v_id="$DomainModel->info_id" n_key="arrVideo" /} {/if} + {site:grm page_code="h5_video_info" diff="$arrVideo.v_id" num="120" g_key="arrGrm" /} {/block} @@ -247,7 +250,7 @@ - +
关键词 + {volist name='$arrVideo.v_seo_words' key="index" id='SeoWords' } + {$SeoWords} + {/volist} + +
+ {/if}导演: {volist name='$arrVideo.v_director' id='vo' key='index'} diff --git a/code/app/home/view/videoDadi/video/getVideoPlayUrl.html b/code/app/home/view/videoDadi/video/getVideoPlayUrl.html index ba906db..8863776 100644 --- a/code/app/home/view/videoDadi/video/getVideoPlayUrl.html +++ b/code/app/home/view/videoDadi/video/getVideoPlayUrl.html @@ -256,6 +256,29 @@
+ + {volist name='$arrVideo.v_seo_words' key="index" id='SeoWords' } + {$SeoWords} + {/volist} +
+