Browse Source

适配小笔记本

shaogen1995 1 year ago
parent
commit
02578a7d52

+ 0 - 2
src/assets/styles/base.css

@@ -53,8 +53,6 @@ textarea {
 #root {
   width: 100vw;
   height: 100vh;
-  min-width: 1600px;
-  min-height: 900px;
   overflow: auto;
   overflow-y: overlay;
   /* antd图片预览组件 */

+ 2 - 2
src/assets/styles/base.less

@@ -66,8 +66,8 @@ textarea {
 #root {
   width: 100vw;
   height: 100vh;
-  min-width: 1600px;
-  min-height: 900px;
+  // min-width: 1600px;
+  // min-height: 900px;
   overflow: auto;
   overflow-y: overlay;
 

+ 11 - 0
src/pages/A1home/index.module.scss

@@ -134,6 +134,17 @@
       }
     }
 
+    @media screen and (max-width: 1300px) {
+      .box1 {
+        .b1Btn {
+          bottom: 30px;
+        }
+        .b1Btn > ul {
+          margin-top: 50px;
+        }
+      }
+    }
+
     @media screen and (max-width: 1000px) {
       .box1 {
         background-image: url('../../assets/img/bgM.jpg');

+ 8 - 8
src/pages/A1home/index.tsx

@@ -12,7 +12,7 @@ import bgmMp3 from '@/assets/img/bgm.mp3'
 import Share from './Share'
 import Bottom from './Bottom'
 import { MyObjRowType } from './Bottom/data'
-import history, { isMobileFu, urlParameter } from '@/utils/history'
+import { isMobileFu, urlParameter } from '@/utils/history'
 
 import xiaImg from '@/assets/img/jiantou_w.png'
 import { kankanUrl, panoBaseUrl } from '@/utils/urlRes'
@@ -120,16 +120,16 @@ function A1home() {
           </li>
           <li
             onClick={() => {
-              history.replace('/')
-              setAcObj({} as MyObjRowType)
-              clickBtn('首页')
+              // history.replace('/')
+              // setAcObj({} as MyObjRowType)
+              // clickBtn('首页')
               // setTimeout(() => {
               //   clickBtn(pageKey === '室内' ? '室外' : '室内')
               // }, 200)
-              // window.location.href = 'https://airshow.4dkankan.com/index.html'
-              // setTimeout(() => {
-              //   window.location.reload()
-              // }, 200)
+              window.location.href = 'https://airshow.4dkankan.com/index.html'
+              setTimeout(() => {
+                window.location.reload()
+              }, 300)
             }}
           >
             <div className='toHome'>