shaogen1995 2 年 前
コミット
202a7e71bb
54 ファイル変更210 行追加49 行削除
  1. BIN
      yfyc/public/audio/11.mp3
  2. BIN
      yfyc/public/audio/3.mp3
  3. BIN
      yfyc/public/audio/4.mp3
  4. BIN
      yfyc/public/audio/5.mp3
  5. BIN
      yfyc/public/audio/6.mp3
  6. BIN
      yfyc/public/audio/7.mp3
  7. BIN
      yfyc/public/audio/8.mp3
  8. BIN
      yfyc/public/audio/9.mp3
  9. 0 0
      yfyc/public/dataImg/1/audio.png
  10. 0 0
      yfyc/public/dataImg/1/sw1.png
  11. 0 0
      yfyc/public/dataImg/1/sw2.png
  12. 0 0
      yfyc/public/dataImg/1/sw3.png
  13. BIN
      yfyc/public/dataImg/11/audio.png
  14. BIN
      yfyc/public/dataImg/11/sw1.png
  15. BIN
      yfyc/public/dataImg/11/sw2.png
  16. BIN
      yfyc/public/dataImg/11/sw3.png
  17. BIN
      yfyc/public/dataImg/2/audio.png
  18. BIN
      yfyc/public/dataImg/2/sw1.png
  19. BIN
      yfyc/public/dataImg/2/sw2.png
  20. BIN
      yfyc/public/dataImg/3/audio.png
  21. BIN
      yfyc/public/dataImg/3/sw1.png
  22. BIN
      yfyc/public/dataImg/4/audio.png
  23. BIN
      yfyc/public/dataImg/4/sw1.png
  24. BIN
      yfyc/public/dataImg/4/sw2.png
  25. BIN
      yfyc/public/dataImg/5/audio.png
  26. BIN
      yfyc/public/dataImg/5/sw1.png
  27. BIN
      yfyc/public/dataImg/6/audio.png
  28. BIN
      yfyc/public/dataImg/6/sw1.png
  29. BIN
      yfyc/public/dataImg/6/sw2.png
  30. BIN
      yfyc/public/dataImg/7/audio.png
  31. BIN
      yfyc/public/dataImg/7/sw1.png
  32. BIN
      yfyc/public/dataImg/8/audio.png
  33. BIN
      yfyc/public/dataImg/8/sw1.png
  34. BIN
      yfyc/public/dataImg/9/audio.png
  35. BIN
      yfyc/public/dataImg/9/sw1.jpg
  36. 0 0
      yfyc/public/video/1.mp4
  37. BIN
      yfyc/public/video/11.mp4
  38. 0 0
      yfyc/public/video/1h.mp4
  39. BIN
      yfyc/public/video/2.mp4
  40. BIN
      yfyc/public/video/3.mp4
  41. BIN
      yfyc/public/video/4.mp4
  42. BIN
      yfyc/public/video/5.mp4
  43. BIN
      yfyc/public/video/6.mp4
  44. BIN
      yfyc/public/video/7.mp4
  45. BIN
      yfyc/public/video/8.mp4
  46. BIN
      yfyc/public/video/9.mp4
  47. BIN
      yfyc/src/assets/img/goods/2/audio.png
  48. BIN
      yfyc/src/assets/img/goods/2/sw1.png
  49. 13 9
      yfyc/src/views/Construct/components/HomeList.vue
  50. 17 1
      yfyc/src/views/Construct/components/search.vue
  51. 15 2
      yfyc/src/views/Construct/index.vue
  52. 1 5
      yfyc/src/views/Goods/components/GoodsAudio.vue
  53. 146 8
      yfyc/src/views/Goods/data.js
  54. 18 24
      yfyc/src/views/Goods/index.vue

BIN
yfyc/public/audio/11.mp3


BIN
yfyc/public/audio/3.mp3


BIN
yfyc/public/audio/4.mp3


BIN
yfyc/public/audio/5.mp3


