diff --git a/code/app/home/view/videoGpt1/module/detail/detail_01.html b/code/app/home/view/videoGpt1/module/detail/detail_01.html index 1991005..cdaee6c 100644 --- a/code/app/home/view/videoGpt1/module/detail/detail_01.html +++ b/code/app/home/view/videoGpt1/module/detail/detail_01.html @@ -1,4 +1,10 @@
+ {php} + $strDetailPlaySlug = trim((string)($arrVideo['v_name_en'] ?? '')); + if ($strDetailPlaySlug === '') { + $strDetailPlaySlug = (string)($arrVideo['v_id'] ?? ''); + } + {/php} {// 顶部基本信息 }
@@ -42,14 +48,17 @@ {volist name='$arrPlayUrlType' id='arrPlayUrl'} + {php} + $strEpisodePlayUrl = app(\app\services\VideoService::class)->getVideoPlayUrl( + (int)($arrVideo['v_id'] ?? 0), + $strDetailPlaySlug, + (string)$strPlayGroupName, + (int)$keyLine + ); + {/php}
  • {$arrPlayUrl.name} diff --git a/code/app/home/view/videoGpt1/module/detail/detail_02.html b/code/app/home/view/videoGpt1/module/detail/detail_02.html index d08dc0a..43750bf 100644 --- a/code/app/home/view/videoGpt1/module/detail/detail_02.html +++ b/code/app/home/view/videoGpt1/module/detail/detail_02.html @@ -1,4 +1,10 @@
    + {php} + $strDetailPlaySlug = trim((string)($arrVideo['v_name_en'] ?? '')); + if ($strDetailPlaySlug === '') { + $strDetailPlaySlug = (string)($arrVideo['v_id'] ?? ''); + } + {/php} {// 顶部大横图 }
    @@ -45,8 +51,16 @@ {volist name='$arrPlayUrlType' id='arrPlayUrl'} + {php} + $strEpisodePlayUrl = app(\app\services\VideoService::class)->getVideoPlayUrl( + (int)($arrVideo['v_id'] ?? 0), + $strDetailPlaySlug, + (string)$strPlayGroupName, + (int)$keyLine + ); + {/php}
  • - {$arrPlayUrl.name} diff --git a/code/app/home/view/videoGpt1/module/detail/detail_03.html b/code/app/home/view/videoGpt1/module/detail/detail_03.html index 4563fc9..b380784 100644 --- a/code/app/home/view/videoGpt1/module/detail/detail_03.html +++ b/code/app/home/view/videoGpt1/module/detail/detail_03.html @@ -1,4 +1,10 @@
    + {php} + $strDetailPlaySlug = trim((string)($arrVideo['v_name_en'] ?? '')); + if ($strDetailPlaySlug === '') { + $strDetailPlaySlug = (string)($arrVideo['v_id'] ?? ''); + } + {/php}
    @@ -32,12 +38,20 @@ {foreach $arrVideo.v_play_url as $strPlayGroupName=>$arrPlayUrlType } -
    {volist name='$arrPlayUrlType' id='arrPlayUrl'} - getVideoPlayUrl( + (int)($arrVideo['v_id'] ?? 0), + $strDetailPlaySlug, + (string)$strPlayGroupName, + (int)$keyLine + ); + {/php} + {$arrPlayUrl.name} diff --git a/code/app/home/view/videoGpt1/module/detail/detail_04.html b/code/app/home/view/videoGpt1/module/detail/detail_04.html index 20fe2e5..e5b5bf8 100644 --- a/code/app/home/view/videoGpt1/module/detail/detail_04.html +++ b/code/app/home/view/videoGpt1/module/detail/detail_04.html @@ -1,4 +1,10 @@
    + {php} + $strDetailPlaySlug = trim((string)($arrVideo['v_name_en'] ?? '')); + if ($strDetailPlaySlug === '') { + $strDetailPlaySlug = (string)($arrVideo['v_id'] ?? ''); + } + {/php}

    {$arrVideo.v_name}

    @@ -42,8 +48,16 @@ {volist name='$arrPlayUrlType' id='arrPlayUrl'} + {php} + $strEpisodePlayUrl = app(\app\services\VideoService::class)->getVideoPlayUrl( + (int)($arrVideo['v_id'] ?? 0), + $strDetailPlaySlug, + (string)$strPlayGroupName, + (int)$keyLine + ); + {/php}
  • - {$arrPlayUrl.name} diff --git a/code/app/home/view/videoGpt1/module/detail/detail_05.html b/code/app/home/view/videoGpt1/module/detail/detail_05.html index dd5ee3b..60e7e45 100644 --- a/code/app/home/view/videoGpt1/module/detail/detail_05.html +++ b/code/app/home/view/videoGpt1/module/detail/detail_05.html @@ -1,4 +1,10 @@
    + {php} + $strDetailPlaySlug = trim((string)($arrVideo['v_name_en'] ?? '')); + if ($strDetailPlaySlug === '') { + $strDetailPlaySlug = (string)($arrVideo['v_id'] ?? ''); + } + {/php}

    {$arrVideo.v_name}

    @@ -35,7 +41,15 @@ {volist name='$arrPlayUrlType' id='arrPlayUrl'} -
    getVideoPlayUrl( + (int)($arrVideo['v_id'] ?? 0), + $strDetailPlaySlug, + (string)$strPlayGroupName, + (int)$keyLine + ); + {/php} + {$arrPlayUrl.name} diff --git a/code/app/home/view/videoGpt1/module/detail_main/action.html b/code/app/home/view/videoGpt1/module/detail_main/action.html index 5164df4..561bb1f 100644 --- a/code/app/home/view/videoGpt1/module/detail_main/action.html +++ b/code/app/home/view/videoGpt1/module/detail_main/action.html @@ -1,111 +1,123 @@ {// ===================== Action Variants ===================== } +{php} + $strDetailActionSlug = trim((string)($arrVideo['v_name_en'] ?? request()->route('strPinyin') ?? '')); + if ($strDetailActionSlug === '') { + $strDetailActionSlug = (string)($arrVideo['v_id'] ?? ''); + } + $strDetailDefaultPlayUrl = app(\app\services\VideoService::class)->getVideoPlayUrl( + (int)($arrVideo['v_id'] ?? 0), + $strDetailActionSlug, + 'default', + 1 + ); +{/php} {if $variant == 0} {elseif $variant == 1}
    - 在线播放 + 在线播放 无需安装
    {elseif $variant == 2} {elseif $variant == 3} {elseif $variant == 4}
    - +
    {elseif $variant == 5} {elseif $variant == 6} {elseif $variant == 7}
    - 免费观看 + 免费观看 高清资源
    {elseif $variant == 8} {elseif $variant == 9} {elseif $variant == 10} {elseif $variant == 11}
    - 点击播放 + 点击播放 支持多线路
    {elseif $variant == 12} {elseif $variant == 13}
    - +
    {elseif $variant == 14} {elseif $variant == 15} {elseif $variant == 16} {elseif $variant == 17}
    - 高清播放 + 高清播放 无需登录
    {elseif $variant == 18}
    - 在线观看 + 在线观看
    {elseif $variant == 19} {/if} diff --git a/code/app/home/view/videoGpt1/module/detail_main/cover.html b/code/app/home/view/videoGpt1/module/detail_main/cover.html index a82b1d5..9fb3801 100644 --- a/code/app/home/view/videoGpt1/module/detail_main/cover.html +++ b/code/app/home/view/videoGpt1/module/detail_main/cover.html @@ -1,5 +1,17 @@ {// ===================== Cover Variants ===================== } {video:imgalt video="$arrVideo" slot="detail_cover" item_type="poster" export_name="strAlt" /} +{php} + $strDetailCoverSlug = trim((string)($arrVideo['v_name_en'] ?? request()->route('strPinyin') ?? '')); + if ($strDetailCoverSlug === '') { + $strDetailCoverSlug = (string)($arrVideo['v_id'] ?? ''); + } + $strDetailCoverPlayUrl = app(\app\services\VideoService::class)->getVideoPlayUrl( + (int)($arrVideo['v_id'] ?? 0), + $strDetailCoverSlug, + 'default', + 1 + ); +{/php} {if $variant == 0}
    @@ -20,7 +32,7 @@ {elseif $variant == 2} + href="{$strDetailCoverPlayUrl}"> {$strAlt} @@ -89,7 +101,7 @@ {elseif $variant == 11} + href="{$strDetailCoverPlayUrl}"> {$strAlt} diff --git a/code/app/home/view/videoGpt1/module/play/play_01.html b/code/app/home/view/videoGpt1/module/play/play_01.html index 3d84c01..6ddf825 100644 --- a/code/app/home/view/videoGpt1/module/play/play_01.html +++ b/code/app/home/view/videoGpt1/module/play/play_01.html @@ -1,3 +1,9 @@ +{php} + $strPlayModuleSlug = trim((string)($arrVideo['v_name_en'] ?? request()->route('strPinyin') ?? '')); + if ($strPlayModuleSlug === '') { + $strPlayModuleSlug = (string)($arrVideo['v_id'] ?? ''); + } +{/php}
    {// 顶部区域:封面 + 简介 } @@ -56,12 +62,7 @@ {volist name='$arrPlayUrlType' id='arrPlayUrl'}
  • - {// 全宽播放器 } @@ -42,12 +48,7 @@ {volist name='$arrPlayUrlType' id='arrPlayUrl'} - {$arrPlayUrl.name} diff --git a/code/app/home/view/videoGpt1/module/play/play_03.html b/code/app/home/view/videoGpt1/module/play/play_03.html index c1a5312..cbf7344 100644 --- a/code/app/home/view/videoGpt1/module/play/play_03.html +++ b/code/app/home/view/videoGpt1/module/play/play_03.html @@ -1,3 +1,9 @@ +{php} + $strPlayModuleSlug = trim((string)($arrVideo['v_name_en'] ?? request()->route('strPinyin') ?? '')); + if ($strPlayModuleSlug === '') { + $strPlayModuleSlug = (string)($arrVideo['v_id'] ?? ''); + } +{/php}
    @@ -41,12 +47,7 @@ {volist name='$arrPlayUrlType' id='arrPlayUrl'} - {$arrPlayUrl.name} diff --git a/code/app/home/view/videoGpt1/module/play/play_04.html b/code/app/home/view/videoGpt1/module/play/play_04.html index 2f011ab..1de8b61 100644 --- a/code/app/home/view/videoGpt1/module/play/play_04.html +++ b/code/app/home/view/videoGpt1/module/play/play_04.html @@ -1,3 +1,9 @@ +{php} + $strPlayModuleSlug = trim((string)($arrVideo['v_name_en'] ?? request()->route('strPinyin') ?? '')); + if ($strPlayModuleSlug === '') { + $strPlayModuleSlug = (string)($arrVideo['v_id'] ?? ''); + } +{/php}
    @@ -34,12 +40,7 @@ {volist name='$arrPlayUrlType' id='arrPlayUrl'}
  • - {$arrPlayUrl.name} diff --git a/code/app/home/view/videoGpt1/module/play/play_05.html b/code/app/home/view/videoGpt1/module/play/play_05.html index 09805a8..677e3bb 100644 --- a/code/app/home/view/videoGpt1/module/play/play_05.html +++ b/code/app/home/view/videoGpt1/module/play/play_05.html @@ -1,3 +1,9 @@ +{php} + $strPlayModuleSlug = trim((string)($arrVideo['v_name_en'] ?? request()->route('strPinyin') ?? '')); + if ($strPlayModuleSlug === '') { + $strPlayModuleSlug = (string)($arrVideo['v_id'] ?? ''); + } +{/php}
    {// 封面 + 播放器组合卡片 } @@ -40,12 +46,7 @@ {volist name='$arrPlayUrlType' id='arrPlayUrl'} - {$arrPlayUrl.name} diff --git a/code/app/home/view/videoGpt1/module/playline/layout/layout_A.html b/code/app/home/view/videoGpt1/module/playline/layout/layout_A.html index fe001b3..1c9da57 100644 --- a/code/app/home/view/videoGpt1/module/playline/layout/layout_A.html +++ b/code/app/home/view/videoGpt1/module/playline/layout/layout_A.html @@ -1,3 +1,9 @@ +{php} + $strPlaylineSlug = trim((string)($arrVideo['v_name_en'] ?? request()->route('strPinyin') ?? '')); + if ($strPlaylineSlug === '') { + $strPlaylineSlug = (string)($arrVideo['v_id'] ?? ''); + } +{/php}
    {assign name="variant" value="$pageCfg.playline.variant"} @@ -12,7 +18,7 @@ @@ -24,7 +30,7 @@

    {video:getlinename code="$line" encode="false"/}

      {volist name="list" id="ep" key="i"} -
    1. {$ep.name}
    2. +
    3. {$ep.name}
    4. {/volist}
    @@ -37,7 +43,7 @@
    {video:getlinename code="$line" encode="false"/}
    {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist}
    {/foreach} @@ -49,7 +55,7 @@ {video:getlinename code="$line" encode="false"/} {/foreach} @@ -61,7 +67,7 @@
    {video:getlinename code="$line" encode="false"/}
    {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist}
    @@ -75,7 +81,7 @@ {volist name="list" id="ep" key="i"} {$i} - {$ep.name} + {$ep.name} {/volist} {/foreach} @@ -87,7 +93,7 @@ {/foreach} @@ -98,7 +104,7 @@

    {video:getlinename code="$line" encode="false"/}:

    {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist}
    {/foreach} @@ -111,7 +117,7 @@ {video:getlinename code="$line" encode="false"/}
  • @@ -123,7 +129,7 @@ {foreach $arrVideo.v_play_url as $line=>$list}
    {video:getlinename code="$line" encode="false"/}
    {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist} {/foreach} @@ -133,11 +139,11 @@

    {video:getlinename code="$line" encode="false"/}

    {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist}
    {/foreach} {/if}
    - \ No newline at end of file + diff --git a/code/app/home/view/videoGpt1/module/playline/layout/layout_B.html b/code/app/home/view/videoGpt1/module/playline/layout/layout_B.html index e9a3bff..db454d0 100644 --- a/code/app/home/view/videoGpt1/module/playline/layout/layout_B.html +++ b/code/app/home/view/videoGpt1/module/playline/layout/layout_B.html @@ -1,3 +1,9 @@ +{php} + $strPlaylineSlug = trim((string)($arrVideo['v_name_en'] ?? request()->route('strPinyin') ?? '')); + if ($strPlaylineSlug === '') { + $strPlaylineSlug = (string)($arrVideo['v_id'] ?? ''); + } +{/php}
    {assign name="variant" value="$pageCfg.playline.variant"} @@ -14,7 +20,7 @@ {foreach $arrVideo.v_play_url as $line=>$list} {/foreach} @@ -32,7 +38,7 @@
      {foreach $arrVideo.v_play_url as $line=>$list} {volist name="list" id="ep" key="i"} -
    • {$ep.name}
    • +
    • {$ep.name}
    • {/volist} {/foreach}
    @@ -45,7 +51,7 @@
    {video:getlinename code="$line" encode="false"/}
    {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist}
    {/foreach} @@ -58,7 +64,7 @@
    {video:getlinename code="$line" encode="false"/}
    {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist}
    @@ -70,7 +76,7 @@ {foreach $arrVideo.v_play_url as $line=>$list} {video:getlinename code="$line" encode="false"/} {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist} {/foreach} @@ -87,7 +93,7 @@
    {foreach $arrVideo.v_play_url as $line=>$list} {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist} {/foreach}
    @@ -103,7 +109,7 @@
      {foreach $arrVideo.v_play_url as $line=>$list} {volist name="list" id="ep" key="i"} -
    1. {$ep.name}
    2. +
    3. {$ep.name}
    4. {/volist} {/foreach}
    @@ -114,7 +120,7 @@

    {video:getlinename code="$line" encode="false"/}

    {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist}

    {/foreach} @@ -126,7 +132,7 @@ {video:getlinename code="$line" encode="false"/} {volist name="list" id="ep" key="i"} - + {/volist}
    {$ep.name}
    {$ep.name}
    @@ -140,7 +146,7 @@

    {video:getlinename code="$line" encode="false"/}

    {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist}

  • @@ -152,7 +158,7 @@
    {video:getlinename code="$line" encode="false"/} {volist name="list" id="ep" key="i"} - {$ep.name} + {$ep.name} {/volist}
    {php}$intLineIndex++;{/php} @@ -160,4 +166,4 @@ {/if}
  • - \ No newline at end of file + diff --git a/code/app/home/view/videoGpt1/module/playline/layout/layout_C.html b/code/app/home/view/videoGpt1/module/playline/layout/layout_C.html index 3c0a6b7..5b3e9c2 100644 --- a/code/app/home/view/videoGpt1/module/playline/layout/layout_C.html +++ b/code/app/home/view/videoGpt1/module/playline/layout/layout_C.html @@ -1,3 +1,9 @@ +{php} + $strPlaylineSlug = trim((string)($arrVideo['v_name_en'] ?? request()->route('strPinyin') ?? '')); + if ($strPlaylineSlug === '') { + $strPlaylineSlug = (string)($arrVideo['v_id'] ?? ''); + } +{/php}
    {assign name="variant" value="$pageCfg.playline.variant"} @@ -10,7 +16,7 @@
      {volist name="list" id="ep" key="i"}
    1. - + {$ep.name}
    2. @@ -27,7 +33,7 @@
      {volist name="list" id="ep" key="i"}

      - + {$ep.name}

      @@ -43,7 +49,7 @@
      {video:getlinename code="$line" encode="false"/}
      {volist name="list" id="ep" key="i"}
      - + {$ep.name}
      @@ -58,7 +64,7 @@

      {volist name="list" id="ep" key="i"} - + {$ep.name} @@ -73,7 +79,7 @@ {video:getlinename code="$line" encode="false"/} {volist name="list" id="ep" key="i"}

      @@ -89,7 +95,7 @@ {volist name="list" id="ep" key="i"}
    3. - + {$ep.name}

      @@ -106,7 +112,7 @@ {volist name="list" id="ep" key="i"} @@ -122,7 +128,7 @@

      本线路提供以下资源: {volist name="list" id="ep" key="i"} - + {$ep.name} {/volist} @@ -137,7 +143,7 @@ {volist name="list" id="ep" key="i"}

      第 {$i} 集: - + {$ep.name}

      @@ -149,7 +155,7 @@ {foreach $arrVideo.v_play_url as $line=>$list}
      {video:getlinename code="$line" encode="false"/}
      {volist name="list" id="ep" key="i"} - + {$ep.name} {/volist} @@ -161,7 +167,7 @@
      {video:getlinename code="$line" encode="false"/} : {volist name="list" id="ep" key="i"} - + {$ep.name} {/volist} @@ -170,4 +176,4 @@ {/if}
      - \ No newline at end of file + diff --git a/code/app/home/view/videoGpt1/video/getVideoPlayUrl.html b/code/app/home/view/videoGpt1/video/getVideoPlayUrl.html index 569b8d4..fbb58fc 100644 --- a/code/app/home/view/videoGpt1/video/getVideoPlayUrl.html +++ b/code/app/home/view/videoGpt1/video/getVideoPlayUrl.html @@ -58,6 +58,16 @@ ); } + $strPlayCanonicalUrl = ''; + if ((int)($arrVideo['v_id'] ?? 0) > 0) { + $strPlayCanonicalUrl = app(\app\services\VideoService::class)->getVideoPlayUrl( + (int)$arrVideo['v_id'], + $strPlaySlug, + $strCurrentPlayType !== '' ? $strCurrentPlayType : 'default', + $intCurrentPlayIndex + ); + } + $strPlayVisibleIntro = trim((string)($seoCopy['play_intro'] ?? '')); if ($strPlayVisibleIntro === '') { $strPlayVisibleIntro = '当前页围绕《' . (string)($arrVideo['v_name'] ?? '当前内容') . '》' . $strCurrentEpisodeName . '整理在线播放入口,并补充剧情与观看线索,方便直接续看。'; @@ -104,7 +114,7 @@ {if $Request.route.intVId } - + {/if} @@ -130,7 +140,7 @@ {default /} {/switch} - + @@ -189,7 +199,7 @@ "description": "{if !empty($arrVideo.v_description)}{$arrVideo.v_description|raw}{else/}暂无简介{/if}", "thumbnailUrl": "{$arrVideo.v_pic|raw}", "uploadDate": "{:date('Y-m-d')}", - "url": "https://{$DomainModel->d_domain}{site:vurl v_id="$arrVideo.v_id" v_py="$arrVideo.v_name_en"/}" + "url": "https://{$DomainModel->d_domain}{$strPlayCanonicalUrl}" {if !empty($arrVideo.v_lang)},{/if} {if !empty($arrVideo.v_lang)} "inLanguage": [