Merge branches 'master' and 'master' of ssh://git.s64.io:10022/xuduhao/web2468

src/components/AutoWinList/styles.module.scss

@@ -84,6 +84,7 @@
     width: 100%;
     display: flex;
     overflow-x: auto;
+    overflow-y: hidden;
     scroll-snap-type: x mandatory;
     scroll-behavior: smooth;
     & .swiper_item{

src/components/GameItem/styles.module.scss

@@ -20,6 +20,7 @@
       position: relative;
       width: 100%;
       //aspect-ratio:384/516;
+      border-radius: 0.5rem;
       img{
         width: 100%;
         height: 100%;

src/layout/Navbar/index.jsx

@@ -255,6 +255,8 @@ const PageHeader = () => {
     const [showMHeader, setShowMHeader] = useState(false);
     const isLogin=useSelector(isLogined);
     let lastscroll=0;
+    const {open} = useSidebar();
+    const navstyle=open?styles.nav_open:"";
 
     const checkNavActive=(lv)=>{
         if (currRoute&&currRoute.lv)return currRoute.lv.startsWith(lv);
@@ -552,9 +554,17 @@ const PageHeader = () => {
             </>
         )
     }
+    const renderDesktopInstall=()=>{
+        return (
+            <div id={'installBanner'} className={`${styles.header_install} ${styles.header_install_desk} ${navstyle}`}></div>
+        )
+    }
     const renderDesktop=()=>{
         return (
-            <DesktopNav/>
+            <>
+                {renderDesktopInstall()}
+                <DesktopNav/>
+            </>
         );
     }
 

src/layout/Navbar/styles.module.scss

@@ -7,7 +7,8 @@
   justify-content: flex-start;
   background:var(--widget);
   width: 100%;
-  height: 4rem;
+  //height: 4rem;
+  height: auto;
   &.mobile{
     background:transparent;
     //height: 8.5rem;
@@ -23,7 +24,9 @@
   }
 }
 .header{
-  height:100%;
+  position: relative;
+  //height:100%;
+  height:3.75rem;
   width:100%;
   padding: 0px 40px;
   background: var(--widget);
@@ -72,6 +75,12 @@
     top: 0 !important;
   }
   pointer-events: auto;
+  &_desk{
+    padding-left:5.3rem;
+  }
+  &.nav_open{
+    padding-left:16.9rem;
+  }
 }
 .btn_sign_in{
   //padding: 12px 5px !important;