BIN
yfyc/public/audio/6.mp3


BIN
yfyc/public/audio/7.mp3


BIN
yfyc/public/audio/8.mp3


BIN
yfyc/public/audio/9.mp3


yfyc/src/assets/img/goods/1/audio.png → yfyc/public/dataImg/1/audio.png


yfyc/src/assets/img/goods/1/sw1.png → yfyc/public/dataImg/1/sw1.png


yfyc/src/assets/img/goods/1/sw2.png → yfyc/public/dataImg/1/sw2.png


yfyc/src/assets/img/goods/1/sw3.png → yfyc/public/dataImg/1/sw3.png


BIN
yfyc/public/dataImg/11/audio.png


BIN
yfyc/public/dataImg/11/sw1.png


BIN
yfyc/public/dataImg/11/sw2.png


BIN
yfyc/public/dataImg/11/sw3.png


BIN
yfyc/public/dataImg/2/audio.png


BIN
yfyc/public/dataImg/2/sw1.png


BIN
yfyc/public/dataImg/2/sw2.png


BIN
yfyc/public/dataImg/3/audio.png


BIN
yfyc/public/dataImg/3/sw1.png


BIN
yfyc/public/dataImg/4/audio.png


BIN
yfyc/public/dataImg/4/sw1.png


BIN
yfyc/public/dataImg/4/sw2.png


BIN
yfyc/public/dataImg/5/audio.png


BIN
yfyc/public/dataImg/5/sw1.png


BIN
yfyc/public/dataImg/6/audio.png


BIN
yfyc/public/dataImg/6/sw1.png


BIN
yfyc/public/dataImg/6/sw2.png


BIN
yfyc/public/dataImg/7/audio.png


BIN
yfyc/public/dataImg/7/sw1.png


BIN
yfyc/public/dataImg/8/audio.png


BIN
yfyc/public/dataImg/8/sw1.png


BIN
yfyc/public/dataImg/9/audio.png


BIN
yfyc/public/dataImg/9/sw1.jpg


yfyc/src/assets/media/home.mp4 → yfyc/public/video/1.mp4


BIN
yfyc/public/video/11.mp4


yfyc/src/assets/media/loop.mp4 → yfyc/public/video/1h.mp4


BIN
yfyc/public/video/2.mp4


BIN
yfyc/public/video/3.mp4


BIN
yfyc/public/video/4.mp4


BIN
yfyc/public/video/5.mp4


BIN
yfyc/public/video/6.mp4


BIN
yfyc/public/video/7.mp4


BIN
yfyc/public/video/8.mp4


BIN
yfyc/public/video/9.mp4


BIN
yfyc/src/assets/img/goods/2/audio.png


BIN
yfyc/src/assets/img/goods/2/sw1.png


+ 13 - 9
yfyc/src/views/Construct/components/HomeList.vue

@@ -38,22 +38,22 @@
         webkit-playsinline="true"
         x5-video-player-type="h5"
         x5-video-orientation="portraint"
+        id="myVideo"
         controls
-        src="../../../assets/media/home.mp4"
+        :src="`video/${myId}.mp4`"
       ></video>
       <img
         v-show="videoBtnShow"
         class="videoBtn"
         src="../../../assets/img/home/videoBtn.png"
         alt=""
-        @click="$router.push('/layout/construct')"
+        @click="$router.push(`/layout/construct/${myId}`)"
       />
     </div>
   </div>
 </template>
 
 <script>
