From f827d86ee694c15fd208bcd5ac7d603c6cf26287 Mon Sep 17 00:00:00 2001
From: make <make.chaofanai@gmail.com>
Date: Mon, 5 May 2025 16:26:35 +0800
Subject: [PATCH] debug

---
 code/app/home/view/videoDadi/base.html        |   2 +-
 code/app/home/view/videoDadi/index/index.html |  45 ++---
 .../view/videoDadi/public/video-list-phb.html |   3 +
 .../videoDadi/public/video-list-phb2.html     |   3 +
 .../public/video-list-shu-end-text.html       |   3 +
 .../public/video-list-shu-top-text.html       |   3 +
 .../view/videoDadi/public/video-list-shu.html |   4 +
 .../videoDadi/public/video-list-text.html     |   3 +
 .../videoDadi/public/video-list-text2.html    |   3 +
 .../view/videoDadi/public/video-panel.html    |  20 +--
 .../view/videoDadi/video/getCategoryType.html | 159 +++++++++---------
 code/app/model/VideoCategoryModel.php         |  10 +-
 code/app/services/VideoService.php            |   2 +
 code/extend/template/taglib/Video.php         |  13 +-
 .../template/videodadi/css/stui_block.css     | 150 ++++++++++++++++-
 .../template/videodadi/css/stui_default.css   | 143 ----------------
 16 files changed, 299 insertions(+), 267 deletions(-)
 delete mode 100644 code/public/template/videodadi/css/stui_default.css

diff --git a/code/app/home/view/videoDadi/base.html b/code/app/home/view/videoDadi/base.html
index 3ca1fa7..ebacaf7 100644
--- a/code/app/home/view/videoDadi/base.html
+++ b/code/app/home/view/videoDadi/base.html
@@ -18,7 +18,7 @@
     <link rel="stylesheet" href="/template/videodadi/font/iconfont.css" type="text/css">
     <link rel="stylesheet" href="/template/videodadi/css/stui_block.css" type="text/css">
     <!-- <link rel="stylesheet" href="/template/videodadi/css/stui_block_color.css" type="text/css"> -->
-    <link rel="stylesheet" href="/template/videodadi/css/stui_default.css" type="text/css">
+    <!-- <link rel="stylesheet" href="/template/videodadi/css/stui_default.css" type="text/css"> -->
     <link rel="stylesheet" href="/template/videodadi/css/mytheme-font.css" type="text/css">
 
     <script>
diff --git a/code/app/home/view/videoDadi/index/index.html b/code/app/home/view/videoDadi/index/index.html
index dce08a3..94d98e3 100644
--- a/code/app/home/view/videoDadi/index/index.html
+++ b/code/app/home/view/videoDadi/index/index.html
@@ -2,8 +2,9 @@
 
 {block name="get-data"}
 
-{video:list count="2" sort_type="tuijian" d_key="key" d_val="Video" cache_life="86400" export_name="arrVideoTuijian"}
-{/video:list}
+{video:listexp count="12" sort_type="tuijian" d_key="key" d_val="Video" cache_life="86400" export_name="arrVideoTuijian" /}
+{video:listexp count="18" sort_type="piaofang" d_key="key" d_val="Video" cache_life="86400" export_name="arrVideoPiaofang" /}
+
 {site:grm page_code="h5_index" diff="0" num="100" g_key="arrGrm" /}
 
 {/block}
@@ -49,18 +50,19 @@
 },
 {
     "@type": "CollectionPage",
-    "name": "{$DomainModel->d_name} - 免费高清影视在线观看",
+    "name": "{$DomainModel->d_name} - {$DomainModel->d_logo_text}",
     "url": "https://{$DomainModel->d_domain}",
     "alternateName": "{$DomainModel->d_domain}",
-    "description": "{$DomainModel->d_name}首页提供最新电影、电视剧、综艺、动漫和短剧的免费高清在线观看，热门推荐每日更新！",
+    "description": "{$DomainModel->d_name}首页提供好莱坞最新电影、电视剧、综艺、动漫和短剧的免费高清在线观看，热门推荐每日更新！",
         "mainEntity": {
             "@type": "ItemList",
             "itemListElement": [
 
-                {foreach $arrVideoTuijian as $key=>$Video }
+                {volist name="arrVideoTuijian" id="Video" key="key"}
+                {if $key < 5 }
                     {
                         "@type": "ListItem{$Video.v_id}",
-                        "position": {$key+=1},
+                        "position": {$key},
                         "item": {
                             "@type": "TVSeries",
                             "name": "{$Video.v_name}",
@@ -81,12 +83,14 @@
                             }
                         }
                     },
-                {/foreach}
+                {/if}
+                {/volist}
 
-                {video:list count="2" sort_type="tuijian" d_key="key" d_val="Video" cache_life="86400"}
+                {volist name="arrVideoPiaofang" id="Video" key="key"}
+                {if $key < 5 }
                     {
-                        "@type": "ListItem",
-                        "position": {$key+=1},
+                        "@type": "ListItem{$Video.v_id}",
+                        "position": {$key},
                         "item": {
                             "@type": "Movies",
                             "name": "{$Video.v_name}",
@@ -107,7 +111,8 @@
                             }
                         }
                     },
-                {/video:list}
+                    {/if}
+                {/volist}
             ]
         }
     }
@@ -151,12 +156,12 @@
                         <ul class="stui-vodlist clearfix">
                             
                             {foreach $arrVideoTuijian as $key=>$Video }
-                            {include file="public/video-list-shu" /}
+                            {include file="public/video-list-shu" start="0"/}
                             {/foreach}
                         </ul>
                         <ul class="stui-vodlist__text col-pd clearfix hidden-xs">
-                            {video:list count="2" sort_type="tuijian" d_key="d_key" d_val="Video" cache_life="86400"}
-                            {include file="public/video-list-shu-end-text" /}
+                            {video:list count="12" sort_type="tuijian" d_key="key" d_val="Video" cache_life="86400"}
+                            {include file="public/video-list-shu-end-text" start="13" /}
                             {/video:list}
                         </ul>
                     </div>
