shaogen1995 %!s(int64=3) %!d(string=hai) anos
pai
achega
6495f1736d
Modificáronse 64 ficheiros con 111 adicións e 48 borrados
  1. BIN=BIN
      public/data/1.mp4
  2. BIN=BIN
      public/data/11.png
  3. BIN=BIN
      public/data/12.png
  4. BIN=BIN
      public/data/13.png
  5. BIN=BIN
      public/data/14.png
  6. BIN=BIN
      public/data/15.png
  7. BIN=BIN
      public/data/16.png
  8. BIN=BIN
      public/data/17.png
  9. BIN=BIN
      public/data/18.png
  10. BIN=BIN
      public/data/19.png
  11. BIN=BIN
      public/data/2.mp4
  12. BIN=BIN
      public/data/22_1.png
  13. BIN=BIN
      public/data/22_2.png
  14. BIN=BIN
      public/data/23.png
  15. BIN=BIN
      public/data/24.png
  16. BIN=BIN
      public/data/3.mp4
  17. BIN=BIN
      public/data/32.png
  18. BIN=BIN
      public/data/33.png
  19. BIN=BIN
      public/data/34.png
  20. BIN=BIN
      public/data/35.png
  21. BIN=BIN
      public/data/36_1.png
  22. BIN=BIN
      public/data/36_2.png
  23. BIN=BIN
      public/data/36_3.png
  24. BIN=BIN
      public/data/36_4.png
  25. BIN=BIN
      public/data/38.png
  26. BIN=BIN
      public/data/39.png
  27. BIN=BIN
      public/data/4.mp4
  28. BIN=BIN
      public/data/5.mp4
  29. BIN=BIN
      public/data/6.mp4
  30. BIN=BIN
      public/data/7_1.png
  31. BIN=BIN
      public/data/7_10.png
  32. BIN=BIN
      public/data/7_11.png
  33. BIN=BIN
      public/data/7_12.png
  34. BIN=BIN
      public/data/7_13.png
  35. BIN=BIN
      public/data/7_14.png
  36. BIN=BIN
      public/data/7_15.png
  37. BIN=BIN
      public/data/7_16.png
  38. BIN=BIN
      public/data/7_17.png
  39. BIN=BIN
      public/data/7_18.png
  40. BIN=BIN
      public/data/7_19.png
  41. BIN=BIN
      public/data/7_2.png
  42. BIN=BIN
      public/data/7_20.png
  43. BIN=BIN
      public/data/7_3.png
  44. BIN=BIN
      public/data/7_4.png
  45. BIN=BIN
      public/data/7_5.png
  46. BIN=BIN
      public/data/7_6.png
  47. BIN=BIN
      public/data/7_7.png
  48. BIN=BIN
      public/data/7_8.png
  49. BIN=BIN
      public/data/7_9.png
  50. BIN=BIN
      public/data/9.png
  51. BIN=BIN
      src/assets/img/zhanpin/34.png
  52. BIN=BIN
      src/assets/img/zhanpin/35.png
  53. BIN=BIN
      src/assets/img/zhanpin/36.png
  54. BIN=BIN
      src/assets/img/zhanpin/37.png
  55. BIN=BIN
      src/assets/img/zhanpin/38.png
  56. BIN=BIN
      src/assets/img/zhanpin/40.png
  57. 79 6
      src/components/data.js
  58. 2 2
      src/components/son3.vue
  59. 1 1
      src/components/son4.vue
  60. 2 9
      src/components/son5.vue
  61. 7 18
      src/components/son6.vue
  62. 8 2
      src/components/son7.vue
  63. 1 1
      src/views/info/audio.vue
  64. 11 9
      src/views/info/index.vue

BIN=BIN
public/data/1.mp4


BIN=BIN
public/data/11.png


BIN=BIN
public/data/12.png


BIN=BIN
public/data/13.png


BIN=BIN
public/data/14.png


BIN=BIN
public/data/15.png


BIN=BIN
public/data/16.png


BIN=BIN
public/data/17.png


BIN=BIN
public/data/18.png


BIN=BIN
public/data/19.png


BIN=BIN
public/data/2.mp4


BIN=BIN
public/data/22_1.png


BIN=BIN
public/data/22_2.png


BIN=BIN
public/data/23.png


BIN=BIN
public/data/24.png


BIN=BIN
public/data/3.mp4


BIN=BIN
public/data/32.png


BIN=BIN
public/data/33.png


