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

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

@@ -259,7 +259,7 @@
                                                             <!-- 获取当前分类下的内容 -->
                                                             {hcTaglib:contentPage2 cid="$vo22.id" mainField="id,category_id,title,sub_title" subField="" name="hc_content" limit="30" item="content22" sort="sort asc"}
                                                             {/hcTaglib:contentPage2}
-                                                            {if !empty($hc_content)}
+                                                            {if !empty($hc_content) && $vo22.need_show_sub_content==1}
                                                             <ul class="nav-mega__links">
                                                                 {volist name="hc_content" id="vo_content"}
                                                                 <li><a href="{:hcUrl('detail/index',['id'=>$vo_content['id'],'cid'=>$vo_content['category_id']])}">{$vo_content.title}</a></li>