@@ -171,11 +176,9 @@
                             </div>
                         </div>
                         <ul class="stui-vodlist__text active col-pd clearfix">
-                            {video:list count="2"
-                            sort_type="piaofang"
-                            d_key="key" d_val="Video" cache_life="86400"}
-                            {include file="public/video-list-phb2" /}
-                            {/video:list}
+                            {foreach $arrVideoPiaofang as $key=>$Video }
+                            {include file="public/video-list-phb2" start="27"/}
+                            {/foreach}
                         </ul>
                     </div>
                 </div>
@@ -199,10 +202,10 @@
                     </div>
                     <div class="stui-pannel_bd clearfix">
                         <ul class="stui-vodlist__text active col-pd clearfix">
-                            {video:ranklist count="2"
+                            {video:ranklist count="12"
                             sort_type="$key"
                             d_key="key" d_val="Video" cache_life="86400"}
-                            {include file="public/video-list-phb" /}
+                            {include file="public/video-list-phb" start="50" /}
                             {/video:ranklist}
                         </ul>
                     </div>
diff --git a/code/app/home/view/videoDadi/public/video-list-phb.html b/code/app/home/view/videoDadi/public/video-list-phb.html
index 5aa1940..dee399b 100644
--- a/code/app/home/view/videoDadi/public/video-list-phb.html
+++ b/code/app/home/view/videoDadi/public/video-list-phb.html
@@ -1,5 +1,8 @@
 
 <li class="bottom-line-dot paihanban-ul-li">
+    {if !empty($arrGrm[$key + [start]])}
+        {$arrGrm[$key+[start]]|raw}
+    {/if}
     <?php $key ++ ?>
     <a 
         href='{site:vurl v_id="$Video.v_id" v_py="$Video.v_name_en"/}'
diff --git a/code/app/home/view/videoDadi/public/video-list-phb2.html b/code/app/home/view/videoDadi/public/video-list-phb2.html
index b5b22b3..05e3321 100644
--- a/code/app/home/view/videoDadi/public/video-list-phb2.html
+++ b/code/app/home/view/videoDadi/public/video-list-phb2.html
@@ -1,5 +1,8 @@
 
 <li class="bottom-line-dot paihanban-ul-li">
+    {if !empty($arrGrm[$key + [start]])}
+        {$arrGrm[$key+[start]]|raw}
+    {/if}
     <?php $key ++ ?>
     <a 
         href='{site:vurl v_id="$Video.v_id" v_py="$Video.v_name_en"/}'
diff --git a/code/app/home/view/videoDadi/public/video-list-shu-end-text.html b/code/app/home/view/videoDadi/public/video-list-shu-end-text.html
index daac864..ea33e4a 100644
--- a/code/app/home/view/videoDadi/public/video-list-shu-end-text.html
+++ b/code/app/home/view/videoDadi/public/video-list-shu-end-text.html
@@ -1,4 +1,7 @@
 <li class="col-md-4 col-sm-3 col-xs-1 padding-0">
+    {if !empty($arrGrm[$key + [start]])}
+        {$arrGrm[$key+[start]]|raw}
+    {/if}
     <a  class="top-line-dot text-overflow"
         href='{site:vurl v_id="$Video.v_id" v_py="$Video.v_name_en"/}'
         title="{$Video.v_name}">
diff --git a/code/app/home/view/videoDadi/public/video-list-shu-top-text.html b/code/app/home/view/videoDadi/public/video-list-shu-top-text.html
index 223da43..9a8f7a7 100644
--- a/code/app/home/view/videoDadi/public/video-list-shu-top-text.html
+++ b/code/app/home/view/videoDadi/public/video-list-shu-top-text.html
@@ -1,4 +1,7 @@
 <li>
+    {if !empty($arrGrm[$key + [start]])}
+        {$arrGrm[$key+[start]]|raw}
+    {/if}
     <a 
         href='{site:vurl v_id="$Video.v_id" v_py="$Video.v_name_en"/}'
         class="text-muted">
diff --git a/code/app/home/view/videoDadi/public/video-list-shu.html b/code/app/home/view/videoDadi/public/video-list-shu.html
index 2088c09..d031eda 100644
--- a/code/app/home/view/videoDadi/public/video-list-shu.html
+++ b/code/app/home/view/videoDadi/public/video-list-shu.html
@@ -1,5 +1,9 @@
 <li class="col-md-6 col-sm-4 col-xs-3">
+
     <div class="stui-vodlist__box">
+        {if !empty($arrGrm[$key + [start]])}
+            {$arrGrm[$key+[start]]|raw}
+        {/if}
         <a style="color: rgb(233, 93, 80); background-image: url(&quot;/static/img/default.jpg&quot;);"
 
             class="stui-vodlist__thumb lazyload-bg" href='{site:vurl v_id="$Video.v_id" v_py="$Video.v_name_en"/}'
diff --git a/code/app/home/view/videoDadi/public/video-list-text.html b/code/app/home/view/videoDadi/public/video-list-text.html
index f4f33d0..6225ebd 100644
--- a/code/app/home/view/videoDadi/public/video-list-text.html
+++ b/code/app/home/view/videoDadi/public/video-list-text.html
@@ -1,4 +1,7 @@
 <li class="col-md-4 col-sm-3 col-xs-1 padding-0">
+    {if !empty($arrGrm[$key + [start]])}
+        {$arrGrm[$key+[start]]|raw}
+    {/if}
     <a  class="top-line-dot text-overflow" href='{site:vurl v_id="$Video.v_id" v_py="$Video.v_name_en"/}' title="{$Video.v_name}">
         <span class="text-muted pull-right">{$Video.v_remarks}</span>
         {$Video.v_name}
diff --git a/code/app/home/view/videoDadi/public/video-list-text2.html b/code/app/home/view/videoDadi/public/video-list-text2.html
index fcb9d35..485091f 100644
--- a/code/app/home/view/videoDadi/public/video-list-text2.html
+++ b/code/app/home/view/videoDadi/public/video-list-text2.html
@@ -1,4 +1,7 @@
 <li class="col-md-4 col-sm-3 col-xs-1 padding-0">
+    {if !empty($arrGrm[$key + [start]])}
+        {$arrGrm[$key+[start]]|raw}
+    {/if}
     <a  class="top-line-dot text-overflow"
         href='{site:vurl v_id="$Video.v_id" v_py="$Video.v_name_en"/}'
         title="{$Video.v_name}"><span class="text-muted pull-right">{$Video.v_remarks}</span>{$Video.v_name}</a>
diff --git a/code/app/home/view/videoDadi/public/video-panel.html b/code/app/home/view/videoDadi/public/video-panel.html
index d4e0da9..b1c3c93 100644
--- a/code/app/home/view/videoDadi/public/video-panel.html
+++ b/code/app/home/view/videoDadi/public/video-panel.html
@@ -11,23 +11,23 @@
                         <h3 class="title">
                             <img src="/template/videodadi/icon/icon_{$val.v_category_en}.png">
                             <a 
-                                href="">最新{$val.v_category}</a>
+                                href="">最新{$val.v_category}{$val.v_category_en}</a>
                         </h3>
                         <ul class="nav nav-text pull-right hidden-sm hidden-xs">
-                            {video:list count="3" v_category="$val.v_category_en" sort_type="tuijian" d_key="key" d_val="Video"  cache_life="86400"}
-                            {include file="public/video-list-shu-top-text" /}
+                            {video:list count="3" v_parent_category_en="$val.v_category_en" sort_type="tuijian" d_key="key" d_val="Video"  cache_life="86400"}
+                            {include file="public/video-list-shu-top-text" start="60"/}
                             {/video:list}                     
                         </ul>
                     </div>
                 </div>
                 <ul class="stui-vodlist clearfix">
-                    {video:list count="2" v_category="$val.v_category_en" sort_type="news" d_key="key" d_val="Video"  cache_life="86400"}
-                        {include file="public/video-list-shu" /}
+                    {video:list count="12" v_parent_category_en="$val.v_category_en" sort_type="news" d_key="key" d_val="Video"  cache_life="86400"}
+                        {include file="public/video-list-shu" start="27"/}
                     {/video:list}
                 </ul>
                 <ul class="stui-vodlist__text col-pd clearfix hidden-xs">
-                    {video:list count="2" v_category="$val.v_category_en" sort_type="news" d_key="key" d_val="Video"  cache_life="86400"}
-                        {include file="public/video-list-shu-end-text" /}
+                    {video:list count="12" v_parent_category_en="$val.v_category_en" sort_type="news" d_key="key" d_val="Video"  cache_life="86400"}
+                        {include file="public/video-list-shu-end-text" start="70"/}
                     {/video:list}                      
                 </ul>
             </div>
@@ -42,11 +42,11 @@
                     </div>
                 </div>
                 <ul class="stui-vodlist__text active col-pd clearfix">
-                    {video:ranklist count="2" 
-                    v_category_en="$val.v_category_en"
+                    {video:ranklist count="18" 
+                    v_parent_category_en="$val.v_category_en"
                     sort_type="weekly"
                     d_key="key" d_val="Video" cache_life="86400"}
-                    {include file="public/video-list-phb" /}
+                    {include file="public/video-list-phb" start="80"/}
                     {/video:ranklist}
 
                 </ul>
diff --git a/code/app/home/view/videoDadi/video/getCategoryType.html b/code/app/home/view/videoDadi/video/getCategoryType.html
index 9859ecb..46aa444 100644
--- a/code/app/home/view/videoDadi/video/getCategoryType.html
+++ b/code/app/home/view/videoDadi/video/getCategoryType.html
@@ -21,18 +21,18 @@
 <script type="application/ld+json">
 {
     "@context": "https://schema.org",
-  "@type": "WebSite",
-  "name": "{$DomainModel->d_name}",
-  "url": "https://{$DomainModel->d_domain}",
-  "headline": '{site:replace code="VIDEO@GETCATEGORYINDEX@TITLE"}',
-  "description": '{site:replace code="VIDEO@GETCATEGORYINDEX@DESCRIPTION"}',
-  "datePublished": "{:date('Y-m-d')}"
-  
-  "potentialAction": {
-    "@type": "SearchAction",
-    "target": 'https://{$DomainModel->d_domain}',
-    "query-input": "required name=search_term_string"
-  }
+    "@type": "WebSite",
+    "name": "{$DomainModel->d_name}",
+    "url": "https://{$DomainModel->d_domain}",
+    "headline": '{site:replace code="VIDEO@GETCATEGORYINDEX@TITLE"}',
+    "description": '{site:replace code="VIDEO@GETCATEGORYINDEX@DESCRIPTION"}',
+    "datePublished": "{:date('Y-m-d')}"
+    
+    "potentialAction": {
+        "@type": "SearchAction",
+        "target": 'https://{$DomainModel->d_domain}',
+        "query-input": "required name=search_term_string"
+    }
 }
 </script>
 
@@ -44,12 +44,8 @@
 
 {block name="head-js"}{/block}
 
-
-
 {block name="main"}
 
-
-
 <div class="container">
     <h1 class="view-title">
         {site:replace code="VIDEO@GETCATEGORYINDEX@H1"}
@@ -60,77 +56,76 @@
     <div class="row">
         {video:categorytype category_type="ONE" d_key="key" d_val="val"}
         
-        {if $val.v_category_en == $Request.route.strParentCategory}
+            {if $val.v_category_en == $Request.route.strParentCategory}
 
-        {foreach $val.children as $intChildrenKey=>$arrChildrenCategory } 
-        
-        <div class="stui-pannel stui-pannel-bg clearfix">
-            <div class="stui-pannel-box clearfix">
-                <div class="stui-pannel_bd clearfix">
-                    <div class="col-lg-wide-75 col-xs-1 padding-0">
-                        <div class="stui-pannel_hd">
-                            <div class="stui-pannel__head active bottom-line clearfix">
-                                <a class="more text-muted pull-right"
-                                    href='{site:vclurl  prent_category="$Request.route.strParentCategory" category="$arrChildrenCategory.v_category_en" area="all" lang="all" year="all" order="all"  page="1"/}'>
-                                    更多
-                                    <i class="icon iconfont icon-more"></i>
-                                </a>
-                                <h3 class="title">
-                                    <img src="/template/videodadi/icon/icon_27.png"><a
-                                        style="color: rgb(52, 99, 240);" href="">
-                                        {site:getval code="strYear" /}最新{$arrChildrenCategory.v_category}推荐 - {$DomainModel->d_name}
-                                    </a>
-                                </h3>
+                {foreach $val.children as $intChildrenKey=>$arrChildrenCategory } 
+                
+                <div class="stui-pannel stui-pannel-bg clearfix">
+                    <div class="stui-pannel-box clearfix">
+                        <div class="stui-pannel_bd clearfix">
+                            <div class="col-lg-wide-75 col-xs-1 padding-0">
+                                <div class="stui-pannel_hd">
+                                    <div class="stui-pannel__head active bottom-line clearfix">
+                                        <a class="more text-muted pull-right"
+                                            href='{site:vclurl  prent_category="$Request.route.strParentCategory" category="$arrChildrenCategory.v_category_en" area="all" lang="all" year="all" order="all"  page="1"/}'>
+                                            更多
+                                            <i class="icon iconfont icon-more"></i>
+                                        </a>
+                                        <h3 class="title">
+                                            <img src="/template/videodadi/icon/icon_27.png"><a
+                                                style="color: rgb(52, 99, 240);" href='{site:vclurl  prent_category="$Request.route.strParentCategory" category="$arrChildrenCategory.v_category_en" area="all" lang="all" year="all" order="all"  page="1"/}'>
+                                                {site:getval code="strYear" /}最新{$arrChildrenCategory.v_category}推荐 - {$DomainModel->d_name}
+                                            </a>
+                                        </h3>
+                                    </div>
+                                </div>
+                                <ul class="stui-vodlist clearfix">
+                                    {video:list count="12" 
+                                    v_category_en="$arrChildrenCategory.v_category_en"
+                                    v_lang_en="all"
+                                    v_area_en="all"
+                                    v_year="all"
+                                    sort_type="news"
+                                    d_key="d_key" d_val="Video"  cache_life="86400"}
+                                        {include file="public/video-list-shu" start="0"/}
+                                    {/video:list}
+                                    
+                                </ul>
+                                <ul class="stui-vodlist__text col-pd clearfix hidden-xs">
+                                    {video:list count="12" 
+                                    v_category_en="$arrChildrenCategory.v_category_en"
+                                    v_lang_en="all"
+                                    v_area_en="all"
+                                    v_year="all" 
+                                    sort_type="news"
+                                    d_key="d_key" d_val="Video"  cache_life="86400"}
+                                    {include file="public/video-list-text2" start="0"/} 
+                                    {/video:list}
+                                </ul>
+                            </div>
+                            <div class="col-lg-wide-25 hidden-md hidden-sm hidden-xs">
+                                <div class="stui-pannel_hd">
+                                    <div class="stui-pannel__head active bottom-line clearfix">
+                                        <h3 class="title"><img src="/template/videodadi/icon/icon_12.png"><a
+                                                style="color: rgb(57, 129, 89);" href="">{$arrChildrenCategory.v_category}周榜单</a>
+                                        </h3>
+                                    </div>
+                                </div>
+                                <ul class="stui-vodlist__text active col-pd clearfix">
+                                    {video:ranklist count="10" 
+                                    v_category_en="$arrChildrenCategory.v_category_en"
+                                    sort_type="weekly"
+                                    d_key="key" d_val="Video" cache_life="86400"}
+                                    {include file="public/video-list-phb" start="0"/}
+                                    {/video:ranklist}
+                                
+                                </ul>
                             </div>
                         </div>
-                        <ul class="stui-vodlist clearfix">
-                            {video:list count="12" 
-                            v_category_en="$arrChildrenCategory.v_category_en"
-                            v_lang_en="all"
-                            v_area_en="all"
-                            v_year="all"
-                            sort_type="news"
-                            d_key="d_key" d_val="Video"  cache_life="86400"}
-
-                                {include file="public/video-list-shu" /}
-                            {/video:list}
-                            
-                        </ul>
-                        <ul class="stui-vodlist__text col-pd clearfix hidden-xs">
-                            {video:list count="12" 
-                            v_category_en="$arrChildrenCategory.v_category_en"
-                            v_lang_en="all"
-                            v_area_en="all"
-                            v_year="all" 
-                            sort_type="news"
-                            d_key="d_key" d_val="Video"  cache_life="86400"}
-                            {include file="public/video-list-text2" /} 
-                            {/video:list}
-                        </ul>
-                    </div>
-                    <div class="col-lg-wide-25 hidden-md hidden-sm hidden-xs">
-                        <div class="stui-pannel_hd">
-                            <div class="stui-pannel__head active bottom-line clearfix">
-                                <h3 class="title"><img src="/template/videodadi/icon/icon_12.png"><a
-                                        style="color: rgb(57, 129, 89);" href="">{$arrChildrenCategory.v_category}周榜单</a>
-                                </h3>
-                            </div>
-                        </div>
-                        <ul class="stui-vodlist__text active col-pd clearfix">
-                            {video:ranklist count="10" 
-                            v_category_en="$arrChildrenCategory.v_category_en"
-                            sort_type="weekly"
-                            d_key="key" d_val="Video" cache_life="86400"}
-                            {include file="public/video-list-phb" /}
-                            {/video:ranklist}
-                         
-                        </ul>
                     </div>
                 </div>
-            </div>
-        </div>
-        {/foreach}
-        {/if}
+                {/foreach}
+            {/if}
         {/video:categorytype}
     </div>
     
diff --git a/code/app/model/VideoCategoryModel.php b/code/app/model/VideoCategoryModel.php
index b20549d..fbfb0d9 100644
--- a/code/app/model/VideoCategoryModel.php
+++ b/code/app/model/VideoCategoryModel.php
@@ -79,11 +79,11 @@ class VideoCategoryModel extends MongoModel
                     "v_category" => "动画片",
                     "children" => [],
                 ],
-                [
-                    "v_category_en" => "lun-li-pian",
-                    "v_category" => "倫理片",
-                    "children" => [],
-                ],
+                // [
+                //     "v_category_en" => "lun-li-pian",
+                //     "v_category" => "倫理片",
+                //     "children" => [],
+                // ],
             ],
         ],
         [
diff --git a/code/app/services/VideoService.php b/code/app/services/VideoService.php
index c22fe69..ef10c89 100644
--- a/code/app/services/VideoService.php
+++ b/code/app/services/VideoService.php
@@ -301,6 +301,7 @@ class VideoService
      */
     public function getVideoList(array $arrParams): array
     {
+        
         $intCount = (int)$arrParams['count'] ?? 10;
         // $strVCategory = $arrParams['v_category'] ?? '';
         $strSortType = (string)$arrParams['sort_type'] ?? '';
@@ -311,6 +312,7 @@ class VideoService
 
         $strVCategoryEn = (string) $arrParams['v_category_en'] ?? '';
         $strVParentCategoryEn = (string) $arrParams['v_parent_category_en'] ?? '';
+        
 
         $strVLangEn = (string)$arrParams['v_lang_en'] ?? 'all';
         $strVAreaEn = (string)$arrParams['v_area_en'] ?? 'all';
diff --git a/code/extend/template/taglib/Video.php b/code/extend/template/taglib/Video.php
index 7e4d8ba..bd4eaea 100644
--- a/code/extend/template/taglib/Video.php
+++ b/code/extend/template/taglib/Video.php
@@ -7,10 +7,10 @@ use think\template\TagLib;
 class Video extends TagLib
 {
         protected $tags = [
-                'list' => ['attr' => 'count,v_category,v_parent_category_en,sort_type,v_status,v_sex,diff_key,cache_life,d_key,d_val,export_name', 'close' => 1],
-                'listexp' => ['attr' => 'count,v_category,v_parent_category_en,sort_type,v_status,v_sex,diff_key,cache_life,d_key,d_val,export_name', 'close' => 0],
-                'pager' => ['attr' => 'page,limit,v_category,v_parent_category_en,sort_type,v_status,v_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 1],
-                'pagerexp' => ['attr' => 'page,limit,v_class,v_category,v_parent_category_en,sort_type,v_status,v_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 0],
+                'list' => ['attr' => 'count,v_category_en,v_parent_category_en,sort_type,v_status,v_sex,diff_key,cache_life,d_key,d_val,export_name', 'close' => 1],
+                'listexp' => ['attr' => 'count,v_category_en,v_parent_category_en,sort_type,v_status,v_sex,diff_key,cache_life,d_key,d_val,export_name', 'close' => 0],
+                'pager' => ['attr' => 'page,limit,v_category_en,v_parent_category_en,sort_type,v_status,v_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 1],
+                'pagerexp' => ['attr' => 'page,limit,v_class,v_category_en,v_parent_category_en,sort_type,v_status,v_sex,key,diff_key,cache_life,d_key,d_val,p_val,func,export_name', 'close' => 0],
                 'info' => ['attr' => 'v_id,v_forge_id,v_key', 'close' => 0],
                 'sort' => ['attr' => 'd_key,d_val'],
                 'ranksort' => ['attr' => 'd_key,d_val'],
@@ -253,6 +253,10 @@ EOT;
          */
         public function tagList($tag, $content)
         {
+                // if($tag['sort_type'] == "news1"){
+                //         echo $tag['v_parent_category_en'];
+                // }
+                
                 $count = $tag['count'] ?? '10';
                 // $v_category = $tag['v_category'] ?? "all";
                 $sort_type = $tag['sort_type'] ?? "";
@@ -281,6 +285,7 @@ EOT;
 
                 $arrDataName = randomString(5);
 
+
                 $strParse = <<<EOT
 <?php
 \${$arrDataName} = app(\\app\\services\\VideoService::class)->getVideoList([
diff --git a/code/public/template/videodadi/css/stui_block.css b/code/public/template/videodadi/css/stui_block.css
index 3b8daa1..0a31c2f 100644
--- a/code/public/template/videodadi/css/stui_block.css
+++ b/code/public/template/videodadi/css/stui_block.css
@@ -658,7 +658,155 @@ textarea.form-control{ height: auto;}
   stui_block_color.css   end
 */
 
-
+/**
+  stui_default.css   strat
+*/
+/*!
+ * Edition v2.0 Copyright 2016-2018 http://v.shoutu.cn
+ * Email 726662013@qq.com,admin@shoutu.cn
+ */
+ @charset "utf-8";
+ /* all */
+ body{ padding-top: 80px}
+ 
+ /* header */
+ .stui-header__top{ position:fixed; top:0;z-index: 999;width:100%; height: 60px; background-color: #292838; border-top: 5px solid #155FAA;}
+ .top-fixed-down{margin-top:-60px}
+ .stui-header__side{float:right}
+ 
+ /* header-logo */
+ .stui-header__logo,.stui-header__menu{float:left}
+ .stui-header__logo{margin-top: 0}
+ .stui-header__logo .logo{ display:block; width:150px; height:50px; background:url(../img/logo_pc.png) no-repeat; background-position:50% 50%; background-size:cover}
+ .stui-header__logo .logo-text{ display:block; width:150px; height:50px; font-size:1.5rem;color: #ff9900;line-height: 50px;text-align: center;letter-spacing: 5px;}
+ 
+ /* header-menu */
+ .stui-header__menu{position:relative;margin-left:10px}
+ .stui-header__menu li{float:left;}
+ .stui-header__menu li a{ display:inline-block; height: 55px; line-height: 50px; font-size:15px; padding: 0 20px; color: #fff;}
+ .stui-header__menu li.active a{ background-color: #155FAA; color: #fff;}
+ 
+ /* header-seacrh */
+ .stui-header__search{float:left;position:relative;margin-top:12px;width:200px}
+ .stui-header__search .submit{display:block;position:absolute;top:0;right:0;width:30px;height:30px;line-height:30px;text-align:center; background: none; border: 0;cursor: pointer;}
+ .stui-header__search .submit .icon{font-size:14px;color:#999}
+ 
+ /* header-user */
+ .stui-header__user{float:right}
+ .stui-header__user > li{ float:left; position: relative; padding: 15px 0 10px; margin-left: 30px;}
+ .stui-header__user > li > a .icon{ display: inline-block; font-size: 24px; line-height: 24px; color: #fff;}
+ .stui-header__user > li .dropdown{ display: none; position: absolute; z-index: 999; width: 240px; top: 100%; right: -15px; padding: 15px; font-size: 12px; color: #999; background-color: #fff; box-shadow: 0 2px 8px rgba(0,0,0,.2); border-radius: 4px; background-color: #fff; box-shadow: 0 2px 8px rgba(0,0,0,.2);}
+ .stui-header__user > li .dropdown:before{ content:" "; width:10px; height:10px; -webkit-transform:rotate(-45deg); -ms-transform:rotate(-45deg); transform:rotate(-45deg); position: absolute; top:-5px; right: 22px; background-color: #fff; border-top: 1px solid #eee; border-right: 1px solid #eee;}
+ .stui-header__user .dropdown li{ position: relative; padding: 10px 0;}
+ .stui-header__user .dropdown li:first-child{ margin-top: 10px;}
+ .stui-header__user .dropdown li:last-child{ padding-bottom: 0;}
+ .stui-header__user > li:hover .dropdown{ display: block;}
+ 
+ /* content */
+ .stui-content__detail,.stui-content__thumb{display:table-cell;vertical-align:top}
+ .stui-content__thumb .v-thumb{width:190px}
+ .stui-content__thumb .w-thumb{width:300px}
+ .stui-content__detail{width:100%;padding:10px 20px;}
+ .stui-content__detail .title{margin:10px 0 10px;line-height:30px}
+ .stui-content__detail .title .score{display: inline-block; margin-left: 10px; font-family: Georgia,"Times New Roman",Times,serif; font-size: 24px; line-height: 24px; color: #09BB07;}
+ .stui-content__detail .data{margin-bottom:10px}
+ .stui-content__detail .data li{float:left;margin-right:20px}
+ .stui-content__detail .desc{padding-left:42px}
+ .stui-content__detail .desc .left{margin-left:-42px}
+ 
+ /* player */
+ .stui-player__video{ background-color: #000}
+ .stui-player__detail{ margin-top: 20px;}
+ .stui-player__detail .more-btn{ float: right; padding-top: 10px;}
+ .stui-player__detail .more-btn li{ display: inline-block; margin-left: 10px;}
+ .stui-player__detail .more-btn .btn{ padding: 6px 15px;}
+ .stui-player__detail .title{margin:0 0 10px}
+ .stui-player__detail .detail-content{padding-top:10px}
+ .stui-player__detail .desc{padding-left:42px}
+ .stui-player__detail .desc .left{margin-left:-42px}
+ 
+ /* autocomplete */
+ .autocomplete-suggestions{ padding: 0 10px; margin-top: 5px; border-radius:4px; background-color: #FFFFFF; box-shadow: 0 2px 10px rgba(0,0,0,.05);}
+ .autocomplete-suggestions.active{position: absolute; z-index: 9999; top: 100%; width: 100%;}
+ .autocomplete-suggestion{padding:10px 0; cursor:pointer; border-top: 1px solid #EEEEEE;}
+ .autocomplete-suggestion:first-child{border-top:0}
+ .mac_results{ z-index: 9999; padding: 0 10px; margin-top: 5px; border-radius:4px; background-color: #FFFFFF; border:1px solid #EEEEEE; box-shadow: 0 2px 10px rgba(0,0,0,.05);}
+ .mac_results li{padding:10px 0; cursor:pointer; border-top: 1px solid #EEEEEE;}
+ .mac_results li:first-child{ border: 0;}
+ 
+ 
+ @media (min-width:768px){
+	 .container{width:750px}
+ }
+ @media (min-width:992px){
+	 .container{width:920px}
+ }
+ @media (min-width:1200px){
+	 .container{width:1170px}
+ }
+ @media (min-width:1400px){
+	 .container{width:1380px}
+ }
+ @media (max-width:1024px){
+	 
+	 /* all */
+	 body{padding-top:100px}
+ 
+	 /* header */
+	 .top-fixed-down{margin-top:-55px}
+	 .stui-header__side{float:none;position:absolute;top:0;left:150px;right:0;width:auto}
+	 .stui-header__logo,.stui-header__menu{float:none}
+	 .stui-header__logo{margin:10px 0 10px}
+	 .stui-header__logo .logo{width:127px;height:30px; background:url(../img/logo_h5.png) no-repeat; background-position:50% 50%; background-size:cover;}
+	 .stui-header__logo .logo-text{width:127px;height:30px; font-size:1.2rem;color: #ff9900;line-height: 30px;text-align: left;letter-spacing: 2px;}
+	 .stui-header__search{float:right;margin-top:10px}
+	 .stui-header__top{ padding: 0 10px; height: 100px;}
+	 .stui-header__menu{margin:0;padding:0;}
+	 .stui-header__menu:before{content:" ";position:absolute;left:0;top:0;right:0;width:100%;height:1px;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5); border-top: 1px solid #155FAA}
+	 .stui-header__menu li{ margin-top:0;margin-right:10px}
+	 .stui-header__menu li a{ padding: 0; font-size:14px; height: 40px; line-height: 40px; white-space:nowrap; color: #fff;}
+	 .stui-header__menu li.active a{ position:relative; background: none; color: #ff9900;}
+	 .stui-header__user > li{ padding: 15px 0 10px; margin-right: 10px;}
+	 .stui-header__user > li .dropdown{ right: 0;}
+	 .stui-header__user > li .dropdown:before{ right: 8px;}
+	 .stui-header__menu > li:hover .dropdown,.stui-header__user > li:hover .dropdown{ display: none;} 
+ }
+ @media (max-width:767px){
+ 
+	 /* header */ 
+	 .stui-header__search{position:absolute;top:0;left:0;right:50px;width:auto}
+	 .stui-header__user > li{ padding: 14px 0; margin: 0;}
+	 
+	 /* content */
+	 .stui-content__thumb .v-thumb{width:115px}
+	 .stui-content__thumb .w-thumb{width:160px}
+	 .stui-content__detail{padding:0 10px}
+	 .stui-content__detail .title{margin:10px 0 10px;font-size:16px;line-height:18px}
+	 .stui-content__detail .data{margin:0 0 10px;font-size:12px}
+	 .stui-content__detail .play-btn{margin:0;padding:0}	
+	 
+	 /* player */
+	 .stui-player__detail.detail .title{ margin-top: 10px; font-size: 16px;}
+	 .stui-player__detail{ margin-top: 0;}
+	 .stui-player__detail .data .title{font-size:16px}
+	 .stui-player__detail .more-btn{ margin-bottom: 10px;}
+	 .stui-player__detail .more-btn{ float: none; padding: 10px; background-color: #222; display: -webkit-box; display: -webkit-flex; display: flex;}
+	 .stui-player__detail .more-btn li{ margin: 0; padding: 0 5px; -webkit-box-flex: 1; -webkit-flex: 1; flex: 1; text-align: center;}
+	 .stui-player__detail .more-btn .btn{ display: block; padding: 6px;}
+		 
+	 /* type */
+	 .stui-mobile__type li{padding:0 20px}
+	 .stui-mobile__type li a{display:block;padding:10px 0;text-align:center}		
+	 
+	 /* foot */
+	 .stui-foot{padding:20px 0}
+	 
+ }
+ .fa-thumbs-up:before{content:"\f164"}
+ .fa-thumbs-down:before{content:"\f165"}
+/**
+  stui_default.css   end
+*/
 
 .stui-screen__list {
     display: flex; /* 使用 Flexbox 布局 */
diff --git a/code/public/template/videodadi/css/stui_default.css b/code/public/template/videodadi/css/stui_default.css
deleted file mode 100644
index a88552f..0000000
--- a/code/public/template/videodadi/css/stui_default.css
+++ /dev/null
@@ -1,143 +0,0 @@
-/*!
- * Edition v2.0 Copyright 2016-2018 http://v.shoutu.cn
- * Email 726662013@qq.com,admin@shoutu.cn
- */
-@charset "utf-8";
-/* all */
-body{ padding-top: 80px}
-
-/* header */
-.stui-header__top{ position:fixed; top:0;z-index: 999;width:100%; height: 60px; background-color: #292838; border-top: 5px solid #155FAA;}
-.top-fixed-down{margin-top:-60px}
-.stui-header__side{float:right}
-
-/* header-logo */
-.stui-header__logo,.stui-header__menu{float:left}
-.stui-header__logo{margin-top: 0}
-.stui-header__logo .logo{ display:block; width:150px; height:50px; background:url(../img/logo_pc.png) no-repeat; background-position:50% 50%; background-size:cover}
-.stui-header__logo .logo-text{ display:block; width:150px; height:50px; font-size:1.5rem;color: #ff9900;line-height: 50px;text-align: center;letter-spacing: 5px;}
-
-/* header-menu */
-.stui-header__menu{position:relative;margin-left:10px}
-.stui-header__menu li{float:left;}
-.stui-header__menu li a{ display:inline-block; height: 55px; line-height: 50px; font-size:15px; padding: 0 20px; color: #fff;}
-.stui-header__menu li.active a{ background-color: #155FAA; color: #fff;}
-
-/* header-seacrh */
-.stui-header__search{float:left;position:relative;margin-top:12px;width:200px}
-.stui-header__search .submit{display:block;position:absolute;top:0;right:0;width:30px;height:30px;line-height:30px;text-align:center; background: none; border: 0;cursor: pointer;}
-.stui-header__search .submit .icon{font-size:14px;color:#999}
-
-/* header-user */
-.stui-header__user{float:right}
-.stui-header__user > li{ float:left; position: relative; padding: 15px 0 10px; margin-left: 30px;}
-.stui-header__user > li > a .icon{ display: inline-block; font-size: 24px; line-height: 24px; color: #fff;}
-.stui-header__user > li .dropdown{ display: none; position: absolute; z-index: 999; width: 240px; top: 100%; right: -15px; padding: 15px; font-size: 12px; color: #999; background-color: #fff; box-shadow: 0 2px 8px rgba(0,0,0,.2); border-radius: 4px; background-color: #fff; box-shadow: 0 2px 8px rgba(0,0,0,.2);}
-.stui-header__user > li .dropdown:before{ content:" "; width:10px; height:10px; -webkit-transform:rotate(-45deg); -ms-transform:rotate(-45deg); transform:rotate(-45deg); position: absolute; top:-5px; right: 22px; background-color: #fff; border-top: 1px solid #eee; border-right: 1px solid #eee;}
-.stui-header__user .dropdown li{ position: relative; padding: 10px 0;}
-.stui-header__user .dropdown li:first-child{ margin-top: 10px;}
-.stui-header__user .dropdown li:last-child{ padding-bottom: 0;}
-.stui-header__user > li:hover .dropdown{ display: block;}
-
-/* content */
-.stui-content__detail,.stui-content__thumb{display:table-cell;vertical-align:top}
-.stui-content__thumb .v-thumb{width:190px}
-.stui-content__thumb .w-thumb{width:300px}
-.stui-content__detail{width:100%;padding:10px 20px;}
-.stui-content__detail .title{margin:10px 0 10px;line-height:30px}
-.stui-content__detail .title .score{display: inline-block; margin-left: 10px; font-family: Georgia,"Times New Roman",Times,serif; font-size: 24px; line-height: 24px; color: #09BB07;}
-.stui-content__detail .data{margin-bottom:10px}
-.stui-content__detail .data li{float:left;margin-right:20px}
-.stui-content__detail .desc{padding-left:42px}
-.stui-content__detail .desc .left{margin-left:-42px}
-
-/* player */
-.stui-player__video{ background-color: #000}
-.stui-player__detail{ margin-top: 20px;}
-.stui-player__detail .more-btn{ float: right; padding-top: 10px;}
-.stui-player__detail .more-btn li{ display: inline-block; margin-left: 10px;}
-.stui-player__detail .more-btn .btn{ padding: 6px 15px;}
-.stui-player__detail .title{margin:0 0 10px}
-.stui-player__detail .detail-content{padding-top:10px}
-.stui-player__detail .desc{padding-left:42px}
-.stui-player__detail .desc .left{margin-left:-42px}
-
-/* autocomplete */
-.autocomplete-suggestions{ padding: 0 10px; margin-top: 5px; border-radius:4px; background-color: #FFFFFF; box-shadow: 0 2px 10px rgba(0,0,0,.05);}
-.autocomplete-suggestions.active{position: absolute; z-index: 9999; top: 100%; width: 100%;}
-.autocomplete-suggestion{padding:10px 0; cursor:pointer; border-top: 1px solid #EEEEEE;}
-.autocomplete-suggestion:first-child{border-top:0}
-.mac_results{ z-index: 9999; padding: 0 10px; margin-top: 5px; border-radius:4px; background-color: #FFFFFF; border:1px solid #EEEEEE; box-shadow: 0 2px 10px rgba(0,0,0,.05);}
-.mac_results li{padding:10px 0; cursor:pointer; border-top: 1px solid #EEEEEE;}
-.mac_results li:first-child{ border: 0;}
-
-
-@media (min-width:768px){
-	.container{width:750px}
-}
-@media (min-width:992px){
-	.container{width:920px}
-}
-@media (min-width:1200px){
-	.container{width:1170px}
-}
-@media (min-width:1400px){
-	.container{width:1380px}
-}
-@media (max-width:1024px){
-	
-	/* all */
-	body{padding-top:100px}
-
-    /* header */
-	.top-fixed-down{margin-top:-55px}
-	.stui-header__side{float:none;position:absolute;top:0;left:150px;right:0;width:auto}
-	.stui-header__logo,.stui-header__menu{float:none}
-	.stui-header__logo{margin:10px 0 10px}
-	.stui-header__logo .logo{width:127px;height:30px; background:url(../img/logo_h5.png) no-repeat; background-position:50% 50%; background-size:cover;}
-	.stui-header__logo .logo-text{width:127px;height:30px; font-size:1.2rem;color: #ff9900;line-height: 30px;text-align: left;letter-spacing: 2px;}
-	.stui-header__search{float:right;margin-top:10px}
-	.stui-header__top{ padding: 0 10px; height: 100px;}
-	.stui-header__menu{margin:0;padding:0;}
-	.stui-header__menu:before{content:" ";position:absolute;left:0;top:0;right:0;width:100%;height:1px;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5); border-top: 1px solid #155FAA}
-	.stui-header__menu li{ margin-top:0;margin-right:10px}
-	.stui-header__menu li a{ padding: 0; font-size:14px; height: 40px; line-height: 40px; white-space:nowrap; color: #fff;}
-	.stui-header__menu li.active a{ position:relative; background: none; color: #ff9900;}
-	.stui-header__user > li{ padding: 15px 0 10px; margin-right: 10px;}
-	.stui-header__user > li .dropdown{ right: 0;}
-	.stui-header__user > li .dropdown:before{ right: 8px;}
-	.stui-header__menu > li:hover .dropdown,.stui-header__user > li:hover .dropdown{ display: none;} 
-}
-@media (max-width:767px){
-
-	/* header */ 
-	.stui-header__search{position:absolute;top:0;left:0;right:50px;width:auto}
-	.stui-header__user > li{ padding: 14px 0; margin: 0;}
-	
-	/* content */
-	.stui-content__thumb .v-thumb{width:115px}
-	.stui-content__thumb .w-thumb{width:160px}
-	.stui-content__detail{padding:0 10px}
-	.stui-content__detail .title{margin:10px 0 10px;font-size:16px;line-height:18px}
-	.stui-content__detail .data{margin:0 0 10px;font-size:12px}
-	.stui-content__detail .play-btn{margin:0;padding:0}	
-	
-	/* player */
-	.stui-player__detail.detail .title{ margin-top: 10px; font-size: 16px;}
-	.stui-player__detail{ margin-top: 0;}
-	.stui-player__detail .data .title{font-size:16px}
-	.stui-player__detail .more-btn{ margin-bottom: 10px;}
-	.stui-player__detail .more-btn{ float: none; padding: 10px; background-color: #222; display: -webkit-box; display: -webkit-flex; display: flex;}
-	.stui-player__detail .more-btn li{ margin: 0; padding: 0 5px; -webkit-box-flex: 1; -webkit-flex: 1; flex: 1; text-align: center;}
-	.stui-player__detail .more-btn .btn{ display: block; padding: 6px;}
-		
-	/* type */
-	.stui-mobile__type li{padding:0 20px}
-	.stui-mobile__type li a{display:block;padding:10px 0;text-align:center}		
-	
-	/* foot */
-	.stui-foot{padding:20px 0}
-	
-}
-.fa-thumbs-up:before{content:"\f164"}
-.fa-thumbs-down:before{content:"\f165"}
\ No newline at end of file