🐛建筑页面切换村落等问题

code/src/AppM.tsx

@@ -70,6 +70,12 @@ export default function AppM() {
 
   // tab的切换
   const cutTab = useCallback((id: number, pathUrl: string) => {
+
+    // 已经在建筑页面 并且在此点击 建筑
+    if(id===3&&routerAc.includes('architec?id')) return
+    console.log('-------',routerAc);
+    
+
     if (id !== 2) {
       history.push(pathUrl);
       setTab2Show(false);
@@ -79,10 +85,15 @@ export default function AppM() {
       // 往仓库中添加一个信息，处理 单独打开构件页面  无法回跳的问题
       store.dispatch({ type: "layout/isRouterPushBuild", payload: true });
     }
-  }, []);
+  }, [routerAc]);
 
   const [tab2Show, setTab2Show] = useState(false);
 
+  useEffect(() => {
+    // 建筑 进入 村落卡片 点X关闭的 样式冲突问题
+    store.dispatch({ type: "layout/isCardShow", payload: tab2Show });
+  }, [tab2Show]);
+
   return (
     <div id="AppM">
       {/* 关于路由 */}

code/src/pages/B1CardM/index.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useState } from "react";
 import styles from "./index.module.scss";
 import { baseUrl } from "@/index";
 import { useSelector } from "react-redux";
-import store, { RootState } from "@/store";
+import { RootState } from "@/store";
 import classNames from "classnames";
 import btnImg from "@/assets/img/tab2/btn_m.png";
 import { SwapRightOutlined } from "@ant-design/icons";
@@ -21,9 +21,6 @@ function B1CardM({ closeFu, clickCardFu }: Props) {
   const [ind, setInd] = useState(0);
 
   useEffect(() => {
-    // 建筑 进入 村落卡片 点X关闭的 样式冲突问题
-    store.dispatch({ type: "layout/isCardShow", payload: true });
-
     let num = 0;
 
     const temp = window.location.hash;
@@ -60,13 +57,7 @@ function B1CardM({ closeFu, clickCardFu }: Props) {
   return (
     <div className={styles.B1CardM}>
       {/* 右上角的按钮 */}
-      <div
-        className="B1Cback"
-        onClick={() => {
-          store.dispatch({ type: "layout/isCardShow", payload: false });
-          closeFu();
-        }}
-      >
+      <div className="B1Cback" onClick={closeFu}>
         <img src={`${baseUrl}/A1Home/mobile/icon_cancel.png`} alt="" />
       </div>