upp

houtai/src/pages/B3Wall/WallLook/index.tsx

@@ -27,14 +27,14 @@ function WallLook({ id, imgList, closeMoalFu }: Props) {
 
   // 动态修改模态框的宽度
   useEffect(() => {
-    const dom: any = document.querySelector(".WallLook .ant-modal");
+    const dom: any = document.querySelector(".myWallLook .ant-modal");
     if (dom && imgShowList && imgShowList.length > 2)
       dom.style.width = imgShowList.length * 200 + "px";
   }, [imgShowList]);
 
   return (
     <Modal
-      wrapClassName={styles.WallLook}
+      wrapClassName={styles.WallLook + " myWallLook"}
       destroyOnClose
       open={true}
       title="预览效果"

houtai/src/utils/http.ts

@@ -7,10 +7,10 @@ import { domShowFu } from "./domShow";
 // 请求基地址
 export const baseURL =
   // 线下的图片地址需要加上/api/
-  process.env.NODE_ENV === "development"
-    ? "http://192.168.20.55:8041/api/"
-    : "";
-// process.env.NODE_ENV === "development" ? "https://xuzhouwall.4dage.com" : "";
+  // process.env.NODE_ENV === "development"
+  //   ? "http://192.168.20.55:8041/api/"
+  //   : "";
+process.env.NODE_ENV === "development" ? "https://ypbwg.4dage.com" : "";
 
 // 处理  类型“AxiosResponse<any, any>”上不存在属性“code”
 declare module "axios" {
@@ -23,10 +23,10 @@ declare module "axios" {
 // 创建 axios 实例
 const http = axios.create({
   // --------线下的地址不用加/api/
-  baseURL: baseURL,
+  // baseURL: baseURL,
 
   // --------打包或线上环境接口需要加上api/
-  // baseURL: baseURL + "/api/",
+  baseURL: baseURL + "/api/",
   timeout: 5000,
 });
 

pc/public/model.html

@@ -18,9 +18,9 @@
   <div id="ui"></div>
   <script>
     let url = getQueryVariable("m");
-    // fdage.embed(url, {
+    fdage.embed(url, {
       // fdage.embed('https://hnbwg.4dage.com' + url, {
-      fdage.embed('http://192.168.20.55:8041/api' + url, {
+      // fdage.embed('http://192.168.20.55:8041/api' + url, {
       transparentBackground: true,
       width: 800,
       height: 600,

pc/src/pages/A2Main/GoodsInfo/RightFile/index.module.scss

@@ -22,15 +22,22 @@
     }
 
     .R_audioIcon {
+      border-radius: 50%;
+      width: 40px;
+      height: 40px;
+      border: 1px solid var(--themeColor);
       cursor: pointer;
       position: absolute;
       right: 8px;
-      top: 5px;
-      z-index: 999;
+      top: -5px;
+      z-index: 98;
+      display: flex;
+      justify-content: center;
+      align-items: center;
 
       &>img {
-        width: 40px;
-        height: 40px;
+        width: 30px;
+        height: 30px;
       }
     }
 
@@ -111,27 +118,26 @@
     .R_typeCutBox {
       position: absolute;
       z-index: 98;
-      top: 5px;
-      left: 50%;
-      transform: translateX(-50%);
+      top: -5px;
+      left: 0;
       height: 40px;
       display: flex;
 
       .R_typeCutRow {
-        margin: 0 5px;
+        margin: 0 10px;
         cursor: pointer;
         color: var(--themeColor);
         line-height: 40px;
         text-align: center;
         height: 40px;
-        padding: 0 40px;
-        border-radius: 20px;
+        padding: 0 30px;
+        border-radius:0 10px 0 10px;
         border: 1px solid var(--themeColor);
       }
 
       .R_typeCutRowAc {
         background-color: var(--themeColor);
-        color: #fff;
+        color: #4A403D;
       }
     }
 
@@ -139,10 +145,12 @@
       position: absolute;
       height: 40px;
       line-height: 40px;
-      left: 0;
-      top: 5px;
+      left: 50%;
+      bottom: -40px;
+      transform: translateX(-50%);
       z-index: 99;
-      color: #fff;
+      color: #EBDFBF;
+      font-size: 20px;
     }
 
   }

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

@@ -6,6 +6,8 @@
 
   :global {
     .G_close {
+      position: relative;
+      z-index: 2;
       padding: 15px 20px 0 20px;
       height: 80px;
       text-align: right;
@@ -22,8 +24,9 @@
     }
 
     .G_Main {
+      margin-top: 30px;
       width: 100%;
-      height: calc(100% - 90px);
+      height: calc(100% - 120px);
       padding: 0px 140px 0 180px;
 
       .G_title {
@@ -34,10 +37,11 @@
 
       .G_con {
         width: 100%;
-        height: calc(100% - 160px);
-        padding: 30px 0;
-        margin-top: 25px;
+        height: calc(100% - 200px);
+        padding: 0px 0 30px;
         display: flex;
+        margin-bottom: 30px;
+        margin-top: 20px;
 
         .G_leftMain {
           width: 46%;
@@ -46,6 +50,8 @@
           border-bottom: 1px solid var(--themeColor);
           position: relative;
           padding: 15px 0;
+          margin-top: 50px;
+          height: calc(100% - 50px);
 
           &::before {
             content: '';
@@ -236,9 +242,11 @@
 
     // 滚动弹幕
     .barrMove {
+      z-index: 1;
+      pointer-events: none;
       position: absolute;
       right: -1300px;
-      top: 150px;
+      top: 80px;
       background-color: rgba(98, 82, 65, 0.6);
       backdrop-filter: blur(6px);
       padding: 8px 30px;

pc/src/pages/A2Main/SwiperCom/index.tsx

@@ -35,6 +35,8 @@ function SwiperCom({ data, type }: Props) {
             txt: item.info?.txt!,
           },
         });
+      } else {
+        window.open(item.path);
       }
     },
     [type]
@@ -64,7 +66,7 @@ function SwiperCom({ data, type }: Props) {
                 active === v.id ? "SwiperComRowAc" : ""
               )}
             >
-              <img src={envUrl + "/swData/1/1.jpg"} alt="" />
+              <img src={envUrl + `/swData/${type}/${v.img}`} alt="" />
               <div className="SwiperComSm">
                 <p>{v.name}</p>
               </div>

pc/src/pages/A2Main/index.tsx

@@ -16,6 +16,7 @@ const incoArr = [
     data: [
       {
         id: 1,
+        img: "1.jpg",
         name: "虎门销烟1-1",
         path: "",
         info: {
@@ -25,6 +26,7 @@ const incoArr = [
       },
       {
         id: 2,
+        img: "1.jpg",
         name: "虎门销烟1-1",
         path: "",
         info: {
@@ -34,6 +36,7 @@ const incoArr = [
       },
       {
         id: 3,
+        img: "1.jpg",
         name: "虎门销烟1-1",
         path: "",
         info: {
@@ -46,23 +49,35 @@ const incoArr = [
   {
     id: 2,
     data: [
-      { id: 1, name: "虎门销烟2-111111111111111111111111111111", path: "" },
-      { id: 2, name: "虎门销烟2-1", path: "" },
-      { id: 3, name: "虎门销烟2-1", path: "" },
-      { id: 4, name: "虎门销烟2-111111111111111111111111111111", path: "" },
-      { id: 5, name: "虎门销烟2-1", path: "" },
-      { id: 6, name: "虎门销烟2-1", path: "" },
-      { id: 7, name: "虎门销烟2-111111111111111111111111111111", path: "" },
-      { id: 8, name: "虎门销烟2-1", path: "" },
-      { id: 9, name: "虎门销烟2-1", path: "" },
+      {
+        id: 1,
+        img: "1.png",
+        name: "鸦片战争博物馆",
+        path: "https://www.4dkankan.com/spg.html?m=KJ-Db5vr10oMd&lang=zh",
+      },
+      {
+        id: 2,
+        img: "2.png",
+        name: "海战馆",
+        path: "https://www.4dkankan.com/spg.html?m=KJ-PoA0YhcfD7&lang=zh",
+      },
+      {
+        id: 3,
+        img: "3.png",
+        name: "虎门故事",
+        path: "https://www.4dkankan.com/spg.html?m=KJ-veEvm2HCkm&lang=zh",
+      },
     ],
   },
   {
     id: 3,
     data: [
-      { id: 1, name: "虎门销烟3-1", path: "" },
-      { id: 2, name: "虎门销烟3-1", path: "" },
-      { id: 3, name: "虎门销烟3-1", path: "" },
+      {
+        id: 1,
+        img: "4.png",
+        name: "威远炮台",
+        path: "https://laser.4dkankan.com/index.html?m=SS-TVMpM4DKEL",
+      },
     ],
   },
   { id: 4 },

pc/src/types/store/A2Main.d.ts

@@ -1,5 +1,6 @@
 export type A2SwType = {
   id: number;
+  img: string;
   name: string;
   path: string;
   info?: { title: string; txt: string };

pc/src/utils/http.ts

@@ -4,10 +4,10 @@ import { domShowFu } from "./domShow";
 // 请求基地址
 export const baseURL =
   // 线下的图片地址需要加上/api/
-  process.env.NODE_ENV === "development"
-    ? "http://192.168.20.55:8041/api/"
-    : "";
-// process.env.NODE_ENV === "development" ? "https://xuzhouwall.4dage.com" : "";
+  // process.env.NODE_ENV === "development"
+  //   ? "http://192.168.20.55:8041/api/"
+  //   : "";
+process.env.NODE_ENV === "development" ? "https://ypbwg.4dage.com" : "";
 
 // 处理  类型“AxiosResponse<any, any>”上不存在属性“code”
 declare module "axios" {
@@ -20,10 +20,10 @@ declare module "axios" {
 // 创建 axios 实例
 const http = axios.create({
   // --------线下的地址不用加/api/
-  baseURL: baseURL,
+  // baseURL: baseURL,
 
   // --------打包或线上环境接口需要加上api/
-  // baseURL: baseURL + "/api/",
+  baseURL: baseURL + "/api/",
   timeout: 5000,
 });