From f886a38694ad8a414c27cffec16f649cd3bcce85 Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Thu, 15 Apr 2021 19:40:38 +0800
Subject: [PATCH] fix: reset xPos and yPos in seamlessScroll

---
 .../SeamlessScroll/src/SeamlessScroll.vue     | 35 ++++++++--------
 .../components/seamless-scroll/index.vue      | 40 +++++++------------
 2 files changed, 33 insertions(+), 42 deletions(-)

diff --git a/src/components/SeamlessScroll/src/SeamlessScroll.vue b/src/components/SeamlessScroll/src/SeamlessScroll.vue
index 57b0ebccc..e1e6384db 100644
--- a/src/components/SeamlessScroll/src/SeamlessScroll.vue
+++ b/src/components/SeamlessScroll/src/SeamlessScroll.vue
@@ -30,7 +30,7 @@ import {
   ref,
   unref,
   watchEffect,
-  nextTick,
+  nextTick
 } from "vue";
 import { tryOnMounted, tryOnUnmounted, templateRef } from "@vueuse/core";
 import * as utilsMethods from "./utils";
@@ -56,14 +56,14 @@ export default defineComponent({
       type: Array,
       default: () => {
         return [];
-      },
+      }
     },
     classOption: {
       type: Object,
       default: () => {
         return {};
-      },
-    },
+      }
+    }
   },
   emits: ["ScrollEnd"],
   setup(props, { emit }) {
@@ -117,7 +117,7 @@ export default defineComponent({
         switchDelay: 400,
         switchDisabledClass: "disabled",
         // singleWidth/singleHeight 是否开启rem度量
-        isSingleRemUnit: false,
+        isSingleRemUnit: false
       };
     });
 
@@ -138,17 +138,16 @@ export default defineComponent({
       return {
         position: "absolute",
         margin: `${unref(height) / 2}px 0 0 -${unref(options).switchOffset}px`,
-        transform: "translate(-100%,-50%)",
+        transform: "translate(-100%,-50%)"
       };
     });
 
     let rightSwitch = computed(() => {
       return {
         position: "absolute",
-        margin: `${unref(height) / 2}px 0 0 ${
-          unref(width) + unref(options).switchOffset
-        }px`,
-        transform: "translateY(-50%)",
+        margin: `${unref(height) / 2}px 0 0 ${unref(width) +
+          unref(options).switchOffset}px`,
+        transform: "translateY(-50%)"
       };
     });
 
@@ -169,7 +168,7 @@ export default defineComponent({
       return {
         transform: `translate(${unref(xPos)}px,${unref(yPos)}px)`,
         transition: `all ${ease} ${unref(delay)}ms`,
-        overflow: "hidden",
+        overflow: "hidden"
       };
     });
 
@@ -225,6 +224,8 @@ export default defineComponent({
     });
 
     function reset() {
+      xPos.value = 0;
+      yPos.value = 0;
       scrollCancle();
       scrollInitMove();
     }
@@ -265,7 +266,7 @@ export default defineComponent({
       //取第一个touch的坐标值
       startPos = {
         x: touch.pageX,
-        y: touch.pageY,
+        y: touch.pageY
       };
       //记录touchStart时候的posY
       startPosY = unref(yPos);
@@ -280,7 +281,7 @@ export default defineComponent({
         scrollCancle();
       }
     }
-    
+
     function touchMove(e) {
       //当屏幕有多个touch或者页面被缩放过，就不执行move操作
       if (
@@ -293,7 +294,7 @@ export default defineComponent({
       const { direction } = unref(options);
       let endPos = {
         x: touch.pageX - startPos.x,
-        y: touch.pageY - startPos.y,
+        y: touch.pageY - startPos.y
       };
       //阻止触摸事件的默认行为，即阻止滚屏
       e.preventDefault();
@@ -350,7 +351,7 @@ export default defineComponent({
       if (isHover) return;
       //进入move立即先清除动画 防止频繁touchMove导致多动画同时进行
       scrollCancle();
-      reqFrame = requestAnimationFrame(function () {
+      reqFrame = requestAnimationFrame(function() {
         //实际高度
         const h = unref(realBoxHeight) / 2;
         //宽度
@@ -538,8 +539,8 @@ export default defineComponent({
       scrollMove,
       scrollInitMove,
       scrollStartMove,
-      scrollStopMove,
+      scrollStopMove
     };
-  },
+  }
 });
 </script>
diff --git a/src/views/components/seamless-scroll/index.vue b/src/views/components/seamless-scroll/index.vue
index fa817ae37..18209383f 100644
--- a/src/views/components/seamless-scroll/index.vue
+++ b/src/views/components/seamless-scroll/index.vue
@@ -14,7 +14,6 @@
         <ul class="item">
           <li v-for="(item, index) in listData" :key="index">
             <span class="title" v-text="item.title"></span>
-            <span class="date" v-text="item.date"></span>
           </li>
         </ul>
       </SeamlessScroll>
@@ -29,65 +28,56 @@ import { templateRef } from "@vueuse/core";
 import SeamlessScroll from "/@/components/SeamlessScroll";
 export default {
   components: {
-    SeamlessScroll,
+    SeamlessScroll
   },
   setup() {
     const scroll = templateRef<HTMLElement | null>("scroll", null);
 
     let listData = ref([
       {
-        title: "无缝滚动第一行无缝滚动第一行",
-        date: "2021-5-1",
+        title: "无缝滚动第一行无缝滚动第一行！！！！！！！！！！"
       },
       {
-        title: "无缝滚动第二行无缝滚动第二行",
-        date: "2021-5-1",
+        title: "无缝滚动第二行无缝滚动第二行！！！！！！！！！！"
       },
       {
-        title: "无缝滚动第三行无缝滚动第三行",
-        date: "2021-5-1",
+        title: "无缝滚动第三行无缝滚动第三行！！！！！！！！！！"
       },
       {
-        title: "无缝滚动第四行无缝滚动第四行",
-        date: "2021-5-1",
+        title: "无缝滚动第四行无缝滚动第四行！！！！！！！！！！"
       },
       {
-        title: "无缝滚动第五行无缝滚动第五行",
-        date: "2021-5-1",
+        title: "无缝滚动第五行无缝滚动第五行！！！！！！！！！！"
       },
       {
-        title: "无缝滚动第六行无缝滚动第六行",
-        date: "2021-5-1",
+        title: "无缝滚动第六行无缝滚动第六行！！！！！！！！！！"
       },
       {
-        title: "无缝滚动第七行无缝滚动第七行",
-        date: "2021-5-1",
+        title: "无缝滚动第七行无缝滚动第七行！！！！！！！！！！"
       },
       {
-        title: "无缝滚动第八行无缝滚动第八行",
-        date: "2021-5-1",
+        title: "无缝滚动第八行无缝滚动第八行！！！！！！！！！！"
       },
       {
-        title: "无缝滚动第九行无缝滚动第九行",
-        date: "2021-5-1",
-      },
+        title: "无缝滚动第九行无缝滚动第九行！！！！！！！！！！"
+      }
     ]);
 
     let classOption = ref({
-      direction: "top",
+      direction: "top"
     });
 
     function changeDirection(val) {
-      scroll.value.scrollInitMove();
+      scroll.value.reset();
       classOption.value.direction = val;
     }
 
     return {
       listData,
       classOption,
-      changeDirection,
+      changeDirection
     };
-  },
+  }
 };
 </script>