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

src/components/PaintingDetailBox.vue

@@ -99,7 +99,7 @@ onMounted(() => {
             imgHeight.value = dom.offsetHeight
           }
         }
-      }, 700)
+      }, 600)
       tiemrr.value = setInterval(() => {
         console.log('interval')
         if (zhouMove.value >= 99) clearInterval(tiemrr.value)
@@ -145,7 +145,7 @@ onBeforeUnmount(() => {
       <div
         v-if="isRow === '竖'"
         :class="`imgBox ${isMove ? '' : 'imgBoxMove'}`"
-        :style="`clip-path: rect(0 100% ${zhouMove}% 0);
+        :style="`clip-path: inset(0% 0% ${100 - zhouMove}% 0%);
         transform: translateY(${moveLoc}px);
         padding: ${route.query.idx == '17' ? '25% 3% 8% 3%' :route.query.idx == '19' ? '28% 3% 9% 3%': route.query.idx == '11' ? '20% 3% 7% 3%': route.query.idx == '4' ? '24% 3% 8% 3%': route.query.idx == '9' ? '17% 3% 6% 3%': props.idx == 'home' ? '12% 3% 4% 3%' : ''}
         `"
@@ -172,7 +172,7 @@ onBeforeUnmount(() => {
       <div
         v-else
         :class="`imgBoxHH ${isMove ? '' : 'imgBoxHHMove'}`"
-        :style="`clip-path: rect(0 ${zhouMove}% 100% 0);
+        :style="`clip-path: inset(0% ${100 - zhouMove}%  0% 0%);
         transform: translateX(${moveLoc}px) translateY(-50%)
         `"
         @mousedown="isFlag = true"

src/views/BambooBookView.vue

@@ -65,7 +65,7 @@ const handleWheel = (val) => {
     return
   }
   const scrollAmount = 50
-  isShowClickTip.value = false
+  // isShowClickTip.value = false
   if (val == -1) {
     rowScroller.value.scrollLeft -= scrollAmount
   } else {
@@ -167,14 +167,14 @@ onMounted(() => {
         class="painting-detail-box"
         @wheel="($event) => handleScroll($event, (val) => handleWheel(val))"
       >
-        <OperationTip
+        <!-- <OperationTip
           v-show="isShowClickTip"
           class="operation-tip-click"
           :text="'点击查看'"
           color="green"
           type="click"
           @click="() => (isShowClickTip = false)"
-        />
+        /> -->
         <div
           v-for="(category, index1) in paintingData"
           :key="index1"
@@ -190,9 +190,8 @@ onMounted(() => {
             v-for="(item, index2) in category.items"
             :key="index2"
             class="category-item"
-            @click="isShowClickTip = false, isShowBigView = true"
           >
-            <el-image
+            <!-- <el-image
               class="small-img"
               :src="`${$env.BASE_URL}configMultiMedia/zhupuImages/${
                 item['图片名称'] ? item['图片名称'] : item['名称']
@@ -206,12 +205,11 @@ onMounted(() => {
               z-index="100"
               :hide-on-click-modal="true"
               @close="handleClose"
-            />
-
-            <!-- <img
+            /> -->
+            <img
               :src="`${$env.BASE_URL}configMultiMedia/zhupuImages/${item['图片名称'] ? item['图片名称'] : item['名称']}.png`"
               alt=""
-            > -->
+            >
             <div>{{ item["名称"] }}</div>
           </div>
         </div>

src/views/HomeView.vue

@@ -14,6 +14,9 @@ import DetailImgAc from '@/assets/images/icon_home_detail-min-ac.png'
 import AuthorImg from '@/assets/images/icon_home_author-min.png'
 import AuthorImgAc from '@/assets/images/icon_home_author-min-ac.png'
 
+import useSizeAdapt from "@/useFunctions/useSizeAdapt"
+
+
 
 const store = useStore()
 const router = useRouter()
@@ -98,6 +101,11 @@ const scrollFu = (event, val) => {
   }
 }
 const hoverIndex = ref(null)
+
+const {
+  windowSizeInCssForRef,
+  windowSizeWhenDesignForRef,
+} = useSizeAdapt()
 onMounted(() => {
   if (route.query.page) {
     curPageIndex.value = parseInt(route.query.page)
@@ -379,7 +387,7 @@ onMounted(() => {
     position: absolute;
     top: 0;
     z-index: 10;
-    // opacity: 1;
+    opacity: 0.001;
     .scroller-content {
       width: 100%;
       height: 200vh;
@@ -475,8 +483,16 @@ onMounted(() => {
     left: 50%;
     top: 50%;
     width: 551.84px;
+    // height: calc(
+    //     941 / v-bind("windowSizeWhenDesignForRef") *
+    //       v-bind("windowSizeInCssForRef")
+    // );
     // height: 937.05px;
-    height: 100%;
+    height: 97%;
+    // height: calc(
+    //     961 / v-bind("windowSizeWhenDesignForRef") *
+    //       v-bind("windowSizeInCssForRef")
+    //   );
     // background: green;
     transform: translate(-50%, -50%);
     z-index: 1;
@@ -490,14 +506,14 @@ onMounted(() => {
 
     > .painting-stem {
       width: 80%;
-      // height: 75%;
-      height: calc(
-        371 / v-bind("windowSizeWhenDesignForRef") *
-          v-bind("windowSizeInCssForRef")
-      );
+      height: 74%;
+      // height: calc(
+      //   671 / v-bind("windowSizeWhenDesignForRef") *
+      //     v-bind("windowSizeInCssForRef")
+      // );
       position: absolute;
       left: 50%;
-      transform: translate(-50%, 22%);
+      transform: translate(-50%, 24%);
       transition: opacity 1.5s ease;
     }
   }
@@ -522,7 +538,11 @@ onMounted(() => {
     transform: translate(-46%, -50%);
     width: 551.84px;
     // height: 937.05px;
-    height: 100%;
+    // height: 100%;
+    height: calc(
+        941 / v-bind("windowSizeWhenDesignForRef") *
+          v-bind("windowSizeInCssForRef")
+      );
     z-index: 7;
     pointer-events: none;
     will-change: transform;

src/views/HotspotDetail1.vue

@@ -18,11 +18,13 @@
     >
       <img
         class=""
-        :src="require(`@/assets/images/icon_operation_click_white.png`)"
+        :src="require(`@/assets/images/icon_operation_click_green2.png`)"
         alt=""
         draggable="false"
       >
-      <div>点击查看</div>
+      <div style="color: #7B916B;">
+        点击查看
+      </div>
     </div>
 
     <!-- 右边三个画 -->
@@ -285,14 +287,14 @@ const imgBottomLoc = (nowId, itemId) => {
   .HD1_2 {
     position: absolute;
     z-index: 11;
-    right: calc(12% + 576px);
-    bottom: calc(80vh - 37%);
+    right: calc(26vw);
+    bottom: calc(30vh);
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
     & > img {
-      width: 40px;
+      width: 50px;
     }
     & > div {
       margin-top: 5px;
@@ -300,7 +302,7 @@ const imgBottomLoc = (nowId, itemId) => {
       font-family: KaiTi;
       color: #fff;
       white-space: nowrap;
-
+      font-size: 20px
     }
   }
   .HD1_2Hide {

src/views/StartupView.vue

@@ -19,6 +19,18 @@
       draggable="false"
     >
 
+    <!-- <video
+      class="bg-serial-frames"
+      width="100%"
+      height="100%"
+
+      src="@/assets/images/loding_apng.webm"
+      muted
+      autoplay
+      alt=""
+      draggable="false"
+    /> -->
+
     <img
       class="title"
       src="@/assets/images/startup-title.png"
@@ -148,6 +160,7 @@ function onVideoEnd() {
     mix-blend-mode: multiply;
     width: 100%;
     height: 100%;
+    object-fit: cover;
   }
 
   >img.title{