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

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

@@ -448,14 +448,15 @@
                 </li>
                 <!-- 新闻动态 -->
                 <li class="site-header__nav-item site-header__nav-item--mega">
+                    {hcTaglib:category id="361" item="vo"  field="*"}
                     <a
-                        href="/news.html"
+                        href="{$vo.alias}"
                         class="site-header__nav-link"
                         data-mega-trigger="news"
                         aria-expanded="false"
                         aria-controls="nav-mega-news"
                     >
-                        新闻动态
+                        {$vo.title}
                         <span class="site-header__chevron" aria-hidden="true">
                             <svg
                                 viewBox="0 0 11.2734 6.90918"
@@ -474,14 +475,17 @@
                             </svg>
                         </span>
                     </a>
+                    {/hcTaglib:category}
                     <!-- 新闻动态导航下拉面板 -->
                     <div class="nav-mega" id="nav-mega-news">
                         <div class="nav-mega__inner">
                             <div class="nav-mega__dropdown-content news">
                                 <ul class="nav-mega__row">
-                                    <li><a href="/news.html">行业洞察</a></li>
-                                    <li><a href="/news.html">公司新闻</a></li>
-                                    <li><a href="/news.html">展会与活动</a></li>
+                                    {hcTaglib:subcategory pid="361" item="vo" sort=""}
+                                    <li><a href="{$vo.alias}">{$vo.title}</a></li>
+                                    <!-- <li><a href="/news.html">公司新闻</a></li> -->
+                                    <!-- <li><a href="/news.html">展会与活动</a></li> -->
+                                    {/hcTaglib:subcategory}
                                 </ul>
                             </div>
                         </div>

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

@@ -205,7 +205,7 @@ $current_cate_id = $current_cate['id'] ?? 0;
       <div class="sl2-more__grid">
         {php}$others = getOtherCategoryCategoryId($current_cate['id'],$seller_id,5);{/php}
         {volist name="others" id="vo"}
-        <a class="sl2-more__card" href="">
+        <a class="sl2-more__card" href="{$vo.alias ?? ''}">
           <div class="sl2-more__media">
             <img src="{$vo.thumbnail.url ?? ''}" alt="" width="400" height="300" loading="lazy" />
           </div>