Merge branch 'dev'

app/index/view/pc/public/header.html

@@ -14,7 +14,7 @@
                 <div class="header-nav-item" >
                     <div class="header-nav-title">{:lang_i18n('产品列表')}</div>
                     <!-- style=" opacity: 1;" -->
-                    <div class="header-dropdown" >
+                    <div class="header-dropdown" style=" opacity: 1;">
                         <div class="header-dropdown-tabs">
                             {volist name="header_categorys" id="vo" key="idx"}
                             <a href="{:url('product/category', ['id' => $vo.id])}" class="header-tab-item {if condition="$idx == 1"}active{/if}" data-tab="tag-{$vo.id}">{$vo.name}</a>

public/static/index/pc/css/header.css

@@ -339,7 +339,7 @@ a {
     display: flex;
     flex: 1; 
     justify-content: space-between;
-    max-width: 48%;
+   
  
 }
 
@@ -354,10 +354,7 @@ a {
    
 }
 
-/* 单个分类区块 */
+
-.header-category-block {
-    /* flex: 1; */
-}
 
 
 .header-category-title {
@@ -399,13 +396,14 @@ a {
     justify-content: space-between;
     flex: 1;
     min-width: 0;
-   
+   font-size: 16px;
+    max-width: 748px;
 }
 
 
 
 .header-product-card {
-     text-align: center;
+    text-align: center;
     width: calc(50% - 0.75em);
     max-width: 22.625em;
     flex-shrink: 1;
@@ -429,12 +427,12 @@ a {
     transform: translateY(-2px)
 }
 
-.header-product-card:nth-child(1) {
+/* .header-product-card:nth-child(1) {
-    margin-right: 1.5em;
+   
-}
+} */
 
 .header-product-card:nth-child(3) {
-    margin-right: 1.5em;
+   
     margin-top: 1.5em;
 }
 
@@ -442,20 +440,7 @@ a {
     margin-top: 1.5em;
 }
 
-/*.header-product-img {*/
-/*    width: 22.625em;*/
-/*    height: 12.25em;*/
-/*    background-color: #f5f5f5;*/
-/*    display: flex;*/
-/*    align-items: center;*/
-/*    justify-content: center;*/
-/*    color: #999;*/
-/*}*/
 
-/*.header-product-img img {*/
-/*    width: 22.625em;*/
-/*    height: 12.25em;*/
-/*}*/
 .header-product-img {
     width: 100%;
     aspect-ratio: 22.625 / 12.25;
@@ -465,7 +450,6 @@ a {
     justify-content: center;
     color: #999;
     overflow: hidden;
-    /* border-radius: 0.5em; */
 }
 
 .header-product-img img {