-import { Toast } from "vant";
 export default {
   name: "HomeList",
   components: {},
@@ -84,19 +84,22 @@ export default {
       dataShow: [],
       videoShow: false,
       videoBtnShow: true,
+      myId: 0,
     };
   },
   computed: {},
   watch: {
     videoShow(val) {
       if (val) {
-        let dom = document.querySelector("video");
-        dom.play();
+        let dom = document.querySelector("#myVideo");
+        setTimeout(() => {
+          dom.play();
+        }, 500);
         dom.addEventListener(
           "ended",
           () => {
             //结束
-            this.$router.push("/layout/construct/1");
+            this.$router.push(`/layout/construct/${myId}`);
           },
           false
         );
@@ -108,8 +111,8 @@ export default {
   },
   methods: {
     handlClick(id) {
-      if (id === 1) this.videoShow = true;
-      else this.$router.push(`/layout/construct/${id}`);
+      this.myId = id;
+      this.videoShow = true;
     },
     // 获取列表的方法
     getList() {
@@ -260,7 +263,8 @@ export default {
     z-index: 3;
     width: 100%;
     height: 100%;
-    background-color: #fff;
+    background-color: rgba(0, 0, 0, 0.6);
+    backdrop-filter: blur(4px);
 
     video {
       position: absolute;

+ 17 - 1
yfyc/src/views/Construct/components/search.vue

@@ -81,7 +81,23 @@ export default {
           id: 2,
           name: "镜湖",
           done: false,
-          children: [{ id: 1001, name: "芜湖老海关", path: 1 }],
+          children: [
+            { id: 1001, name: "老芜湖海关旧址", path: 1 },
+            { id: 1002, name: "英驻芜领事署旧址", path: 2 },
+            { id: 1003, name: "总税务司公所旧址", path: 3 },
+            { id: 1004, name: "洋员帮办楼旧址", path: 4 },
+            { id: 1005, name: "英驻芜领事官邸旧址", path: 5 },
+            { id: 1006, name: "天主堂", path: 6 },
+            { id: 1007, name: "神父楼", path: 7 },
+            { id: 1008, name: "天主教主教公署旧址", path: 8 },
+            { id: 1009, name: "圣母院旧址", path: 9 },
+            { id: 1010, name: "天主教修士楼", path: 10 },
+            { id: 1011, name: "内思高级工业职业学校旧址", path: 11 },
+            { id: 1012, name: "博仁堂", path: 12 },
+            { id: 1013, name: "义德堂", path: 13 },
+            { id: 1014, name: "经方堂", path: 14 },
+            { id: 1015, name: "广济寺塔", path: 15 },
+          ],
         },
         { id: 3, name: "鸠江", done: false, children: [] },
         { id: 4, name: "弋江", done: false, children: [] },

+ 15 - 2
yfyc/src/views/Construct/index.vue

@@ -54,8 +54,21 @@
 
 <script>
 const unityUrlObj = {
-  1: "https://4dscene.4dage.com/culturalrelics/YFYCModel/index.html#/",
-  2: "https://4dscene.4dage.com/culturalrelics/YFYCModel/index2.html#/",
+  1: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc204",
+  2: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc214",
+  3: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc215",
+  4: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc211",
+  5: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc213",
+  6: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc210",
+  7: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc206",
+  8: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc209",
+  9: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc207",
+  10: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc208",
+  11: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc205",
+  12: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc201",
+  13: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc212",
+  14: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc203",
+  15: "https://4dscene.4dage.com/culturalrelics/YFYCM2/Model2.html?m=yfyc202",
 };
 const dataAll = [
   { id: 1, name: "老芜湖海关旧址", loction: "滨江公园内" },

+ 1 - 5
yfyc/src/views/Goods/components/GoodsAudio.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="GoodsAudio">
-    <img
-      class="topImg"
-      :src="require(`@/assets/img/goods/${Uid}/audio.png`)"
-      alt=""
-    />
+    <img class="topImg" :src="`dataImg/${Uid}/audio.png`" alt="" />
     <div class="titleInco">
       <van-icon name="arrow-down" />
     </div>

ファイルの差分が大きいため隠しています
+ 146 - 8
yfyc/src/views/Goods/data.js


+ 18 - 24
yfyc/src/views/Goods/index.vue

@@ -4,15 +4,11 @@
     <div class="title">
       <van-swipe class="my-swipe" :autoplay="5000" indicator-color="white">
         <van-swipe-item
-          @click="lookImg(require(`@/assets/img/goods/${Uid}/sw${i}.png`))"
+          @click="lookImg(`dataImg/${Uid}/sw${i}.png`)"
           v-for="i in myInfo.swData"
           :key="i"
         >
-          <img
-            class="bacImg"
-            v-lazy="require(`@/assets/img/goods/${Uid}/sw${i}.png`)"
-            alt=""
-          />
+          <img class="bacImg" v-lazy="`dataImg/${Uid}/sw${i}.png`" alt="" />
         </van-swipe-item>
       </van-swipe>
       <div class="title_rr" v-show="0">
@@ -42,6 +38,7 @@
     <!-- 中间的8个模块 -->
     <div class="skipBtnBox">
       <div
+        v-show="item.done"
         class="skipRow"
         v-for="item in skipData"
         :key="item.id"
@@ -73,10 +70,10 @@
     </div>
 
     <!-- 视频介绍 -->
-    <div class="txtNameMain" v-if="Uid == 1">视频介绍</div>
-    <div class="videoBox" v-if="Uid == 1">
+    <div class="txtNameMain">视频介绍</div>
+    <div class="videoBox">
       <div class="videoShade" v-show="!videoPlay" @click="videoPlayFu"></div>
-      <video src="../../assets/media/loop.mp4" controls></video>
+      <video :src="`video/${Uid == 1 ? Uid + 'h' : Uid}.mp4`" controls></video>
     </div>
 
     <!-- 景点介绍 -->
@@ -288,10 +285,10 @@ export default {
   data() {
     return {
       skipData: [
-        { id: 1, name: "语音导览", path: "/goods/audio" },
-        { id: 2, name: "VR场景", path: "/goods/kankan" },
-        { id: 3, name: "鸟瞰全景", path: "/goods/vr" },
-        { id: 4, name: "文献资料", path: "" },
+        { id: 1, name: "语音导览", path: "/goods/audio", done: true },
+        { id: 2, name: "VR场景", path: "/goods/kankan", done: true },
+        { id: 3, name: "鸟瞰全景", path: "/goods/vr", done: true },
+        // { id: 4, name: "文献资料", path: "" },
         // { id: 4, name: '景点导航', path: '/goods/map' },
         // { id: 5, name: '美食', path: '' },
         // { id: 6, name: '酒店住宿', path: '' },
@@ -313,12 +310,6 @@ export default {
   },
   methods: {
     toPage(path, id) {
-      if (!path) return Toast("敬请期待!");
-      if (id === 2) {
-        if (!kankanInfo[this.Uid]) return Toast("敬请期待!");
-      } else if (id === 3) {
-        if (!vrInfo[this.Uid]) return Toast("敬请期待!");
-      }
       this.$router.push(path + "/" + this.Uid);
     },
 
@@ -334,12 +325,15 @@ export default {
       });
     },
   },
-  created() {
-    window.document.title = "芜湖老海关";
-  },
+  created() {},
   mounted() {
     let id = this.Uid;
     this.myInfo = infoData[id] || {};
+    window.document.title = this.myInfo.txtName;
+
+    // 显示隐藏 vr  和 鸟瞰
+    if (!kankanInfo[id]) this.skipData[1].done = false;
+    if (!vrInfo[id]) this.skipData[2].done = false;
   },
   beforeCreate() {}, //生命周期 - 创建之前
   beforeMount() {}, //生命周期 - 挂载之前
@@ -503,8 +497,7 @@ export default {
     margin: 20px 0 0;
     padding: 0 15px;
     display: flex;
-    flex-wrap: wrap;
-
+    justify-content: space-around;
     .skipRow {
       width: 25%;
       text-align: center;
@@ -600,6 +593,7 @@ export default {
   }
 
   .noTxt {
+    margin-top: 30px;
     text-align: center;
     font-size: 14px;
     color: #c3c3c3;