shaogen1995 hai 1 ano
pai
achega
984c4acdb8
Modificáronse 2 ficheiros con 45 adicións e 28 borrados
  1. 44 27
      src/views/MoreContent.vue
  2. 1 1
      src/views/PaintingDetail.vue

+ 44 - 27
src/views/MoreContent.vue

@@ -1,7 +1,6 @@
 <template>
   <div
-    v-if="isReady"
-    class="more-content"
+    :class="`more-content`"
   >
     <div
       ref="scrollTarget"
@@ -535,9 +534,8 @@ const maxTranslateLength = computed(() => {
   return (windowHeight.value * windowWidthDesign) / windowHeightDesign
 })
 
-
 const positionNumInit = computed(() => {
-  console.log('x=', windowWidth.value / windowHeight.value)
+  console.log("x=", windowWidth.value / windowHeight.value)
   return windowWidth.value / windowHeight.value >= 0.5 ? 236 : 206
 })
 
@@ -651,15 +649,21 @@ function onClickShuangGouEntry() {
 const videoFadeAtMoZhuEl = ref(null)
 const isShowVideoFadeAtMoZhu = ref(false)
 function onClickEntryAtMoZhu(pathName) {
-  isShowVideoFadeAtMoZhu.value = true
-  nextTick(() => {
-    videoFadeAtMoZhuEl.value.addEventListener("ended", () => {
-      router.push({
-        name: pathName,
+  if (pathName === "PoemList") {
+    isShowVideoFadeAtMoZhu.value = true
+    nextTick(() => {
+      videoFadeAtMoZhuEl.value.addEventListener("ended", () => {
+        router.push({
+          name: pathName,
+        })
       })
+      videoFadeAtMoZhuEl.value.play()
     })
-    videoFadeAtMoZhuEl.value.play()
-  })
+  } else {
+    router.push({
+      name: pathName,
+    })
+  }
 }
 
 const videoFadeAtPage3El = ref(null)
@@ -682,7 +686,7 @@ watch(goingToAnchorIdx, (v) => {
   }
 })
 
-const isReady = ref(false)
+// const isReady = ref(false)
 
 onBeforeMount(() => {
   window.addEventListener("resize", () => {
@@ -695,9 +699,9 @@ onBeforeMount(() => {
       }
     }, 100)
   })
-  setTimeout(() => {
-    isReady.value = true
-  }, 500)
+  // setTimeout(() => {
+  //   isReady.value = true
+  // }, 500)
 })
 
 onMounted(() => {
@@ -741,6 +745,7 @@ onMounted(() => {
 }
 
 .more-content {
+  background-color: #fefefe;
   position: absolute;
   left: 0;
   top: 0;
@@ -889,39 +894,47 @@ onMounted(() => {
         );
         height: 100%;
       }
-
     }
 
-    >.layer-3 {
+    > .layer-3 {
       position: absolute;
       height: 100%;
 
-      >.bamboo-3_01 {
+      > .bamboo-3_01 {
         position: absolute;
         top: 0;
         height: 100%;
-        left: calc(480px * v-bind('layer3SpeedFactor') * v-bind('windowHeight') / v-bind('windowHeightDesign'));
+        left: calc(
+          480px * v-bind("layer3SpeedFactor") * v-bind("windowHeight") /
+            v-bind("windowHeightDesign")
+        );
       }
 
-      >.bamboo-3_02 {
+      > .bamboo-3_02 {
         position: absolute;
         top: 0;
         height: 100%;
-        left: calc(880px * v-bind('windowHeight') / v-bind('windowHeightDesign'));
+        left: calc(
+          880px * v-bind("windowHeight") / v-bind("windowHeightDesign")
+        );
       }
 
-      >.bamboo-3_03 {
+      > .bamboo-3_03 {
         position: absolute;
         top: 0;
         height: 100%;
-        left: calc(1290px * v-bind('windowHeight') / v-bind('windowHeightDesign'));
+        left: calc(
+          1290px * v-bind("windowHeight") / v-bind("windowHeightDesign")
+        );
       }
 
-      >.bamboo-3_04 {
+      > .bamboo-3_04 {
         position: absolute;
         top: 0;
         height: 100%;
-        left: calc(867px * v-bind('windowHeight') / v-bind('windowHeightDesign'));
+        left: calc(
+          867px * v-bind("windowHeight") / v-bind("windowHeightDesign")
+        );
       }
     }
 
@@ -939,7 +952,7 @@ onMounted(() => {
         );
       }
 
-      >.bamboo-2_03 {
+      > .bamboo-2_03 {
         display: none;
         position: absolute;
         top: 0;
@@ -1113,7 +1126,9 @@ onMounted(() => {
         position: absolute;
         top: 0;
         height: 100%;
-        left: calc(433px * v-bind('windowHeight') / v-bind('windowHeightDesign'));
+        left: calc(
+          433px * v-bind("windowHeight") / v-bind("windowHeightDesign")
+        );
       }
 
       > .mo-zhu-group {
@@ -1466,4 +1481,6 @@ onMounted(() => {
     }
   }
 }
+
+
 </style>

+ 1 - 1
src/views/PaintingDetail.vue

@@ -790,7 +790,7 @@ function showBigPainting() {
           position: absolute;
           bottom: 0;
           left: 0;
-          width: auto;
+          width: 100%;
         }
       }
     }