lanxin 8 months ago
parent
commit
18e441c797

+ 1 - 3
src/components/RouterOrder.tsx

@@ -4,8 +4,6 @@ import { Route, Router, Switch } from 'react-router-dom'
 import SpinLoding from './SpinLoding'
 import NotFound from '@/components/NotFound'
 
-const A1home = React.lazy(() => import('@/pages/A1home'))
-
 const routerArr = [
   {
     id: 1,
@@ -19,7 +17,7 @@ const routerArr = [
     name: '主页',
     path: '/home',
     exact: true,
-    Com: A1home
+    Com: React.lazy(() => import('@/pages/A1home'))
   },
 
   {

+ 15 - 2
src/pages/A0base/index.module.scss

@@ -74,6 +74,7 @@
       font-size: 24px;
       line-height: 24px;
       width: 177px;
+      color: #fff;
       position: absolute;
       left: 95%;
       top: 60%;
@@ -102,7 +103,7 @@
         height: 35px;
         background-color: rgba(255, 255, 255, 0.8);
         font-size: 16px;
-        font-weight: 600;
+        font-weight: bold;
         color: #007bff;
         background: linear-gradient(to right top, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0.4));
         box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
@@ -112,13 +113,19 @@
         justify-content: center;
         cursor: pointer;
         transform: translateX(21.5%);
+        &:hover {
+          scale: 1.05;
+          span {
+            transform: scale(calc(1 / 1.05));
+          }
+        }
       }
       .floor-2 {
         width: 140px;
         height: 35px;
         background-color: rgba(255, 255, 255, 0.8);
         font-size: 16px;
-        font-weight: 600;
+        font-weight: bold;
         color: #007bff;
         background: linear-gradient(to right top, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0.4));
         box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
@@ -127,6 +134,12 @@
         align-items: center;
         justify-content: center;
         cursor: pointer;
+        &:hover {
+          scale: 1.05;
+          span {
+            transform: scale(calc(1 / 1.05));
+          }
+        }
       }
       .arrow {
         pointer-events: none;

+ 22 - 4
src/pages/A0base/index.tsx

@@ -80,10 +80,28 @@ function Layout({ setIsFloor }: { setIsFloor: (isFloor: boolean) => void }) {
         <img src={require('./image/back.png')} alt='' />
       </div>
       <div className='layout-container'>
-        <div className='floor-1' onClick={() => history.push('/home?m=SG-dwRgbFq7Fiz')}>
-          楼层23
+        <div
+          className='floor-1'
+          onClick={() => {
+            history.push('/home?m=SG-dwRgbFq7Fiz')
+            setTimeout(() => {
+              window.location.reload()
+            }, 200)
+          }}
+        >
+          <span>楼层23</span>
+        </div>
+        <div
+          className='floor-2'
+          onClick={() => {
+            history.push('/home?m=SG-dwRgbFq7Fiz')
+            setTimeout(() => {
+              window.location.reload()
+            }, 200)
+          }}
+        >
+          <span>楼层22</span>
         </div>
-        <div className='floor-2'>楼层22</div>
         <img src={arrow} alt='' className='arrow' />
       </div>
     </div>
@@ -187,7 +205,7 @@ function A0Base() {
         </div>
         <div className='A0_icon'>
           <img className='A0_icon_intro' onClick={() => setShowIntro(true)} src={intro} alt='' />
-          <div>简介1</div>
+          <div>简介</div>
         </div>
         <div className='A0_icon' onClick={() => handleShareClick()}>
           <img className='A0_icon_share' src={share} alt='' />

+ 1 - 0
src/store/reducer/three.ts

@@ -6,6 +6,7 @@ declare global {
   //设置全局属性
   interface Window {
     //window对象属性
+    number: string
     threeReact: {
       state3d: (str: ThreeState3dType) => void
     }