Merge branch 'develop' into FOTON

# Conflicts: # src/components/navMenu/index.vue
2021-11-22 16:30:33 +08:00
parent 3b2499c3f3 2b4b1f75c0
commit 366d1769f8
30 changed files with 436 additions and 404 deletions
@@ -2760,7 +2760,6 @@
        }
        @media screen and (min-width: 1920px) {
            .header{
-                height: 65px;
            }
        }
        .standard-search-content{