Merge remote-tracking branch 'origin/master'

public/themes/dist_static/static/css/common.css

@@ -1304,9 +1304,13 @@ body {
   box-shadow: 0 1.5rem 3rem rgba(46, 53, 58, 0.08);
   transition: grid-template-rows 0.5s var(--easing);
 }.nav-mega__inner {
-  overflow: hidden;
+  overflow: auto;
   min-height: 0;
-}.site-header__nav-item:hover .nav-mega__inner {
+}
+.nav-mega__inner::-webkit-scrollbar {
+  display: none;
+}
+.site-header__nav-item:hover .nav-mega__inner {
   overflow-y: auto;
   overscroll-behavior: contain;
   -webkit-overflow-scrolling: touch;

public/themes/dist_static/static/css/product.css

@@ -402,7 +402,7 @@ body.is-p-subnav .site-header {
   z-index: 5;
   display: flex;
   align-items: center;
-  padding: 2rem 0;
+  padding: 1rem 0;
   background: var(--color-white);
   border-bottom: 0.125rem solid rgb(223, 224, 226);
 }
@@ -451,7 +451,7 @@ body.is-p-subnav .site-header {
   display: flex;
   flex-direction: column;
   align-items: center;
-  gap: 1.25rem;
+  gap: 0.5rem;
   padding: 0;
   border: 0;
   border-radius: 0;
@@ -480,14 +480,14 @@ body.is-p-subnav .site-header {
 }
 .p-spec__tab-media img {
   width: auto;
-  height: 6.25rem; /* 100px */
-  max-width: 4.5rem; /* 72px */
+  height: 5rem;
+  max-width: 4.5rem;
   object-fit: contain;
   display: block;
 }
 .p-spec__tab-name {
   font-family: "MiSans VF", "PingFang SC", sans-serif;
-  font-size: var(--font-24);
+  font-size: var(--font-20);
   font-weight: 400;
   line-height: var(--font-32);
 }

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>