From 802a14cda5469f765b5022bec29671319f07e6e7 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 16 Jun 2025 18:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/workers/Worker.php | 2 +-
 application/admin/view/workers/worker/add.html  | 8 ++++++++
 application/admin/view/workers/worker/edit.html | 8 ++++++++
 public/assets/js/backend/workers/worker.js      | 1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/application/admin/controller/workers/Worker.php b/application/admin/controller/workers/Worker.php
index 31a9da7..ed455b1 100644
--- a/application/admin/controller/workers/Worker.php
+++ b/application/admin/controller/workers/Worker.php
@@ -164,7 +164,7 @@ class Worker extends Backend
 
                 $area = Area::getByCode($params['area_id']);
                 if($area){
-                    $location = getLocation($area->merge_name);
+                    $location = getLocation($area->merge_name.' '.$params['address']);
                     if(!empty($location)){
                         $params['lng'] = $location['lng'];
                         $params['lat'] = $location['lat'];
diff --git a/application/admin/view/workers/worker/add.html b/application/admin/view/workers/worker/add.html
index 8be80d2..374bde5 100644
--- a/application/admin/view/workers/worker/add.html
+++ b/application/admin/view/workers/worker/add.html
@@ -20,6 +20,14 @@
             <input id="area_id" style="display: none" class="form-control" name="row[area_id]" hidden type="text" value="" />
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('详细地址')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-address" data-rule="required" class="form-control" name="row[address]" type="text" value="">
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">师傅归属:</label>
         <div class='col-xs-12 col-sm-8'>
diff --git a/application/admin/view/workers/worker/edit.html b/application/admin/view/workers/worker/edit.html
index dd35d03..e01c404 100644
--- a/application/admin/view/workers/worker/edit.html
+++ b/application/admin/view/workers/worker/edit.html
@@ -38,6 +38,14 @@
                value="{$row.area_id}"/>
     </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('详细地址')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-address" data-rule="required" class="form-control" name="row[address]" type="text" value="{$row.address}">
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">师傅归属:</label>
         <div class='col-xs-12 col-sm-8'>
diff --git a/public/assets/js/backend/workers/worker.js b/public/assets/js/backend/workers/worker.js
index 88b958b..b1727cf 100644
--- a/public/assets/js/backend/workers/worker.js
+++ b/public/assets/js/backend/workers/worker.js
@@ -60,6 +60,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'],
                             //{field: 'lng', title: __('Lng'), operate:'BETWEEN'},
                             //{field: 'lat', title: __('Lat'), operate:'BETWEEN'},
                             {field: 'area.short_merge_name', title: __('Area.short_merge_name'), searchable: false},
+                            {field: 'address', title: __('地址'), searchable: false},
                             {field: 'rate', title: '分成'},
                             {field: 'rate_remark', title: '分成备注'},
                             {field: 'remark', title: '备注'},