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 @@ + +
+ +
+ +
+
+
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}"/>
+ +
+ +
+ +
+
+
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: '备注'},