From 27ce40f395d8a6f454d957f2d3299e077306ec6d Mon Sep 17 00:00:00 2001
From: yin5th <541304803@qq.com>
Date: Mon, 9 Jan 2023 17:41:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E8=B5=84=E6=96=99):=20?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controller/api/v1/Worker.php | 8 +-
app/controller/manager/account/Index.php | 2 +-
view/manager/account/index/worker.html | 103 +++++++++++++++++++++++
view/manager/config/base.html | 10 +++
4 files changed, 120 insertions(+), 3 deletions(-)
diff --git a/app/controller/api/v1/Worker.php b/app/controller/api/v1/Worker.php
index 09f3f45..6a2a0e7 100644
--- a/app/controller/api/v1/Worker.php
+++ b/app/controller/api/v1/Worker.php
@@ -24,6 +24,7 @@ use think\Collection;
use think\db\exception\DataNotFoundException;
use think\db\exception\DbException;
use think\db\exception\ModelNotFoundException;
+use think\facade\Config;
use think\facade\Log;
use think\response\Json;
@@ -206,9 +207,12 @@ class Worker extends Base
return $this->json(4003, '完成审核后方可打卡');
}
- $worksite = Worksite::getNearest($input['lng'], $input['lat']);
+ Config::load('extra/base', 'base');
+ $baseConfig = config('base');
+ $signArea = $baseConfig['sign_area'] ?? 200;
+ $worksite = Worksite::getNearest($input['lng'], $input['lat'], $signArea);
if (empty($worksite) || $worksite['id'] != $input['worksite_id']) {
- return $this->json(4004, '定位错误,请在工地200米范围内打卡！');
+ return $this->json(4004, '不在打卡范围！');
}
$time = time();
diff --git a/app/controller/manager/account/Index.php b/app/controller/manager/account/Index.php
index 74cda9c..2f63262 100644
--- a/app/controller/manager/account/Index.php
+++ b/app/controller/manager/account/Index.php
@@ -206,7 +206,7 @@ class Index extends Base
if ($param || $param == '0') {
switch ($key) {
case 'keyword':
- $search[] = ['nickname|real_name|mobile|emergency_contact|emergency_phone|bank_card_name|bank_card_number|bank_name|card_number', 'like', '%'.$param.'%'];
+ $search[] = ['nickname|real_name|mobile|emergency_contact|emergency_phone|bank_card_name|bank_card_number|bank_name|card_number|province|city|area|address_now', 'like', '%'.$param.'%'];
break;
case 'role':
switch ($param) {
diff --git a/view/manager/account/index/worker.html b/view/manager/account/index/worker.html
index b893733..5a5b68c 100644
--- a/view/manager/account/index/worker.html
+++ b/view/manager/account/index/worker.html
@@ -90,6 +90,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+