diff --git a/app/admin/view/default/region/index.html b/app/admin/view/default/region/index.html
index 169f52a69..9c0d2b737 100755
--- a/app/admin/view/default/region/index.html
+++ b/app/admin/view/default/region/index.html
@@ -22,14 +22,14 @@
@@ -61,6 +61,7 @@
{{include file="lib/is_enable" /}}
diff --git a/app/lang/en.php b/app/lang/en.php
index 15c2973b8..fcef267a1 100644
--- a/app/lang/en.php
+++ b/app/lang/en.php
@@ -1995,14 +1995,10 @@ return [
// 地区
'region' => [
// 表单
- 'form_item_id' => 'Unique Number',
- 'form_item_id_tips' => [
- '1. If left blank, the system will automatically generate',
- '2. Do not modify at will to avoid data confusion',
- ],
- 'form_item_id_message' => 'Please enter a unique number',
'form_item_name' => 'Name',
'form_item_name_message' => 'Name format 2~16 characters',
+ 'form_item_code' => 'Unique code',
+ 'form_item_code_message' => 'Unique code format can be up to 30 characters',
'form_item_lng' => 'Longitude',
'form_item_lng_message' => 'Please fill in the longitude',
'form_item_lat' => 'Latitude',
diff --git a/app/lang/zh.php b/app/lang/zh.php
index c7455c2b9..4b91d37f3 100755
--- a/app/lang/zh.php
+++ b/app/lang/zh.php
@@ -2000,14 +2000,10 @@ return [
// 地区
'region' => [
// 表单
- 'form_item_id' => '唯一编号',
- 'form_item_id_tips' => [
- '1. 留空则系统自动生成',
- '2. 不要随意修改、避免数据错乱',
- ],
- 'form_item_id_message' => '请输入唯一编号',
'form_item_name' => '名称',
'form_item_name_message' => '名称格式2~16个字符',
+ 'form_item_code' => '唯一编码',
+ 'form_item_code_message' => '唯一编码格式最多30个字符',
'form_item_lng' => '经度',
'form_item_lng_message' => '请填写经度',
'form_item_lat' => '纬度',
diff --git a/app/service/RegionService.php b/app/service/RegionService.php
index b40e4221c..c76d70bca 100755
--- a/app/service/RegionService.php
+++ b/app/service/RegionService.php
@@ -84,7 +84,7 @@ class RegionService
public static function RegionNode($params = [])
{
// 数据参数
- $field = empty($params['field']) ? 'id,pid,name,level,letters,lng,lat,sort,is_enable' : $params['field'];
+ $field = empty($params['field']) ? 'id,pid,name,level,letters,code,lng,lat,sort,is_enable' : $params['field'];
$where = empty($params['where']) ? [] : $params['where'];
$order_by = empty($params['order_by']) ? 'sort asc,id asc' : trim($params['order_by']);
@@ -107,7 +107,7 @@ class RegionService
$id = isset($params['id']) ? intval($params['id']) : 0;
// 获取数据
- $field = 'id,pid,name,level,letters,lng,lat,sort,is_enable';
+ $field = 'id,pid,name,level,letters,code,lng,lat,sort,is_enable';
$data = Db::name('Region')->field($field)->where(['pid'=>$id])->order('sort asc,id asc')->select()->toArray();
if(!empty($data))
{
@@ -150,9 +150,10 @@ class RegionService
$data = [
'name' => $params['name'],
'pid' => isset($params['pid']) ? intval($params['pid']) : 0,
+ 'letters' => empty($params['letters']) ? '' : $params['letters'],
+ 'code' => empty($params['code']) ? '' : $params['code'],
'lng' => isset($params['lng']) ? floatval($params['lng']) : 0,
'lat' => isset($params['lat']) ? floatval($params['lat']) : 0,
- 'letters' => empty($params['letters']) ? '' : $params['letters'],
'sort' => isset($params['sort']) ? intval($params['sort']) : 0,
'is_enable' => isset($params['is_enable']) ? intval($params['is_enable']) : 0,
];
@@ -274,7 +275,7 @@ class RegionService
if(empty($data))
{
// 所有一级
- $field = 'id,pid,name';
+ $field = 'id,pid,name,level,letters,code,lng,lat';
$data = self::RegionNode(['field'=>$field,'where'=>[['pid', '=', 0]]]);
if(!empty($data))
{
@@ -359,8 +360,8 @@ class RegionService
// 获取地区
$result = ['province'=>'', 'city'=>'', 'county'=>''];
- $field = 'id,pid,level';
- $region = self::RegionNode(['field'=>$field, 'where'=>[['id', '=', $params['code']]]]);
+ $field = 'id,pid,level,name,code';
+ $region = self::RegionNode(['field'=>$field, 'where'=>[['code', '=', $params['code']]]]);
if(!empty($region) && !empty($region[0]))
{
$arr = [1=>'province', 2=>'city', 3=>'county'];
diff --git a/app/service/UserAddressService.php b/app/service/UserAddressService.php
index c8eec19ba..de3dbb4a9 100644
--- a/app/service/UserAddressService.php
+++ b/app/service/UserAddressService.php
@@ -437,7 +437,7 @@ class UserAddressService
'data_id' => $data_id,
]);
- return DataReturn($status ? MyLang('operate_title') : MyLang('operate_fail'), $status ? 0 : -100);
+ return DataReturn($status ? MyLang('operate_success') : MyLang('operate_fail'), $status ? 0 : -100);
}
/**