aamin преди 1 година
родител
ревизия
2eeab96555

+ 5 - 0
src/App.vue

@@ -11,6 +11,11 @@
   </router-view>
   <audio
     id="bg-music"
+    src="./configMultiMedia/music/music1.mp3"
+    style="opacity: 0;"
+  />
+  <audio
+    id="bg-music2"
     src="./configMultiMedia/music/music2.mp3"
     style="opacity: 0;"
   />

BIN
src/assets/images/loding_apng.png


BIN
src/assets/videos/fade-at-shuang-gou.mp4


+ 4 - 2
src/components/BtnSkip.vue

@@ -1,6 +1,8 @@
 <template>
   <div
-    v-show="isReady"
+    :style="{
+      opacity: isReady ? 1 : 0,
+    }"
     class="btn-skip"
   >
     <div class="text">
@@ -57,7 +59,7 @@ onMounted(()=>{
   align-items: center;
   z-index: 30;
   >.text{
-    font-family: KingHwa_OldSong, KingHwa_OldSong;
+    // font-family: KingHwa_OldSong;
     font-weight: 400;
     font-size: calc(16 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     color: #FFFFFF;

+ 17 - 4
src/views/HotspotDetail3.vue

@@ -27,15 +27,19 @@
     >
 
     <img
-      v-show="state == 1"
       class="content1"
       :src="hots3StateContent1"
+      :style="{
+        opacity: state === 1 ? 1 : 0
+      }"
       alt=""
     >
     <div
-      v-show="state == 2"
       id="content2"
       ref="content2Dom"
+      :style="{
+        opacity: state === 2 ? 1 : 0
+      }"
       class="content2"
     >
       <img
@@ -45,8 +49,10 @@
       >
     </div>
     <img
-      v-show="state == 3"
       class="content3"
+      :style="{
+        opacity: state === 3 ? 1 : 0
+      }"
       :src="hots3StateContent3"
       alt=""
     >
@@ -188,6 +194,7 @@ const goState2 = () => {
     position: absolute;
     left: 50%;
     transform: translateX(-50%);
+    transition: opacity 1s ease;
     bottom: calc(130 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
   }
 
@@ -195,6 +202,8 @@ const goState2 = () => {
     width: 100%;
     background-position: left top;
     overflow: auto;
+    position: absolute;
+    transition: opacity 1s ease;
 
     img {
       // height: 50vh;
@@ -202,7 +211,11 @@ const goState2 = () => {
     }
   }
 
-  .content3 {}
+  .content3 {
+    position: absolute;
+    width: 100%;
+    transition: opacity 1s ease;
+  }
 
   .operation-tip {
     position: fixed;

+ 4 - 0
src/views/MoreContent.vue

@@ -1128,6 +1128,10 @@ onMounted(() => {
 
         > .button-group {
           position: absolute;
+          width: calc(
+              20 / v-bind("windowSizeWhenDesignForRef") *
+                v-bind("windowSizeInCssForRef")
+            );
           top: calc(
             75px * v-bind("windowHeight") / v-bind("windowHeightDesign")
           );

+ 1 - 1
src/views/PaintingList.vue

@@ -313,7 +313,7 @@ const unwatch = watch(menuElScrollLeft, (v) => {
     position: absolute;
     left: 0;
     top: 0;
-    width: 100%;
+    width: 100vw;
     height: 100%;
     display: flex;
     overflow: auto;

+ 17 - 1
src/views/StartupView.vue

@@ -13,6 +13,13 @@
     /> -->
 
     <img
+      class="bg-serial-frames"
+      src="@/assets/images/loding_apng.png"
+      alt=""
+      draggable="false"
+    >
+
+    <img
       class="title"
       src="@/assets/images/startup-title.png"
       alt=""
@@ -96,9 +103,16 @@ const videoEl = ref(null)
 function onClickStart() {
   isShowVideo.value = true
   const audioEl = document.getElementById('bg-music')
+  const audioEl2 = document.getElementById('bg-music2')
   nextTick(() => {
     videoEl.value.play()
-    audioEl.play()
+    if (window.location.href.includes('?m=2')) {
+      audioEl2.play()
+      console.log('播放2')
+    } else {
+      audioEl.play()
+      console.log('播放1')
+    }
   })
   setTimeout(() => {
     isShowSkip.value = true
@@ -133,6 +147,8 @@ function onVideoEnd() {
     top: 0;
     transform: translateX(-50%);
     mix-blend-mode: multiply;
+    width: 100%;
+    height: 100%;
   }
 
   >img.title{