upp

Code/public/myData/myData.js

@@ -10,7 +10,8 @@ const baseUrlAtl = 'xxxxxxxxxxxxxxxxx/staticData/'
 
 // 一些动态配置的数据
 const myDataTemp = {
-  // 每次进页面都有加载中动画
+  // 开发调试为 false  正式上线为  true
+  // 开发调试的时候 取消所有加载进度条 所有的视频动画都加上跳过按钮
   isLdong: false,
 
   // 首页(静态资源目录位置：staticData/home)

Code/src/components/BaseImg/index.module.scss

@@ -52,6 +52,11 @@
         display: flex;
         justify-content: center;
         align-items: center;
+        font-family: 'Microsoft Yahei', 'PingFang SC', 'Avenir', 'Segoe UI', 'Hiragino Sans GB',
+          'STHeiti', 'Microsoft Sans Serif', 'WenQuanYi Micro Hei', sans-serif !important;
+      }
+      .BIBtxtFont {
+        font-family: 'qfk' !important;
       }
 
       &:hover {

Code/src/components/BaseImg/index.tsx

@@ -63,7 +63,9 @@ function BaseImg({ isShow, iconSrc, parentFu, bgImg, num = 30, moreSta }: Props)
           </div>
         )}
 
-        <div className='BIBtxt'>{loding >= 100 ? (moreSta ? '加载中' : '点击继续') : '加载中'}</div>
+        <div className={classNames('BIBtxt', loding >= 100 && !moreSta ? 'BIBtxtFont' : '')}>
+          {loding >= 100 ? (moreSta ? '加载中' : '点击继续') : '加载中'}
+        </div>
         {loding >= 100 ? null : (
           <div className='BIBxian'>
             <div>

Code/src/components/CatVideo/index.tsx

@@ -3,6 +3,7 @@ import styles from './index.module.scss'
 import classNames from 'classnames'
 import { domDelOwnFu } from '@/utils/utilsSome'
 import BtnRight from '../BtnRight'
+import { myData } from '@/utils/http'
 
 type Props = {
   isShow: boolean
@@ -45,7 +46,9 @@ function CatVideo({ isShow, src, parentFu, noBtn }: Props) {
       </video>
 
       {/* 右下角的跳过按钮 */}
-      {noBtn ? null : <BtnRight imgName='skip' clickSon={() => playEndFu()} title='跳过' />}
+      {noBtn && myData.isLdong ? null : (
+        <BtnRight imgName='skip' clickSon={() => playEndFu()} title='跳过' />
+      )}
     </div>
   )
 }

Code/src/components/EndVideo/index.tsx

@@ -4,6 +4,7 @@ import classNames from 'classnames'
 import { domDelOwnFu } from '@/utils/utilsSome'
 import history from '@/utils/history'
 import BtnRight from '../BtnRight'
+import { myData } from '@/utils/http'
 
 type Props = {
   lastVideo: boolean //是否显示
@@ -49,7 +50,9 @@ function EndVideo({ lastVideo, delDom, src, path, noBtn }: Props) {
       </video>
 
       {/* 右下角的跳过按钮 */}
-      {noBtn ? null : <BtnRight imgName='skip' clickSon={() => history.push(path)} title='跳过' />}
+      {noBtn && myData.isLdong ? null : (
+        <BtnRight imgName='skip' clickSon={() => history.push(path)} title='跳过' />
+      )}
     </div>
   )
 }

Code/src/pages/A1home/index.tsx

@@ -15,18 +15,20 @@ function A1home() {
     clearInterval(timeRR.current)
     timeRR.current = window.setInterval(() => {
       if (loding >= 100) {
-        setMoveImgShow(false)
+        setTimeout(() => {
+          setMoveImgShow(false)
+        }, 2000)
 
         setTimeout(() => {
           const ruDom = document.querySelector('#myStyle')
           if (ruDom) ruDom.remove()
-        }, 3000)
+        }, 5000)
 
         clearInterval(timeRR.current)
         return
       }
       setLoding(loding + 1)
-    }, 50)
+    }, 30)
   }, [loding])
 
   // 点击开始

Code/src/pages/B1more/S1manor/index.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo, useState } from 'react'
 import styles from './index.module.scss'
-import { baseURL, myData } from '@/utils/http'
+import { baseURL, isPc, myData } from '@/utils/http'
 import HotIcon from '@/components/HotIcon'
 import history from '@/utils/history'
 
@@ -20,8 +20,8 @@ function S1manor({ hidden, isLoding }: Props) {
 
   // 点击热点
   const clickSon = useCallback((index: number) => {
-    history.push(data.hot[index].path)
-    // setAcInd(index)
+    if (isPc) history.push(data.hot[index].path)
+    else setAcInd(index)
   }, [])
 
   return (

Code/src/pages/B1more/index.tsx

@@ -7,6 +7,7 @@ import BaseImg from '@/components/BaseImg'
 import S1manor from './S1manor'
 import S2mien from './S2mien'
 import S3goods from './S3goods'
+import BtnRight from '@/components/BtnRight'
 
 const videoObj = {
   探索庄园: {
@@ -67,19 +68,15 @@ function B1more() {
   return (
     <div className={styles.B1more}>
       {/* 三个主要页面 */}
-      {/* <S1manor hidden={!!videoSrc || floorTxt !== '探索庄园'} isLoding={isLoding} />
+      <S1manor hidden={!!videoSrc || floorTxt !== '探索庄园'} isLoding={isLoding} />
       <S2mien hidden={!!videoSrc || floorTxt !== '汉代风华'} />
-      <S3goods hidden={!!videoSrc || floorTxt !== '文物欣赏'} /> */}
-
-      {/* 待完善 */}
-      {/* <S1manor hidden={false} isLoding={isLoding} /> */}
-      <S2mien hidden={false} />
+      <S3goods hidden={!!videoSrc || floorTxt !== '文物欣赏'} />
 
       {/* 初始静态图 */}
       <BaseImg isShow={!isLoding} iconSrc={``} parentFu={() => setIsLoding(false)} moreSta={true} />
 
       {/* 6个视频  待完善 调试的时候不显示 */}
-      {/* {myData.more.videos.map((src, index) => (
+      {myData.more.videos.map((src, index) => (
         <div
           className={classNames('A6videoBox', videoSrc === src ? 'A6videoBoxShow' : '')}
           key={index}
@@ -95,8 +92,13 @@ function B1more() {
             <source type='video/mp4' src={baseURL + src} />
             Your browser does not support the video tag.
           </video>
+
+          {/* 右下角的跳过按钮 */}
+          {myData.isLdong ? null : (
+            <BtnRight imgName='skip' clickSon={() => setVideoSrc('')} title='跳过' />
+          )}
         </div>
-      ))} */}
+      ))}
 
       {/* 底部三个按钮 */}
       <div className='A6floorBox' style={{ opacity: isLoding ? 0 : 1 }}>