From e44a0c0951abb800a6993cb63a8d12824b4a97ac Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 22 Sep 2023 16:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/RemoteController.php | 4 ++--
 app/api/controller/TaskController.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/RemoteController.php b/app/api/controller/RemoteController.php
index 565d09a62..e295cd0d7 100644
--- a/app/api/controller/RemoteController.php
+++ b/app/api/controller/RemoteController.php
@@ -208,6 +208,7 @@ class RemoteController extends BaseApiController
     /**
      * 
      * 计算两点之间的距离
+     * 返回米
      */
     function calculateDistance($longitude1, $latitude1, $longitude2, $latitude2)
     {
@@ -220,7 +221,6 @@ class RemoteController extends BaseApiController
             cos(deg2rad($latitude1)) * cos(deg2rad($latitude2)) *
             sin($dLon / 2) * sin($dLon / 2);
         $c = 2 * asin(sqrt($a));
-
-        return $earthRadius * $c * 100;
+        return round($earthRadius * $c*1000) ;
     }
 }
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index ac38c041e..3646928ae 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -183,7 +183,7 @@ class TaskController extends BaseApiController
             Task::where('id', $parmas['id'])->update($data);
             return $this->success('更新成功');
         }
-        return $this->fail('定位坐标大于100米，请重新打卡');
+        return $this->fail('定位坐标大于100米，请重新打卡。'.$res.'米');
     }
 
     public function informationg_list()