upp

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

@@ -4,6 +4,7 @@
       font-size: 30px;
       width: 100%;
       height: 100%;
+      min-height: 150px;
       display: flex;
       justify-content: center;
       align-items: center;

Code/src/pages/A2visit/PanoVideo/Hot2/index.module.scss

@@ -78,6 +78,7 @@
           p {
             font-family: 'Microsoft Yahei', 'PingFang SC', 'Avenir', 'Segoe UI', 'Hiragino Sans GB',
               'STHeiti', 'Microsoft Sans Serif', 'WenQuanYi Micro Hei', sans-serif !important;
+            margin-bottom: 10px;
           }
           h3 {
             color: #eacf60;

Code/src/pages/A2visit/PanoVideo/Hot2/index.tsx

@@ -39,7 +39,7 @@ function Hot2({ closeFu, data, name }: Props) {
         <div className={classNames('h2TuWen', data.length <= 1 ? 'h2TuWenDuo' : '')}>
           {/* 图片 */}
           {acData.type && acData.type === 'model' ? (
-            <div className='H2model'>
+            <div className='H2model' style={{ height: acData.txt ? '200px' : '280px' }}>
               <iframe
                 title={name}
                 src={`${baseURL}modelLoding/model.html?u=${acData.imgArr[0]}`}

Code/src/pages/A2visit/index.module.scss

@@ -10,9 +10,11 @@
       width: 100%;
       height: 100%;
       position: relative;
-      opacity: 0;
-      pointer-events: none;
+      // opacity: 0;
+      // pointer-events: none;
       transition: opacity 1s;
+      opacity: 1;
+      pointer-events: auto;
     }
     .pvBoxShow {
       opacity: 1;

Code/src/pages/A2visit/index.tsx

@@ -4,7 +4,6 @@ import classNames from 'classnames'
 import { baseURL, myData } from '@/utils/http'
 import PanoVideo from './PanoVideo'
 import EndVideo from '@/components/EndVideo'
-import CatVideo from '@/components/CatVideo'
 import NextPage from '@/components/NextPage'
 import FloorBtn from '@/components/FloorBtn'
 import BaseImg from '@/components/BaseImg'
@@ -19,10 +18,10 @@ function A2visit() {
     setCutVideoShow(true)
   }, [])
 
-  // 过度动画播放完毕或者点击跳过
-  const cutEndFu = useCallback(() => {
-    setCutVideoShow(false)
-  }, [])
+  // // 过度动画播放完毕或者点击跳过
+  // const cutEndFu = useCallback(() => {
+  //   setCutVideoShow(false)
+  // }, [])
 
   // 点击 跳下一个章节
   const [lastVideo, setLastVideo] = useState(false)
@@ -43,18 +42,19 @@ function A2visit() {
       />
 
       {/* 过度动画页面 */}
-      {imgNow ? (
+      {/* {imgNow ? (
         <CatVideo
           isShow={cutVideoShow}
           src={baseURL + myData.visit.videos[0]}
           parentFu={() => cutEndFu()}
           noBtn={true}
         />
-      ) : null}
+      ) : null} */}
 
       {/* 全景视频 */}
       {imgNow ? (
-        <div className={classNames('pvBox', cutVideoShow ? '' : 'pvBoxShow')}>
+        // <div className={classNames('pvBox', cutVideoShow ? '' : 'pvBoxShow')}>
+        <div className={classNames('pvBox')}>
           <PanoVideo />
           {/* 跳到下一章 */}
           <NextPage clickSon={() => setLastVideo(true)} txt='行拜谒礼' />

Code/src/pages/B1more/S1manor/index.module.scss

@@ -2,6 +2,7 @@
   width: 100%;
   height: 100%;
   position: relative;
+  background-size: 100% 100%;
   :global {
     .S1left {
       width: 50%;

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

@@ -6,12 +6,11 @@ import history from '@/utils/history'
 
 type Props = {
   hidden: boolean
-  isLoding: boolean
 }
 
 const data = myData.more['探索庄园']
 
-function S1manor({ hidden, isLoding }: Props) {
+function S1manor({ hidden }: Props) {
   const [adInd, setAcInd] = useState(0)
 
   const hotInfo = useMemo(() => {
@@ -25,13 +24,13 @@ function S1manor({ hidden, isLoding }: Props) {
   }, [])
 
   return (
-    <div hidden={hidden} className={styles.S1manor}>
+    <div
+      hidden={hidden}
+      className={styles.S1manor}
+      style={{ backgroundImage: `url(${baseURL + data.bg})` }}
+    >
       {/* 左侧图标 */}
-      <div
-        className='S1left'
-        hidden={isLoding}
-        style={{ backgroundImage: `url(${baseURL}more/s1Zhe.png)` }}
-      >
+      <div className='S1left' style={{ backgroundImage: `url(${baseURL}more/s1Zhe.png)` }}>
         <img className='SlL1' src={baseURL + hotInfo.leftImg} alt='' />
 
         <div className='SlL2' onClick={() => history.push(hotInfo.path)}>
@@ -40,7 +39,7 @@ function S1manor({ hidden, isLoding }: Props) {
         </div>
       </div>
 
-      <div className='S1hotBox' hidden={isLoding}>
+      <div className='S1hotBox'>
         {data.hot.map((item, index) => (
           // 热点图标
           <HotIcon

Code/src/pages/B1more/index.module.scss

@@ -12,7 +12,7 @@
       transition: opacity 1s;
 
       & > div {
-        width: 110px;
+        width: 100px;
         height: 36px;
         background-size: 100% 100%;
         transition: all 0.3s;
@@ -21,7 +21,7 @@
         justify-content: center;
         align-items: center;
         color: #fffddc;
-        margin-right: 25px;
+        margin-right: 10px;
         cursor: pointer;
         &:last-child {
           margin-right: 0;
@@ -79,7 +79,7 @@
       z-index: 20;
       opacity: 0;
       pointer-events: none;
-      transition: all 1s;
+      // transition: all 1s;
       video {
         width: 100%;
         height: 100%;

Code/src/pages/B1more/index.tsx

@@ -9,6 +9,7 @@ import S2mien from './S2mien'
 import S3goods from './S3goods'
 import BtnRight from '@/components/BtnRight'
 import useLoding from '@/components/ownUse/useLoding'
+import { domDelOwnFu } from '@/utils/utilsSome'
 
 const videoObj = {
   探索庄园: {
@@ -73,11 +74,17 @@ function B1more() {
     <div className={styles.B1more}>
       {/* 三个主要页面 */}
 
-      <img onLoad={imgNumFu} id='bgImgBox' src={baseURL + myData.more['探索庄园'].bg} alt='' />
+      <img
+        style={{ opacity: 0 }}
+        onLoad={imgNumFu}
+        id='bgImgBox'
+        src={baseURL + myData.more['探索庄园'].bg}
+        alt=''
+      />
 
       {imgNow ? (
         <>
-          <S1manor hidden={!!videoSrc || floorTxt !== '探索庄园'} isLoding={isLoding} />
+          <S1manor hidden={!!videoSrc || floorTxt !== '探索庄园'} />
           <S2mien hidden={!!videoSrc || floorTxt !== '汉代风华'} />
           <S3goods hidden={!!videoSrc || floorTxt !== '文物欣赏'} />
         </>
@@ -125,7 +132,10 @@ function B1more() {
         <div className='A6floorBox' style={{ opacity: isLoding ? 0 : 1 }}>
           {floorArr.map(v => (
             <div
-              onClick={() => setFloorTxt(v)}
+              onClick={() => {
+                domDelOwnFu('#bgImgBox')
+                setFloorTxt(v)
+              }}
               className={classNames(v === floorTxt ? 'A6FrowAc' : '')}
               key={v}
             >