Bläddra i källkod

up-需求修改

shaogen1995 2 år sedan
förälder
incheckning
e7c1a91f08

BIN
audioAll/1-wc.mp3


BIN
audioAll/1.mp3


BIN
audioAll/10-wc.mp3


BIN
audioAll/11-wc.mp3


BIN
audioAll/12-wc.mp3


BIN
audioAll/13-wc.mp3


BIN
audioAll/14-wc.mp3


BIN
audioAll/15-wc.mp3


BIN
audioAll/16-wc.mp3


BIN
audioAll/17-wc.mp3


BIN
audioAll/18-wc.mp3


BIN
audioAll/19-wc.mp3


BIN
audioAll/2-wc.mp3


BIN
audioAll/20-wc.mp3


BIN
audioAll/3-wc.mp3


BIN
audioAll/4-wc.mp3


BIN
audioAll/5-wc.mp3


BIN
audioAll/6-wc.mp3


BIN
audioAll/7-wc.mp3


BIN
audioAll/8-wc.mp3


BIN
audioAll/9-wc.mp3


BIN
pc/src/assets/img/home/scene1.jpg


BIN
pc/src/assets/img/home/scene1.png


BIN
pc/src/assets/img/home/scene2.jpg


BIN
pc/src/assets/img/home/scene2.png


BIN
pc/src/assets/img/home/scene3.jpg


BIN
pc/src/assets/img/home/scene3.png


BIN
pc/src/assets/img/home/scene4.jpg


BIN
pc/src/assets/img/home/scene4.png


+ 5 - 5
pc/src/pages/A1_Home/index.module.scss

