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

@@ -399,7 +399,7 @@ a {
     justify-content: space-between;
     flex: 1;
     min-width: 0;
-   
+   font-size: 16px;
 }
 
 
@@ -430,11 +430,11 @@ a {
 }
 
 .header-product-card:nth-child(1) {
-    margin-right: 1.5em;
+    /* margin-right: 1.5em; */
 }
 
 .header-product-card:nth-child(3) {
-    margin-right: 1.5em;
+    /* margin-right: 1.5em; */
     margin-top: 1.5em;
 }