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

src/components/PaintingDetailBox.vue

@@ -68,6 +68,11 @@ const mousemoveFu = (e, flag) => {
 
 let resizeObserver = null
 
+
+let baseFlag = true
+
+let timeccc = -1
+
 onMounted(() => {
   const element = document.querySelector('#myElement')
 
@@ -80,14 +85,17 @@ onMounted(() => {
       pageHeight.value = pageHeightWindow
 
       moveLoc.value = 0
-      setTimeout(() => {
+
+      clearTimeout(timeccc)
+
+      timeccc = setTimeout(() => {
         if (isRow.value === "竖") {
           const dom = document.querySelector(".imgBox")
           if (dom && ( dom.offsetHeight > pageHeightWindow)) {
             isMove.value = true
             imgWidth.value = dom.offsetWidth
             imgHeight.value = dom.offsetHeight
-          }
+          } else isMove.value = false
         } else {
           const leftBoxWidthDom = document.querySelector(".leftBxo")
           const leftBoxWidthDomWidth = leftBoxWidthDom.offsetWidth
@@ -99,7 +107,12 @@ onMounted(() => {
             imgHeight.value = dom.offsetHeight
           }
         }
-      }, 600)
+        baseFlag = false
+      }, baseFlag ? 600 : 30)
+      clearInterval(tiemrr.value)
+
+      if (zhouMove.value >= 100) return
+
       tiemrr.value = setInterval(() => {
         console.log('interval')
         if (zhouMove.value >= 99) clearInterval(tiemrr.value)
@@ -347,6 +360,7 @@ onBeforeUnmount(() => {
       .smImgBoxMain {
         overflow: hidden;
         position: relative;
+        transition: all .3s;
         .smBoxBor {
           cursor: grab;
           position: absolute;
@@ -370,9 +384,9 @@ onBeforeUnmount(() => {
       }
     }
   }
-  .leftBxoCenter {
-    display: flex;
-    align-items: center;
-  }
+  // .leftBxoCenter {
+  //   display: flex;
+  //   align-items: center;
+  // }
 }
 </style>