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

src/assets/styles/base.css

@@ -264,10 +264,10 @@ textarea {
   body #A7Back {
     transform: rotate(90deg);
     left: auto;
-    top: 5%;
-    right: 2%;
-    width: 60px;
-    height: 30px;
+    top: 6%;
+    right: -1%;
+    width: 80px;
+    height: 40px;
     position: absolute;
     z-index: 3;
     cursor: pointer;

src/assets/styles/base.less

@@ -343,10 +343,10 @@ textarea {
   body #A7Back {
     transform: rotate(90deg);
     left: auto;
-    top: 5%;
-    right: 2%;
-    width: 60px;
-    height: 30px;
+    top: 6%;
+    right: -1%;
+    width: 80px;
+    height: 40px;
     position: absolute;
     z-index: 3;
     cursor: pointer;

src/pages/A6ybwx/index.tsx

@@ -39,8 +39,8 @@ function A6ybwx() {
       objectFit: 'cover', // 视频的object-fit样式, 默认 cover
       loop: false, // 是否循环, 默认false
       autoplay: false, // 自动播放, 默认false
-      onPlay: () => { }, // 触发播放事件
-      onPause: () => { }, // 触发暂停事件
+      onPlay: () => {}, // 触发播放事件
+      onPause: () => {}, // 触发暂停事件
       onEnded: () => {
         setIsEnter(true)
         playerRef.current.destroy()
@@ -48,6 +48,7 @@ function A6ybwx() {
       onSourceEstablished: () => {
         if (isEnter) setVideoOk(false)
         setVideoOk(true)
+       
       } //有足够的数据可以播放了
     }
     playerRef.current = F_Video('./myData/ybwx.ts', params)
@@ -68,10 +69,13 @@ function A6ybwx() {
     }
   }, [isEnter, videoOk])
 
+
   useEffect(() => {
-    const A6ybwxIframe = document.getElementById('A6ybwxIframe') as HTMLIFrameElement
-    A6ybwxIframe.src = 'Beizhongshijie/index.html'
-  }, [])
+    if (isEnter) {
+      const A6ybwxIframe = document.getElementById('A6ybwxIframe') as HTMLIFrameElement
+      A6ybwxIframe.src = 'Beizhongshijie/index.html'
+    }
+  }, [isEnter])
 
   return (
     <div className={classNames(styles.A6ybwx, isPc ? '' : styles.A6ybwxMo)}>
@@ -94,11 +98,7 @@ function A6ybwx() {
             <img src={require('@/assets/sgImg/icon_skip.png')} alt='' />
           </div>
         </div>
-        <iframe
-          id='A6ybwxIframe'
-          style={{ zIndex: isEnter ? 2 : -1 }}
-          title='A6ybwx'
-        />
+        <iframe id='A6ybwxIframe' style={{ zIndex: isEnter ? 2 : -1 }} title='A6ybwx' />
 
         <div className='BtnTabBar' style={{ display: isEnter ? 'flex' : 'none' }}>
           <div className='tab1' onClick={() => setGotoTab(1)} />

src/pages/A7wjwj/conponents/Content/index.module.scss

@@ -2,6 +2,7 @@
   position: relative;
   width: 100%;
   height: 100%;
+  background-color: #699dd9;
   :global {
     #panoramic {
       width: 100%;
@@ -84,15 +85,18 @@
           height: 30px;
 
           .text {
-            width: 30px;
-            font-size: 13px;
+            width: 36px;
+            font-size: 16px;
+            letter-spacing: 2px;
             line-height: 28px;
-            font-weight: 600;
+            font-weight: 700;
             color: rgba(255, 233, 182, 1);
           }
         }
         .content {
-          font-size: 13px;
+          font-weight: 400;
+          letter-spacing: 2px;
+          font-size: 16px;
           line-height: 28px;
         }
       }

src/pages/A7wjwj/conponents/Content/index.tsx

@@ -47,7 +47,7 @@ function Content() {
 
       {isShowPano ? (
         <iframe
-          style={{ display: isShowPano ? 'block' : 'none' }}
+          style={{ display: isShowPano&&!isShowScene ? 'block' : 'none' }}
           title='panoramic'
           id='panoramic'
           src='Pano/index.html'