Merge branch 'master' of http://192.168.0.115:3000/renyicun/NanjingMuseumWuJinZang

src/views/HomeView(点击交互).vue

@@ -328,6 +328,7 @@ const backFu = () => {
     <div
       class="center-text"
       :style="{ opacity: curPageIndex == 3 || curPageIndex == 4 ? 1 : 0 }"
+      :class="{'center-text4': curPageIndex == 4}"
     >
       {{ curCenterTag }}
     </div>
@@ -335,6 +336,7 @@ const backFu = () => {
     <!-- 底部文字介绍 -->
     <div
       class="fixed-desc"
+      :class="{'fixed-desc4': curPageIndex == 4}"
       :style="{ opacity: curPageIndex == 3 || curPageIndex == 4 ? 1 : 0 }"
       v-html="curFixedDesc"
     />
@@ -855,22 +857,22 @@ div {
   }
 
   > .painting-wrap4 {
-    // transform: translate(-57%, -40%) scale(3.2);
-    width: calc(110% * 3.2);
+    // transform: translate(-57%, -40%) scale(4.2);
+    width: calc(110% * 4.2);
     // height: calc(315 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     height: calc(
-      760 * 3.2 / v-bind("windowSizeWhenDesignForRef") *
+      760 * 4.2 / v-bind("windowSizeWhenDesignForRef") *
         v-bind("windowSizeInCssForRef")
     );
-    transform: translate(-53%, -53%);
+    transform: translate(-53%, -50%);
     transform-origin: 50% 50%;
     > .painting-stem {
       width: calc(
-        364 * 3.2 / v-bind("windowSizeWhenDesignForRef") *
+        364 * 4.2 / v-bind("windowSizeWhenDesignForRef") *
           v-bind("windowSizeInCssForRef")
       );
       height: calc(
-        542 * 3.2 / v-bind("windowSizeWhenDesignForRef") *
+        542 * 4.2 / v-bind("windowSizeWhenDesignForRef") *
           v-bind("windowSizeInCssForRef")
       );
     }
@@ -927,6 +929,12 @@ div {
     text-align: justify;
     z-index: 2;
   }
+  > .center-text4{
+    top: calc(
+      630 / v-bind("windowSizeWhenDesignForRef") *
+        v-bind("windowSizeInCssForRef")
+    );
+  }
 
   > .fixed-desc {
     position: absolute;
@@ -963,6 +971,12 @@ div {
         v-bind("windowSizeInCssForRef")
     );
   }
+  > .fixed-desc4{
+    top: calc(
+      645 / v-bind("windowSizeWhenDesignForRef") *
+        v-bind("windowSizeInCssForRef")
+    );
+  }
 
   > .operation-tip {
     position: absolute;

src/views/MoreContent.vue

@@ -169,7 +169,7 @@
 </template>
 
 <script setup>
-import { ref, onBeforeMount, nextTick, onMounted, watch } from "vue"
+import { ref, onBeforeMount, nextTick, onMounted } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import { useStore } from "vuex"
 
@@ -472,7 +472,7 @@ const playVideoFu = (val, flag) => {
         position: absolute;
         bottom: 0;
         height: 100%;
-        transition: all 1s;
+        transition: transform 1s;
       }
       .ROW1_1 {
         z-index: 5;