BIN=BIN
public/data/34.png


BIN=BIN
public/data/35.png


BIN=BIN
public/data/36_1.png


BIN=BIN
public/data/36_2.png


BIN=BIN
public/data/36_3.png


BIN=BIN
public/data/36_4.png


BIN=BIN
public/data/38.png


BIN=BIN
public/data/39.png


BIN=BIN
public/data/4.mp4


BIN=BIN
public/data/5.mp4


BIN=BIN
public/data/6.mp4


BIN=BIN
public/data/7_1.png


BIN=BIN
public/data/7_10.png


BIN=BIN
public/data/7_11.png


BIN=BIN
public/data/7_12.png


BIN=BIN
public/data/7_13.png


BIN=BIN
public/data/7_14.png


BIN=BIN
public/data/7_15.png


BIN=BIN
public/data/7_16.png


BIN=BIN
public/data/7_17.png


BIN=BIN
public/data/7_18.png


BIN=BIN
public/data/7_19.png


BIN=BIN
public/data/7_2.png


BIN=BIN
public/data/7_20.png


BIN=BIN
public/data/7_3.png


BIN=BIN
public/data/7_4.png


BIN=BIN
public/data/7_5.png


BIN=BIN
public/data/7_6.png


BIN=BIN
public/data/7_7.png


BIN=BIN
public/data/7_8.png


BIN=BIN
public/data/7_9.png


BIN=BIN
public/data/9.png


BIN=BIN
src/assets/img/zhanpin/34.png


BIN=BIN
src/assets/img/zhanpin/35.png


BIN=BIN
src/assets/img/zhanpin/36.png


BIN=BIN
src/assets/img/zhanpin/37.png


BIN=BIN
src/assets/img/zhanpin/38.png


BIN=BIN
src/assets/img/zhanpin/40.png


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 79 - 6
src/components/data.js


+ 2 - 2
src/components/son3.vue

@@ -2,14 +2,14 @@
   <div class="son3">
     <!-- 点击视频播放的盒子 -->
     <div class="videoPlayBox" v-if="videoId">
-      <video controls autoplay :src="`/data/${videoId}.mp4`"></video>
+      <video controls autoplay :src="`data/${videoId}.mp4`"></video>
       <!-- 关闭按钮 -->
       <div class="close" @click="videoId = null"></div>
     </div>
     <!-- 视频 -->
     <div class="videoBox">
       <div class="vidPlay" @click="videoId = '1'"></div>
-      <!-- <video src="/data/1.mp4" autoplay loop muted></video> -->
+      <!-- <video src="data/1.mp4" autoplay loop muted></video> -->
       <img src="../assets/img/vid1.png" alt="" />
     </div>
     <div class="shuming">《鸦片成瘾机制》</div>

+ 1 - 1
src/components/son4.vue

@@ -2,7 +2,7 @@
   <div class="son4">
     <!-- 点击视频播放的盒子 -->
     <div class="videoPlayBox" v-if="videoId">
-      <video controls autoplay :src="`/data/${videoId}.mp4`"></video>
+      <video controls autoplay :src="`data/${videoId}.mp4`"></video>
       <!-- 关闭按钮 -->
       <div class="close" @click="videoId = null"></div>
     </div>

+ 2 - 9
src/components/son5.vue

