Merge branch 'master' of https://git-online.zhco.com/wjd/rui-neng

app/taglib/HcTaglib.php

@@ -690,7 +690,13 @@ parse;
      */
     public function tagContentPage($tag, $content): string
     {
-        $cid = !empty($_GET['cid']) ? $_GET['cid'] : (empty($tag['cid']) ? '' : (int)$tag['cid']);
+        $cid = !empty($_GET['cid']) ? (int)$_GET['cid'] : (empty($tag['cid']) ? '' : $tag['cid']);
+        if (strpos($cid, '$') === 0) {
+            // cid 为模板变量（如 cid="$ui_invest_learn"），运行时解析
+            $this->autoBuildVar($cid);
+        } else {
+            $cid = (int)$cid;
+        }
         $keywords = empty($_GET['keywords']) ? '' : $_GET['keywords'];
         $item = empty($tag['item']) ? 'vo' : $tag['item'];
         $mainField = empty($tag['mainField']) ? '*' : $tag['mainField'];
@@ -715,7 +721,7 @@ parse;
             $parse = <<<parse
 <?php
 \${$returnVarName} = \app\service\ContentService::tagContentPage([
-    'cid' => '{$cid}',
+    'cid' => {$cid},
     'item'  => '{$item}',
     'mainField' => '{$mainField}',
     'subField'  => '{$subField}',
@@ -741,7 +747,7 @@ parse;
             $parse = <<<parse
 <?php
 \${$returnVarName} = \app\service\ContentService::tagContentPage([
-    'cid' => '{$cid}',
+    'cid' => {$cid},
     'item'  => '{$item}',
     'mainField' => '{$mainField}',
     'subField'  => '{$subField}',

public/themes/website/1/en/demo/download.html

@@ -119,7 +119,9 @@
       <div class="d-list">
         {hcTaglib:contentPage mainField="*" subField="*"  name="hc_content" limit="12" item="vo" sort="sort desc"}
         {php}
-        $dl_file = !empty($vo['url']) ? $vo['url'] : ($vo['thumbnail']['url'] ?? '');
+        // $dl_file = !empty($vo['url']) ? $vo['url'] : ($vo['thumbnail']['url'] ?? '');
+        $pdf_resource_download = $vo['main_content']['resource_download'][0] ?? '';
+        $dl_file = $pdf_resource_download['url'] ?? '';
         $has_dl = $dl_file !== '';
         {/php}
         <div class="d-item">

public/themes/website/1/zh/demo/components/footer.html

@@ -59,9 +59,8 @@
             <p class="site-footer__copyright">Copyright 2026 {hcTaglib:setting name="company_name" type="1" /} 版权所有 | <a href="{hcTaglib:setting name='icp_link' type='2' /}" target="_blank" rel="nofollow noopener">{hcTaglib:setting name="icp" type="2" /}</a> | <a href="{hcTaglib:setting name='gwa_link' type='2' /}" target="_blank" rel="nofollow noopener"><img
                     class="site-footer__gongan" src="/themes/dist_static/static/images/gongan-DdFBmJbc.png" alt="" /> {hcTaglib:setting name="gwa" type="2" /}</a></p>
             <div class="site-footer__legal">
-                <!-- <a href="{:getMuiLangUrl('/sitemap.html')}">网站地图</a> -->
-                <!-- <a href="{:getMuiLangUrl('/privacy.html')}">隐私声明</a> -->
-                <a href="javascript:;">网站地图</a>
+                 <a target="_blank" href="{:getMuiLangUrl('/sitemap.html')}">网站地图</a>
+<!--                 <a target="_blank" href="{:getMuiLangUrl('/privacy.html')}">隐私声明</a>-->
                 <a href="javascript:;">隐私声明</a>
             </div>
         </div>

public/themes/website/1/zh/demo/download.html

@@ -120,6 +120,8 @@
         {hcTaglib:contentPage mainField="*" subField="*"  name="hc_content" limit="12" item="vo" sort="sort desc"}
         {php}
         $dl_file = !empty($vo['url']) ? $vo['url'] : ($vo['thumbnail']['url'] ?? '');
+        $pdf_resource_download = $vo['main_content']['resource_download'][0] ?? '';
+        $dl_file = $pdf_resource_download['url'] ?? '';
         $has_dl = $dl_file !== '';
         {/php}
         <div class="d-item">