upp

pc/src/pages/A0Map/MapSon/index.module.scss

@@ -35,6 +35,7 @@
           position: relative;
           left: 50%;
           transform: translateX(-50%);
+          object-fit: contain;
 
         }
 
@@ -47,9 +48,10 @@
           height: 40px;
           line-height: 40px;
           border-radius: 20px;
-          background-color: rgba(200, 185, 146, 0.3);
+          background-color: rgba(200, 185, 146, 0.8);
           backdrop-filter: blur(4px);
-          color: var(--themeColor);
+          // color: var(--themeColor);
+          color: #47392C;
           font-size: 18px;
           transition: all .2s;
 

pc/src/pages/A0Map/data.ts

@@ -13,6 +13,7 @@ export type TabType = {
 
 type MapType = {
   id: number;
+  imgId:number
   name: string;
   x: string;
   y: string;
@@ -23,6 +24,7 @@ type MapType = {
 export const mapData1: MapType[] = [
   {
     id: 1,
+    imgId:1,
     name: "虎门故事",
     x: "33%",
     y: "7%",
@@ -31,8 +33,8 @@ export const mapData1: MapType[] = [
       {
         id: 1.1,
         name: "虎门故事",
-        x: "20%",
-        y: "10%",
+        x: "21%",
+        y: "25%",
         b: "auto",
         r: "auto",
         type: "底部",
@@ -40,18 +42,19 @@ export const mapData1: MapType[] = [
       },
       {
         id: 1.2,
-        name: "消烟池",
-        x: "auto",
-        y: "auto",
-        b: "40%",
-        r: "40%",
-        type: "顶部",
+        name: "鸦片战争博物馆",
+        x: "9%",
+        y: "30%",
+        b: "auto",
+        r: "auto",
+        type: "底部",
         link: "/scene/?m=1194",
       },
     ],
   },
   {
     id: 2,
+    imgId:1,
     name: "鸦片战争博物馆",
     x: "31%",
     y: "6%",
@@ -59,18 +62,29 @@ export const mapData1: MapType[] = [
     son: [
       {
         id: 2.1,
-        name: "22222-1111",
-        x: "20%",
-        y: "10%",
+        name: "虎门故事",
+        x: "21%",
+        y: "25%",
         b: "auto",
         r: "auto",
-        type: "顶部",
+        type: "底部",
+        link: "/scene/?m=1194",
+      },
+      {
+        id: 2.2,
+        name: "鸦片战争博物馆",
+        x: "9%",
+        y: "30%",
+        b: "auto",
+        r: "auto",
+        type: "底部",
         link: "/scene/?m=1194",
       },
     ],
   },
   {
     id: 3,
+    imgId:3,
     name: "海战馆",
     x: "16%",
     y: "41%",
@@ -78,8 +92,8 @@ export const mapData1: MapType[] = [
     son: [
       {
         id: 2.1,
-        name: "22222-1111",
-        x: "20%",
+        name: "海战馆",
+        x: "39.4%",
         y: "10%",
         b: "auto",
         r: "auto",

pc/src/pages/A0Map/index.tsx

@@ -34,6 +34,7 @@ function A0Map({ type, sonChaneType }: Props) {
 
       {/* 一级地图盒子 */}
       <div
+        style={{ opacity: mapSon ? "0" : "1" }}
         className={classNames(
           "mapMain",
           type === 2 ? "mapMain2" : type === 3 ? "mapMain3" : ""
@@ -45,7 +46,7 @@ function A0Map({ type, sonChaneType }: Props) {
             onMouseEnter={() => setIsHover(v.id)}
             onMouseLeave={() => setIsHover(0)}
             onClick={() => {
-              setMapSon(v.id);
+              setMapSon(v.imgId);
               sonChaneType(2);
             }}
             key={v.id}
@@ -83,7 +84,7 @@ function A0Map({ type, sonChaneType }: Props) {
         {maoData2.map((v) => (
           <div
             onClick={() => {
-              window.open(baseURL+v.link);
+              window.open(baseURL + v.link);
               // setMapSon(v.id);
               sonChaneType(3);
             }}
@@ -124,7 +125,7 @@ function A0Map({ type, sonChaneType }: Props) {
         ))}
 
         {/* 一级地图 图片 */}
-        <div className="mapBac" hidden={mapSon !== 0}>
+        <div className="mapBac">
           <img
             onLoad={() => imgLodingFu(0)}
             src={`${envUrl}/map/0.jpg`}

pc/src/pages/A2Main/Tab4/index.module.scss

@@ -194,7 +194,7 @@
           font-size: 16px;
         }
         &:hover{
-          box-shadow: 1px 1px 5px 5px;
+          box-shadow: 1px 1px 5px 5px rgba(74, 64, 61, .8);
         }
       }
 

pc/src/pages/A2Main/Tab5/index.module.scss

@@ -70,7 +70,7 @@
 
         &:hover {
           &>div {
-            box-shadow: 1px 1px 5px 5px;
+            box-shadow: 1px 1px 5px 5px rgba(74, 64, 61, .8);
           }
 
           &>p {