From f4879463a94c586385a59b25feca01cc861b7da7 Mon Sep 17 00:00:00 2001
From: linju <linju@dcloud.io>
Date: Thu, 31 Aug 2023 14:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20drop-card=20=E7=AE=80=E5=8C=96=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=8D=A1=E7=89=87=E4=BD=8D=E7=BD=AE=EF=BC=88=E5=B8=A7?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB=EF=BC=89=E7=9A=84=E5=87=BD=E6=95=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/template/drop-card/card/card.uvue | 61 +++++++++++--------------
 1 file changed, 27 insertions(+), 34 deletions(-)

diff --git a/pages/template/drop-card/card/card.uvue b/pages/template/drop-card/card/card.uvue
index e66d9caf..cf52e274 100644
--- a/pages/template/drop-card/card/card.uvue
+++ b/pages/template/drop-card/card/card.uvue
@@ -56,19 +56,19 @@
           screenHeight = e.screenHeight;
         }
       })
-      
+
       // TODO 需要延迟设置才能生效
       setTimeout(()=>{
         this.setINodeStyle('card','height', screenHeight * 0.7 + 'px');
         this.setINodeStyle('card-img','height', screenHeight * 0.7 + 'px');
         this.initCardStyle()
       },200)
-      
+
       uni.$on('uni-drop-card-float',()=>{
         this.floatCount ++
         this.initCardStyle()
       })
-      
+
     },
     methods: {
       initCardStyle(){
@@ -119,7 +119,7 @@
           return // 浮动动画进行中
         }
         floating = true
-    
+
         // 设置释放之后飘走的方向 0回到坐标中心 1向右 2向左
         let k:number = 0;
         if (this.x > screenWidth / 10 ) {
@@ -127,60 +127,53 @@
         }else if(this.x < screenWidth * -1 / 10){
           k = -1
         }
-        
-        function cardTo(x:number,y:number,callback: () => void,s:number = 10){
-          // console.log('s',s);
-          // console.log('--cardTo---',x,y);
+
+        function cardTo(x:number,y:number,callback: () => void,speed:number = 10){
           let interval:number = 0
-          let _k:number = 1
+          let acceleration:number = 1
           interval = setInterval(()=>{
             // 加速度
-            _k += 0.2
-            
+            acceleration += 0.2
+
             const dx = x - this.x
-            if(this.x.toInt() != x){
-              this.x += dx/s*_k
-              // console.log('dx/s*_k',dx/s*_k)
-              if(Math.abs(dx) < 3){
-                this.x = x
-              }
+            if(Math.abs(dx) < 1){
+              this.x = x
+            }else{
+              this.x += dx/speed*acceleration
             }
+
             const dy = y - this.y
-            if(this.y.toInt() != y){
-              this.y += dy/s*_k
-              // console.log('dy/s*_k',dy/s*_k)
-              if(Math.abs(dy) < 3){
-                this.y = y
-              }
+            if(Math.abs(dy) < 1){
+              this.y = y
+            }else{
+              this.y += dy/speed*acceleration
             }
-            // console.log('this.x',this.x,'this.y',this.y);
-            // console.log('x',x,'y',y);
-            
+
             this.moveCard()
-            if( this.x.toInt() == x.toInt() && this.y.toInt() == y.toInt()){
+            if( this.x == x && this.y == y){
               clearInterval(interval)
               callback()
-            } 
+            }
           },16)
         }
-        
+
         if(k.toInt() != 0){
           cardTo(k * screenWidth * 1.3, this.y * 3,()=>{
             //  状态图标变回透明
             this.setINodeStyle("state-icon-like",'opacity', 0)
             this.setINodeStyle("state-icon-dislike",'opacity', 0)
-            
+
             // 设置为透明，防止飘回时因为 margin-top 太高，露出来
             this.setINodeStyle("card",'opacity', 0)
             setTimeout(()=>{
               this.setINodeStyle("card",'opacity', 1)
             },300)
-            
+
             // 执行卡片飘动后事件，注意uni.$emit是全局事件。其他卡片也会执行
-            uni.$emit('uni-drop-card-float',null) 
+            uni.$emit('uni-drop-card-float',null)
             floating = false
           },8)
-        }else{ 
+        }else{
           const _x:number = this.x
           const _y:number = this.y
           cardTo( (_x*-0.05).toInt() , (_y*-0.05).toInt() ,()=>{
@@ -246,4 +239,4 @@
     box-shadow: 0 0 1px #EBEBEB;
     opacity: 0;
   }
-</style>
\ No newline at end of file
+</style>
-- 
GitLab