Merge branch 'master' of http://192.168.0.115:3000/lanxin/Chengzhebei

src/App.tsx

@@ -7,7 +7,7 @@ import SpinLoding from './components/SpinLoding'
 import store, { RootState } from './store'
 import { useSelector } from 'react-redux'
 import NotFound from '@/components/NotFound'
-import { baseURL, envFlag, isLoc } from './utils/http'
+import { envFlag, isLoc } from './utils/http'
 import AsyncSpinLoding from './components/AsyncSpinLoding'
 import { Image } from 'antd'
 import MessageCom from '@/components/Message'
@@ -55,7 +55,7 @@ const planSize = {
 }
 
 export default function App() {
-  const {myData} = useSelector((state: RootState) => state.A0Layout)
+  const { myData } = useSelector((state: RootState) => state.A0Layout)
 
   // 判断是中文还是英文
   useEffect(() => {
@@ -112,13 +112,11 @@ export default function App() {
     } else {
       if (tempMax - height > 100) return
 
-      
-
       // 竖屏
       isHHTemp = false
       const temp = width
-  
-     // 用来大场景调整样式
+
+      // 用来大场景调整样式
       const styleStr = `
     #pageIframe #wjwjScene,
     #pageIframe #panoramic,
@@ -617,9 +615,6 @@ export default function App() {
 
       <iframe style={{ display: 'none' }} id='modalIframe' title='modal' src=''></iframe>
 
-      {/* 背景音乐 */}
-      <audio id='bgMp3' loop style={{ display: 'none' }} src={baseURL + 'home/bg.mp3'}></audio>
-
       {/* 发送请求的加载组件 */}
       <AsyncSpinLoding />
 

src/components/Skip/index.module.scss

@@ -14,6 +14,7 @@
   opacity: 0;
   pointer-events: none;
   transition: all 0.3s;
+  z-index: 99;
 
   :global {
     .skipTxt {

src/pages/A0base/index.module.scss

@@ -214,9 +214,32 @@
       .content {
         .title {
           width: auto;
-          max-width: auto;
+          max-width: 90%;
         }
+        .text{
+          height: 300px;
+          max-height: 9999px;
+          overflow: auto;
+        }
+      }
+
+      .baseContent {
+        .base {
+          font-size: 14px;
+          word-wrap: break-word;
+          line-height: 16px;
+          display: flex;
+          padding: 0 10px 0 35px;
+          align-items: center;
+          justify-content: center;
+          text-align: left;
+        }
+        // .baseAc{
+        //   padding-bottom: 8px;
+        // }
       }
     }
+
+
   }
 }

src/pages/A0base/index.tsx

@@ -20,7 +20,6 @@ function A0base() {
   return (
     <div
       className={classNames(myLangue === 'ZH' ? '' : styles.A0baseEn, styles.A0base)}
-      id='opacityCss'
     >
       <div className='A0baseContainner'>
         <div className={`content`}>

src/pages/A1home2/index.tsx

@@ -176,7 +176,7 @@ function A1home() {
       {/* ------------微信浏览器不让视频自动播放，用ts的方式*/}
       {baseFlag ? (
         <div className='A1videoBox'>
-          <div className='A1video' style={{ opacity: 1 }}></div>
+          <div className='A1video' style={{ opacity: 1 ,zIndex: loadOk?10:0}}></div>
 
           {loadOk ? (
             <Skip