@@ -266,7 +266,7 @@
           &>div {
             width: 90%;
             height: 90%;
-            background-size: cover;
+            background-size: 100% 100%;
             position: relative;
             transition: all .3s;
 
@@ -296,20 +296,20 @@
 
 
           .sceneRowImg1 {
-            background-image: url('../../assets/img/home/scene1.jpg');
+            background-image: url('../../assets/img/home/scene1.png');
 
           }
 
           .sceneRowImg2 {
-            background-image: url('../../assets/img/home/scene2.jpg');
+            background-image: url('../../assets/img/home/scene2.png');
           }
 
           .sceneRowImg3 {
-            background-image: url('../../assets/img/home/scene3.jpg');
+            background-image: url('../../assets/img/home/scene3.png');
           }
 
           .sceneRowImg4 {
-            background-image: url('../../assets/img/home/scene4.jpg');
+            background-image: url('../../assets/img/home/scene4.png');
           }
 
 

+ 6 - 5
pc/src/pages/A1_Home/index.tsx

@@ -16,10 +16,10 @@ const arr = [
 const sceneArr = [
   {
     id: 1,
-    name: "精品文物展厅",
-    // path: "/scene/index.html#/?m=KJ-ztJ9nPQyf64",
-    path: "https://www.4dkankan.com/spg.html?m=KJ-ztJ9nPQyf64&lang=zh",
+    name: "仡佬·务川主题展",
+    path: "https://www.4dkankan.com/spg.html?m=KJ-vTmFlWyrzlK&lang=zh",
   },
+
   {
     id: 2,
     name: "书画厅",
@@ -28,8 +28,9 @@ const sceneArr = [
   },
   {
     id: 3,
-    name: "仡佬·务川主题展",
-    path: "https://www.4dkankan.com/spg.html?m=KJ-vTmFlWyrzlK&lang=zh",
+    name: "精品文物展厅",
+    // path: "/scene/index.html#/?m=KJ-ztJ9nPQyf64",
+    path: "https://www.4dkankan.com/spg.html?m=KJ-ztJ9nPQyf64&lang=zh",
   },
   {
     id: 4,

+ 13 - 15
pc/src/pages/A2_Goods/GoodsInfo/index.module.scss

@@ -40,54 +40,52 @@
 
       .infoR {
         width: 40%;
-        padding: 300px 0 0 160px;
         background-image: url('../../../assets/img/goods/infoBac.jpg');
         background-size: 100% 100%;
 
-        // 本地化
-        // padding: 120px 0 0 60px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        padding-left: 60px;
+        padding: 0 0 40px 60px;
+
+        // padding: 140px 0 0 60px;
 
         .title {
-          font-size: 22px;
           font-weight: 700;
           color: var(--themeColor);
           margin-bottom: 24px;
           position: relative;
           padding-right: 140px;
 
-          // 本地化
-          // font-size: 26px;
+          font-size: 26px;
 
           .audioBox {
             cursor: pointer;
             position: absolute;
             right: 100px;
-            top: -4px;
+            top: -10px;
             z-index: 99;
 
             &>img {
-              width: 40px;
+              width: 50px;
             }
           }
         }
 
         .infoP {
-          font-size: 16px;
           font-weight: 700;
           margin-bottom: 15px;
 
-          // 本地化
-          // font-size: 20px;
+          font-size: 20px;
         }
 
         .infoTxt {
           padding-right: 100px;
           margin-top: 34px;
-          font-size: 12px;
 
-          // 本地化
-          // font-size: 20px;
-          // line-height: 40px;
+          font-size: 20px;
+          line-height: 40px;
 
         }
 

+ 2 - 5
pc/src/pages/A2_Goods/GoodsInfo/index.tsx

@@ -48,11 +48,10 @@ function GoodsInfo({ data, closePageFu }: Props) {
       {data.id ? (
         <div className="infoMain">
           {/* 音频 */}
-          <audio ref={audioRef} src={`${audioUrl}${data.id}.mp3`}></audio>
+          <audio ref={audioRef} src={`${audioUrl}${data.id}-wc.mp3`}></audio>
 
           {/* 左边模型 */}
           <div className="infoL">
-            
             {/* 线上开发 */}
             <iframe src={data.link} frameBorder="0"></iframe>
 
@@ -70,7 +69,6 @@ function GoodsInfo({ data, closePageFu }: Props) {
             <div className="title">
               {data.name}
               <div
-                hidden
                 className="audioBox"
                 title={audioSta ? "关闭音频" : "打开音频"}
                 onClick={() => setAudioSta(!audioSta)}
@@ -79,8 +77,7 @@ function GoodsInfo({ data, closePageFu }: Props) {
               </div>
             </div>
             <div className="infoP">年代:{data.age}</div>
-            <div className="infoP">类别:{data.sort}</div>
-            <div className="infoP">尺寸:{data.size}</div>
+            <div className="infoP">材质:{data.material}</div>
             <div
               className="infoTxt"
               dangerouslySetInnerHTML={{ __html: data.intro }}

+ 2 - 3
pc/src/pages/A2_Goods/index.tsx

@@ -70,7 +70,7 @@ function A2_Goods() {
       {/* 回到首页 */}
 
       {/* 本地化 + hidden */}
-      <div className="toHomeBox" onClick={() => history.push("/")} ></div>
+      <div className="toHomeBox" onClick={() => history.push("/")}></div>
       {/* 文物主体 */}
       <div className="goodsMain" id="goddsSwBox">
         <div
@@ -98,8 +98,7 @@ function A2_Goods() {
                 </div>
                 <div className="rowTxt">
                   <div className="rowTxtRow">年代:{v.age}</div>
-                  <div className="rowTxtRow">类别:{v.sort}</div>
-                  <div className="rowTxtRow">尺寸:{v.size}</div>
+                  <div className="rowTxtRow">材质:{v.material}</div>
                   <div
                     className="rowTxtRowZ"
                     dangerouslySetInnerHTML={{

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 63 - 83
pc/src/utils/data.ts


+ 1 - 1
pc/src/utils/env.ts

@@ -1,4 +1,4 @@
 export const audioUrl =
   process.env.NODE_ENV === "development"
-    ? "http://192.168.20.48:8080/audioAll/"
+    ? "http://192.168.20.25:8080/audioAll/"
     : "/audioAll/";