Merge remote-tracking branch 'origin/master'

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;
         $has_dl = $dl_file !== '';
         {/php}
         <div class="d-item">

public/themes/website/1/zh/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;
         $has_dl = $dl_file !== '';
         {/php}
         <div class="d-item">