upp

Code/public/myData/myData.js

@@ -1456,10 +1456,10 @@ const banquetHotArr = [
   }
 ]
 
-if (window.location.href.includes('?u=unity')) {
-  console.log('车骑拜谒热点信息:', visitHotArr)
-  console.log('主客宴请热点信息:', banquetHotArr)
-}
+// if (window.location.href.includes('?u=unity')) {
+//   console.log('车骑拜谒热点信息:', visitHotArr)
+//   console.log('主客宴请热点信息:', banquetHotArr)
+// }
 
 // 乐舞百戏热点信息（后面的更多模块也会复用）
 const danceHotArr = [
@@ -1725,37 +1725,37 @@ const plowHotArr = [
       }
     ]
   },
-  // 施肥
-  {
-    // 是否在更多模块中显示-true表示不显示
-    noShow: true,
-    // 用于分类
-    type: '施肥',
-    // 热点名字
-    name: '施肥车',
+  // 施肥---已经隐藏
+  // {
+  //   // 是否在更多模块中显示-true表示不显示
+  //   noShow: true,
+  //   // 用于分类
+  //   type: '施肥',
+  //   // 热点名字
+  //   name: '施肥车',
 
-    // 热点图片路径+名字
-    hoverSrc: 'plow/hot/hot5.png',
-    // 热点定位百分比(当前页面)
-    locPage: {
-      top: '40%',
-      left: '57%'
-    },
-    // 热点定位百分比(更多页面)
-    loc: {
-      top: '-1%',
-      left: '-1%'
-    },
-    data: [
-      {
-        name: '施肥车',
-        txt: `
-      <p>通过施肥来提高地力也是我国农业的优良传统。汉代，泥胜之把“务粪泽”，王充把“厚加粪壤”作为“助地力”的重要措施。汉代已创造施用基肥、种肥和追肥等技术。</p>
-      `,
-        imgArr: ['plow/hot/56.png']
-      }
-    ]
-  },
+  //   // 热点图片路径+名字
+  //   hoverSrc: 'plow/hot/hot5.png',
+  //   // 热点定位百分比(当前页面)
+  //   locPage: {
+  //     top: '40%',
+  //     left: '57%'
+  //   },
+  //   // 热点定位百分比(更多页面)
+  //   loc: {
+  //     top: '-1%',
+  //     left: '-1%'
+  //   },
+  //   data: [
+  //     {
+  //       name: '施肥车',
+  //       txt: `
+  //     <p>通过施肥来提高地力也是我国农业的优良传统。汉代，泥胜之把“务粪泽”，王充把“厚加粪壤”作为“助地力”的重要措施。汉代已创造施用基肥、种肥和追肥等技术。</p>
+  //     `,
+  //       imgArr: ['plow/hot/56.png']
+  //     }
+  //   ]
+  // },
   // 收获
   {
     // 是否在更多模块中显示-true表示不显示
@@ -2289,17 +2289,17 @@ const myDataTemp = {
 
         hot: plowHotArr.filter(v => v.type === '中耕' || v.type === '施肥' || v.isChang)
       },
-      {
-        name: '施肥',
-        // 视频路径+名字
-        videoSrc: 'plow/4.mp4',
-        // 文本信息
-        txt: `
-        <p>通过施肥来提高地力也是我国农业的优良传统。汉代，泥胜之把“务粪泽”，王充把“厚加粪壤”作为“助地力”的重要措施。汉代已创造施用基肥、种肥和追肥等技术。</p>
-        `,
+      // {
+      //   name: '施肥',
+      //   // 视频路径+名字
+      //   videoSrc: 'plow/4.mp4',
+      //   // 文本信息
+      //   txt: `
+      //   <p>通过施肥来提高地力也是我国农业的优良传统。汉代，泥胜之把“务粪泽”，王充把“厚加粪壤”作为“助地力”的重要措施。汉代已创造施用基肥、种肥和追肥等技术。</p>
+      //   `,
 
-        hot: plowHotArr.filter(v => v.type === '施肥' || v.isChang)
-      },
+      //   hot: plowHotArr.filter(v => v.type === '施肥' || v.isChang)
+      // },
       {
         name: '收获',
         // 视频路径+名字

Code/src/components/Zhot/type.d.ts

@@ -3,6 +3,7 @@ export type HotRowType = {
   tubiao: '普通' | '文物'
   zIndex: number
   hoverSrc: string
+  pageType: string // 田耕特有的
   // 当前页面的定位（如果是全景图和全景视频 ---没有）
   locPage: {
     top: string
@@ -48,6 +49,8 @@ export type HotInfoType = {
   yanYing3: HotRowType[]
   yueWu: HotRowType[]
   houCu: HotRowType[]
+  plowZhuang: HotRowType[]
+  plowCai: HotRowType[]
   周礼九拜: {
     name: string
     tubiao: '普通' | '文物'

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

@@ -196,23 +196,28 @@
       opacity: 1;
       pointer-events: auto;
     }
-    // 左下角按钮
-    .A6leftBtn {
-      cursor: pointer;
-      position: absolute;
-      z-index: 10;
-      bottom: 12px;
-      left: 28px;
-      width: 100px;
-      height: 36px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      color: #fffddc;
-      background-size: 100% 100%;
-      transition: transform 0.3s;
-      &:hover {
-        transform: scale(1.1);
+    .A6videoBox {
+      // 左下角按钮
+      .A6leftBtn {
+        cursor: pointer;
+        position: absolute;
+        z-index: 20;
+        bottom: 12px;
+        left: 28px;
+        width: 100px;
+        height: 36px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: #fffddc;
+        background-size: 100% 100%;
+        transition: transform 0.3s;
+        &:hover {
+          transform: scale(1.1);
+        }
+      }
+      #HotIcon {
+        z-index: 999;
       }
     }
   }

Code/src/pages/A6plow/index.tsx

@@ -1,16 +1,15 @@
 import React, { useCallback, useMemo, useState } from 'react'
 import styles from './index.module.scss'
 import BaseImg from '@/components/BaseImg'
-import { baseURL, isPc, myData } from '@/utils/http'
+import { baseURL, hotInfo, isPc, myData } from '@/utils/http'
 import EndVideo from '@/components/EndVideo'
 import NextPage from '@/components/NextPage'
 import classNames from 'classnames'
 import FloorBtn from '@/components/FloorBtn'
 import HotIcon from '@/components/HotIcon'
-import Hot2 from '../A2visit/PanoVideo/Hot2'
-import { PlowHotType } from '@/types'
 import useLoding from '@/components/ownUse/useLoding'
 import BtnRight from '@/components/BtnRight'
+import Zhot from '@/components/Zhot'
 
 function A6plow() {
   // 初始显示和隐藏
@@ -72,17 +71,17 @@ function A6plow() {
   // 打开热点
   const [acName, setAcName] = useState('')
 
-  const hotInfo = useMemo(() => {
-    let info = {} as PlowHotType
-
-    const temp = [...myData.plow.isSSSArr, ...myData.plow.info[leftAc].hot]
-
-    if (temp && temp.find(v => v.name === acName)) {
-      info = temp.find(v => v.name === acName)
+  // 根据 庄稼 tab不同来变化
+  const tabHotAcName = useMemo(() => {
+    let obj = {
+      0: '汉代耕地工具',
+      1: '播种农具',
+      2: '中耕农具',
+      3: '收割工具'
     }
 
-    return info
-  }, [acName, leftAc])
+    return Reflect.get(obj, leftAc) as string
+  }, [leftAc])
 
   return (
     <div className={styles.A6plow}>
@@ -105,17 +104,17 @@ function A6plow() {
         style={{ backgroundImage: `url(${baseURL}plow/bg.jpg)` }}
       >
         {/* 热点 */}
-        {myData.plow.isSSSArr.map((v: PlowHotType, i) => (
+        {hotInfo.plowCai.map((item, index) => (
           <HotIcon
-            isModel={v.isModel ? true : false}
+            isModel={item.tubiao === '文物' ? true : false}
             style={{
-              top: v.locPage.top,
-              left: v.locPage.left
+              top: item.locPage.top,
+              left: item.locPage.left
             }}
-            key={i}
-            index={i}
-            clickSon={() => setAcName(v.name)}
-            hoverSrc={v.hoverSrc}
+            key={index}
+            index={index}
+            clickSon={() => setAcName(item.name)}
+            hoverSrc={item.hoverSrc}
             isXiao={0.67}
           />
         ))}
@@ -128,7 +127,6 @@ function A6plow() {
             <div
               onClick={() => {
                 setStaCut(v)
-                // 每次切换都是播放第4个视频
                 leftAcFu(0)
               }}
               className={classNames(v === staCut ? 'A6FrowAc' : '')}
@@ -151,7 +149,6 @@ function A6plow() {
           >
             {myData.plow.info.map((item, index) => (
               <div
-                hidden={item.name === '施肥'}
                 key={index}
                 className='A6LbtnRow'
                 onClick={() => leftAcFu(index)}
@@ -190,31 +187,34 @@ function A6plow() {
                 </video>
 
                 {/* 热点 */}
-                {item.hot.map((v: PlowHotType, i) =>
-                  v.name === '汉代农具' ? (
-                    <div
-                      onClick={() => setAcName('汉代农具')}
-                      key={i}
-                      className='A6leftBtn'
-                      style={{ backgroundImage: `url(${baseURL}chef/chuBtn.png)` }}
-                    >
-                      汉代农具
-                    </div>
-                  ) : (
-                    <HotIcon
-                      isModel={v.isModel ? true : false}
-                      style={{
-                        top: v.locPage.top,
-                        left: v.locPage.left
-                      }}
-                      key={i}
-                      index={i}
-                      clickSon={() => setAcName(v.name)}
-                      hoverSrc={v.hoverSrc}
-                      isXiao={0.67}
-                    />
-                  )
-                )}
+                {hotInfo.plowZhuang
+                  .filter(v => v.pageType === item.name || v.name === tabHotAcName)
+                  .map((v, i) =>
+                    v.name === tabHotAcName ? (
+                      <div
+                        hidden={staCut === '蔬菜'}
+                        onClick={() => setAcName(tabHotAcName)}
+                        key={i}
+                        className='A6leftBtn'
+                        style={{ backgroundImage: `url(${baseURL}chef/chuBtn.png)` }}
+                      >
+                        {tabHotAcName}
+                      </div>
+                    ) : (
+                      <HotIcon
+                        isModel={v.tubiao === '文物' ? true : false}
+                        style={{
+                          top: v.locPage.top,
+                          left: v.locPage.left
+                        }}
+                        key={i}
+                        index={i}
+                        clickSon={() => setAcName(v.name)}
+                        hoverSrc={v.hoverSrc}
+                        isXiao={0.67}
+                      />
+                    )
+                  )}
               </div>
             ))}
           </div>
@@ -226,10 +226,6 @@ function A6plow() {
         </div>
       ) : null}
 
-      {acName && hotInfo.name ? (
-        <Hot2 data={hotInfo.data} closeFu={() => setAcName('')} name={hotInfo.name} />
-      ) : null}
-
       {/* 二维码弹窗 */}
       {imgNow ? (
         <div className={classNames('A6codeBox', code ? 'A6codeBoxShow' : '')}>
@@ -252,6 +248,8 @@ function A6plow() {
           noBtn={true}
         />
       ) : null}
+
+      {acName ? <Zhot name={acName} closeFu={() => setAcName('')} /> : null}
     </div>
   )
 }

Code/src/pages/C1unity/index.tsx

@@ -1,9 +1,7 @@
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import styles from './index.module.scss'
 import { useParams } from 'react-router-dom'
-import { isPc, myData, otherUrl } from '@/utils/http'
-import { VisitHotDataType } from '@/types'
-import Hot2 from '../A2visit/PanoVideo/Hot2'
+import { isPc, otherUrl } from '@/utils/http'
 import history from '@/utils/history'
 import ZHot0 from '@/components/ZHot0'
 import Zhot from '@/components/Zhot'
@@ -22,13 +20,13 @@ const obj = {
 function C1unity() {
   const urlObj: any = useParams()
 
-  const [urlId, setUrlId] = useState('')
+  // const [urlId, setUrlId] = useState('')
 
   // 1:室外 2：室内
   const [url, setUrl] = useState('')
 
   useEffect(() => {
-    setUrlId(urlObj.id)
+    // setUrlId(urlObj.id)
 
     const temp = Reflect.get(obj, urlObj.id)