Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/HeNan_HanJia

Code/public/myData/myData.js

@@ -1457,14 +1457,8 @@ const banquetHotArr = [
 ]
 
 if (window.location.href.includes('?u=unity')) {
-  console.log(
-    '车骑拜谒热点信息:',
-    visitHotArr.map((v, i) => ({ 索引: i, name: v.name, 为文物: v.isModel }))
-  )
-  console.log(
-    '主客宴请热点信息:',
-    banquetHotArr.map((v, i) => ({ 索引: i, name: v.name, 为文物: v.isModel }))
-  )
+  console.log('车骑拜谒热点信息:', visitHotArr)
+  console.log('主客宴请热点信息:', banquetHotArr)
 }
 
 // 乐舞百戏热点信息（后面的更多模块也会复用）

Code/src/pages/A3banPano/index.tsx

@@ -20,7 +20,7 @@ function A3banPano() {
   // 路由：/banPano/id
   const urlObj: any = useParams()
   // 0为 第一种模式的热点 其他为第二种
-  const [ind, setInd] = useState(-1)
+  const [acName, setAcName] = useState('')
   const [activeIdx, setActiveIdx] = useState(-1)
   const [curScene, setCurScene] = useState('')
 
@@ -32,10 +32,11 @@ function A3banPano() {
     // myData.banquet.hot.filter(v=>v.louType===id)
   }, [urlObj.id])
 
-  const data = useMemo(() => {
-    if (ind !== -1) return myData.banquet.hot[ind].data
-    else return []
-  }, [ind])
+  const info = useMemo(() => {
+    let infoRes: any = {}
+    if (acName) infoRes = myData.banquet.hot.find(v => v.name === acName)
+    return infoRes
+  }, [acName])
 
   return (
     <div className={styles.A3banPano}>
@@ -80,7 +81,7 @@ function A3banPano() {
                   bg={false}
                   onOver={() => setActiveIdx(index)}
                   onOut={() => setActiveIdx(-1)}
-                  onClick={() => setInd(index)}
+                  onClick={() => setAcName(item.name)}
                   // @ts-ignore
                   // onDown='draggable_hotspot()'
                 >
@@ -182,9 +183,9 @@ function A3banPano() {
         {/* 右下角按钮 */}
         <FloorBtn />
 
-        {ind === -1 ? null : (
-          <Hot2 data={data} closeFu={() => setInd(-1)} name={myData.banquet.hot[ind].name} />
-        )}
+        {acName && info && info.data ? (
+          <Hot2 data={info.data} closeFu={() => setAcName('')} name={info.name} />
+        ) : null}
       </KrpanoMiddleware>
     </div>
   )

Code/src/pages/A3banquet/PanoImg/index.tsx

@@ -14,14 +14,15 @@ import FloorHotspotIcon from '@/assets/img/icon-flo-min.png'
 
 function PanoImg() {
   // 0为 第一种模式的热点 其他为第二种
-  const [ind, setInd] = useState(-1)
+  const [acName, setAcName] = useState('')
   const [activeIdx, setActiveIdx] = useState(-1)
   const middlewareIns = useRef<KrpanoMiddlewareMethods>(null)
 
-  const data = useMemo(() => {
-    if (ind !== -1) return myData.banquet.hot[ind].data
-    else return []
-  }, [ind])
+  const info = useMemo(() => {
+    let infoRes: any = {}
+    if (acName) infoRes = myData.banquet.hot.find(v => v.name === acName)
+    return infoRes
+  }, [acName])
 
   return (
     <>
@@ -87,7 +88,7 @@ function PanoImg() {
                   bg={false}
                   onOver={() => setActiveIdx(index)}
                   onOut={() => setActiveIdx(-1)}
-                  onClick={() => setInd(index)}
+                  onClick={() => setAcName(item.name)}
                   // @ts-ignore
                   // onDown='draggable_hotspot()'
                 >
@@ -124,9 +125,9 @@ function PanoImg() {
         </Krpano>
       </KrpanoMiddleware>
 
-      {ind === -1 ? null : (
-        <Hot2 data={data} closeFu={() => setInd(-1)} name={myData.banquet.hot[ind].name} />
-      )}
+      {acName && info && info.data ? (
+        <Hot2 data={info.data} closeFu={() => setAcName('')} name={info.name} />
+      ) : null}
     </>
   )
 }