shaogen1995 3 veckor sedan
förälder
incheckning
f8fd11ae66

+ 2 - 2
src/App.tsx

@@ -7,7 +7,7 @@ import SpinLoding from './components/SpinLoding'
 import store, { RootState } from './store'
 import store, { RootState } from './store'
 import { useSelector } from 'react-redux'
 import { useSelector } from 'react-redux'
 import NotFound from '@/components/NotFound'
 import NotFound from '@/components/NotFound'
-import { envFlag, isLoc } from './utils/http'
+import { envFlag } from './utils/http'
 import AsyncSpinLoding from './components/AsyncSpinLoding'
 import AsyncSpinLoding from './components/AsyncSpinLoding'
 import { Image } from 'antd'
 import { Image } from 'antd'
 import MessageCom from '@/components/Message'
 import MessageCom from '@/components/Message'
@@ -66,7 +66,7 @@ export default function App() {
 
 
   useEffect(() => {
   useEffect(() => {
     // 打包环境 刷新页面从 首页 开始
     // 打包环境 刷新页面从 首页 开始
-    if (!isLoc && myData.isLdong) {
+    if (!envFlag && myData.isLdong) {
       if (window.location.hash !== '#/') {
       if (window.location.hash !== '#/') {
         window.location.href = window.location.href.split('#')[0] + '#/'
         window.location.href = window.location.href.split('#')[0] + '#/'
       }
       }

+ 3 - 0
src/components/Zloding/index.tsx

@@ -56,6 +56,9 @@ function Zloding({ isShow, bacNum, callBackFu }: Props) {
         }
         }
       }
       }
     }
     }
+    return () => {
+      clearTimeout(timeRef.current)
+    }
   }, [callBackFu, showFlag])
   }, [callBackFu, showFlag])
 
 
   useEffect(() => {
   useEffect(() => {

+ 4 - 2
src/pages/A6ybwx/Sangzang/components/Policy/index.module.scss

@@ -122,7 +122,8 @@
           }
           }
 
 
           .part1 {
           .part1 {
-            background: url(../../../../../assets/img/A6_policy_part_bg1.png) no-repeat center center;
+            background-image: url('../../../../../assets/img/A6_policy_part_bg1.png');
+            background-size: #ddd6c2;
             background-size: 100% 100%;
             background-size: 100% 100%;
             padding-bottom: 60px;
             padding-bottom: 60px;
 
 
@@ -179,7 +180,8 @@
             align-items: center;
             align-items: center;
             justify-content: space-between;
             justify-content: space-between;
             gap: 10px;
             gap: 10px;
-            background: url(../../../../../assets/img/A6_policy_part_bg.png) no-repeat center center;
+            background-image: url('../../../../../assets/img/A6_policy_part_bg.png');
+            background-color: #ddd6c1;
             background-size: 100% 100%;
             background-size: 100% 100%;
 
 
             .imgBox {
             .imgBox {

+ 4 - 4
src/pages/A6ybwx/Sangzang/components/Sangzangys/index.module.scss

@@ -1,13 +1,13 @@
 .sang {
 .sang {
   position: absolute;
   position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
+  top: 0%;
+  left: 0%;
   z-index: 5;
   z-index: 5;
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
-  background: url('../../../../../assets/img/A6_sangzang_bg.png') no-repeat center center;
+  background-image: url('../../../../../assets/img/A6_sangzang_bg.png');
   background-size: 100% 100%;
   background-size: 100% 100%;
+  background-color: #c6b49b;
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   justify-content: flex-end;
   justify-content: flex-end;

+ 1 - 3
src/pages/A6ybwx/Sangzang/index.tsx

@@ -35,14 +35,12 @@ function SangzangHome({ setGotoTab }: { setGotoTab: (tab: number) => void }) {
               {/* <div className='lastTxt'></div> */}
               {/* <div className='lastTxt'></div> */}
             </div>
             </div>
 
 
-             <div className='hitem'>
+            <div className='hitem'>
               <div className='htxt'>程哲碑应是包含了佛教造像的墓碑。</div>
               <div className='htxt'>程哲碑应是包含了佛教造像的墓碑。</div>
               <div className='hfrom'>——周桂香、郭志成《试论程哲碑及其历史艺术价值》</div>
               <div className='hfrom'>——周桂香、郭志成《试论程哲碑及其历史艺术价值》</div>
               {/* <div className='lastTxt'></div> */}
               {/* <div className='lastTxt'></div> */}
             </div>
             </div>
           </div>
           </div>
-
-     
         </div>
         </div>
       </div>
       </div>
       <div className='btnContainner'>
       <div className='btnContainner'>

+ 9 - 1
src/pages/A7wjwj/index.tsx

@@ -38,7 +38,15 @@ function A7Wjwj() {
   return (
   return (
     <div className={classNames(styles.A7Wjwj, isPc ? '' : styles.A7WjwjMo)}>
     <div className={classNames(styles.A7Wjwj, isPc ? '' : styles.A7WjwjMo)}>
       {unitySta ? (
       {unitySta ? (
-        <Zloding isShow={unitySta} bacNum={4} callBackFu={() => setUnitySta(false)} />
+        <Zloding
+          isShow={unitySta}
+          bacNum={4}
+          callBackFu={() => {
+            setTimeout(() => {
+              setUnitySta(false)
+            }, 1000)
+          }}
+        />
       ) : null}
       ) : null}
 
 
       {/* 发现之谜 */}
       {/* 发现之谜 */}

+ 0 - 4
src/utils/http.ts

@@ -1,7 +1,3 @@
-export const isLoc = true
-
-export const baseURL = isLoc ? baseUrlLoc : baseUrlAtl
-
 // 是不是pc端
 // 是不是pc端
 export const isPc = isPcTemp
 export const isPc = isPcTemp