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

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

@@ -1490,31 +1490,7 @@ body {
   display: flex;
   align-items: center;
   gap: 0.5rem;
-}.nav-mega__subgroup-toggle {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 1.5rem;
-  height: 1.5rem;
-  padding: 0;
-  border: none;
-  background: transparent;
-  color: var(--color-text-muted);
-  cursor: pointer;
-  flex-shrink: 0;
-  transition: color var(--duration-fast) var(--easing), transform var(--duration-normal) var(--easing);
-}.nav-mega__subgroup-toggle svg {
-  width: 0.5rem;
-  height: 0.75rem;
-  display: block;
-}.nav-mega__subgroup-toggle:hover {
-  color: var(--color-primary);
-}.nav-mega__subgroup.is-expanded .nav-mega__subgroup-toggle {
-  transform: rotate(90deg);
-  color: var(--color-primary);
 }.nav-mega__subgroup .nav-mega__links {
-  display: none;
-}.nav-mega__subgroup.is-expanded .nav-mega__links {
   display: flex;
 }.nav-mega__subgroup-title {
   display: inline-flex;
@@ -1527,8 +1503,22 @@ body {
   line-height: var(--font-22);
   text-decoration: none;
   transition: color var(--duration-fast) var(--easing);
+}.nav-mega__subgroup-title::after {
+  content: "";
+  display: block;
+  flex-shrink: 0;
+  width: 0.5rem;
+  height: 0.75rem;
+  background: currentColor;
+  opacity: 0;
+  transition: opacity var(--duration-normal) var(--easing);
+  mask: url("data:image/svg+xml,%3csvg%20viewBox='-1%20-1%208.59082%2013.0605'%20xmlns='http://www.w3.org/2000/svg'%20fill='none'%3e%3cpath%20d='M0%204.12464e-05L5%205.00004L10%200'%20stroke='currentColor'%20stroke-width='1.5'%20stroke-linecap='round'%20stroke-linejoin='round'%20transform='matrix(0,-1,1,0,0.530273,10.5303)'%20/%3e%3c/svg%3e") center/contain no-repeat;
+  -webkit-mask: url("data:image/svg+xml,%3csvg%20viewBox='-1%20-1%208.59082%2013.0605'%20xmlns='http://www.w3.org/2000/svg'%20fill='none'%3e%3cpath%20d='M0%204.12464e-05L5%205.00004L10%200'%20stroke='currentColor'%20stroke-width='1.5'%20stroke-linecap='round'%20stroke-linejoin='round'%20transform='matrix(0,-1,1,0,0.530273,10.5303)'%20/%3e%3c/svg%3e") center/contain no-repeat;
 }.nav-mega__subgroup-title:hover {
+  cursor: pointer;
   color: var(--color-primary);
+}.nav-mega__subgroup-title:hover::after {
+  opacity: 1;
 }.nav-mega__links {
   display: flex;
   flex-direction: column;

public/themes/dist_static/static/js/common.js

@@ -139,14 +139,6 @@ $(function() {
 		});
 	});
 
-	// nav-mega__subgroup-toggle 点击展开/收起
-	$(document).on("click", ".nav-mega__subgroup-toggle", function() {
-		const $subgroup = $(this).closest(".nav-mega__subgroup");
-		const isExpanded = $subgroup.hasClass("is-expanded");
-		$subgroup.toggleClass("is-expanded", !isExpanded);
-		$(this).attr("aria-expanded", !isExpanded);
-	});
-
 	// Lenis.stop() 会加 .lenis-stopped { overflow: clip }，经典滚动条（如360）消失后
 	// fixed 头部会变宽；内容区通常不变。只补偿头部，不给 html/body 加 padding。
 	function getScrollbarWidth() {

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

@@ -290,11 +290,6 @@
                                                             <div class="nav-mega__subgroup">
                                                                 <div class="nav-mega__subgroup-head">
                                                                     <a class="nav-mega__subgroup-title" href="{$vo.alias}?cat=product-control-{$vo.id}&sub=product-plc-{$vo22.id}">{$vo33.title}</a>
-                                                                    <button type="button" class="nav-mega__subgroup-toggle" aria-expanded="false" aria-label="展开/收起">
-                                                                        <svg viewBox="-1 -1 8.59082 13.0605" xmlns="http://www.w3.org/2000/svg" fill="none">
-                                                                            <path d="M0 4.12464e-05L5 5.00004L10 0" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0,-1,1,0,0.530273,10.5303)" />
-                                                                        </svg>
-                                                                    </button>
                                                                 </div>
                                                                 <!-- 获取当前子分类下的内容 -->
                                                                 {hcTaglib:contentPage2 cid="$vo33.id" mainField="id,category_id,title,sub_title" subField="" name="hc_content33" limit="30" item="content33" sort="sort asc"}