@@ -86,19 +86,12 @@ export default {
         {
           id: 34,
           name: "1850年吸食鸦片的中国人彩色印刷铜版画",
-          ww: "223px",
-          hh: "229px",
-          pad: true,
-        },
-        {
-          id: 35,
-          name: "1850年吸食鸦片的中国人彩色印刷铜版画",
           ww: "251px",
           hh: "226px",
           pad: true,
         },
         {
-          id: 36,
+          id: 35,
           name: "19世纪鸦片危害漫画",
           ww: "227px",
           hh: "316px",
@@ -106,7 +99,7 @@ export default {
           centen: true,
         },
         {
-          id: 37,
+          id: 36,
           name: "1922年陈乐琴愁城十二景四条屏",
           ww: "100%",
           hh: "auto",

+ 7 - 18
src/components/son6.vue

@@ -2,7 +2,7 @@
   <div class="son6">
     <!-- 点击视频播放的盒子 -->
     <div class="videoPlayBox" v-if="videoId">
-      <video controls autoplay :src="`/data/${videoId}.mp4`"></video>
+      <video controls autoplay :src="`data/${videoId}.mp4`"></video>
       <!-- 关闭按钮 -->
       <div class="close" @click="videoId = null"></div>
     </div>
@@ -64,18 +64,11 @@ export default {
       modelId: null,
       data: [
         {
-          id: 38,
+          id: 37,
           name: "林则徐画像",
-          ww: "155px",
-          hh: "183px",
-          pad: true,
-        },
-        {
-          id: 39,
-          name: "(油画)销烟壮举",
-          ww: "257px",
-          hh: "190px",
-        },
+          ww: "273px",
+          hh: "322px",
+        }
       ],
     };
   },
@@ -188,6 +181,7 @@ export default {
     padding: 0;
     margin-bottom: 50px;
     display: flex;
+    justify-content: center;
     .row {
       & > img {
         width: 100%;
@@ -201,12 +195,7 @@ export default {
         line-height: 24px;
       }
     }
-    &:nth-of-type(2n) {
-      justify-content: flex-end 
-    }
-  }
-  .noPad {
-    padding: 0 24px;
   }
+
 }
 </style>

+ 8 - 2
src/components/son7.vue

@@ -2,7 +2,7 @@
   <div class="son7">
     <!-- 点击视频播放的盒子 -->
     <div class="videoPlayBox" v-if="videoId">
-      <video controls autoplay :src="`/data/${videoId}.mp4`"></video>
+      <video controls autoplay :src="`data/${videoId}.mp4`"></video>
       <!-- 关闭按钮 -->
       <div class="close" @click="videoId = null"></div>
     </div>
@@ -43,11 +43,17 @@ export default {
       videoId: null,
       data: [
         {
-          id: 40,
+          id: 38,
           name: "销烟池木桩",
           ww: "267px",
           hh: "149px",
         },
+        {
+          id: 39,
+          name: "(油画)销烟壮举",
+          ww: "257px",
+          hh: "190px",
+        },
       ],
     };
   },

+ 1 - 1
src/views/info/audio.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="images">
-    <audio id="audioTag" class="noshow" autoplay :src="`/data/${$route.params.id}.mp3`"></audio>
+    <audio id="audioTag" class="noshow" autoplay :src="`data/${$route.params.id}.mp3`"></audio>
     <div class="audiocon">
       <!-- 左侧按钮 -->
       <div class="leftBtn">

+ 11 - 9
src/views/info/index.vue

@@ -4,7 +4,7 @@
     <!-- 标题 -->
     <div class="title">
       <div class="back" @click="$router.go(-1)"></div>
-      <h3>清“乾隆”款珐琅蓝彩十三行通景画瓷碗</h3>
+      <h3>{{ data.name }}</h3>
     </div>
     <!-- 模型 -->
     <div class="model">
@@ -19,14 +19,15 @@
     </div>
     <!-- 音乐 -->
     <div class="myMusic">
-      <Audio/>
+      <Audio />
     </div>
     <!-- 文字介绍 -->
-    <div class="txtt" v-html="txtx"></div>
+    <div class="txtt" v-html="data.txt"></div>
   </div>
 </template>
 
 <script>
+import { info } from "../../components/data.js";
 import Audio from "./audio.vue";
 export default {
   name: "info",
@@ -34,8 +35,8 @@ export default {
   data() {
     //这里存放数据
     return {
-      txtx:`<p>文物尺寸:高8.6厘米,口径21厘米,足径8.5厘米,重753克。</p><p>文物说明:口沿镶金边,碗面通篇用珐琅蓝彩描绘广州十三行景色,画工精细,碗内中心绘帆船纹,碗底有方框篆书乾隆款,在清代广州出口瓷中极为少见。</p>`
-      };
+      data: {},
+    };
   },
   //监听属性 类似于data概念
   computed: {},
@@ -54,7 +55,8 @@ export default {
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
   activated() {
-    window.scrollTo({ top: 0});
+    window.scrollTo({ top: 0 });
+    this.data = info.find((v) => v.id == this.$route.params.id);
   }, //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
@@ -110,12 +112,12 @@ export default {
     padding: 35px 20px 40px 30px;
     border-bottom: 2px dashed rgba(235, 223, 191, 0.2);
   }
-  .txtt{
+  .txtt {
     padding: 30px 20px 40px 30px;
-    color: #E7DBBC;
+    color: #e7dbbc;
     font-size: 16px;
     line-height: 24px;
-    /deep/p{
+    /deep/p {
       margin-bottom: 30px;
     }
   }