sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

地区优化

feat/task1-c-wallet
gongfuxiang 2023-03-13 11:17:11 +08:00
parent c1679d5528
commit 718804ef33
5 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/admin/view/default/region/index.html
View File

@ -22,14 +22,14 @@
<div class="am-cf">
<div class="am-u-sm-6 am-padding-horizontal-0">
<div class="am-form-group">
<label>{{:MyLang('common_service.region.form_item_id')}}{{if is_array(MyLang('common_service.region.form_item_id_tips'))}}<a href="javascript:;" class="am-icon-question-circle am-text-warning am-margin-left-sm" data-am-popover="{content: '{{:implode('<br />', MyLang('common_service.region.form_item_id_tips'))}}', trigger: 'hover focus', theme: 'sm'}"></a>{{/if}}</label>
<input type="text" placeholder="{{:MyLang('common_service.region.form_item_id')}}" name="id" maxlength="16" data-validation-message="{{:MyLang('common_service.region.form_item_id_message')}}" class="am-radius" />
<label>{{:MyLang('common_service.region.form_item_name')}}<span class="am-form-group-label-tips-must">*</span></label>
<input type="text" placeholder="{{:MyLang('common_service.region.form_item_name_message')}}" name="name" minlength="2" maxlength="16" data-validation-message="{{:MyLang('common_service.region.form_item_name_message')}}" class="am-radius" required />
</div>
</div>
<div class="am-u-sm-6 am-padding-horizontal-0">
<div class="am-form-group">
<label>{{:MyLang('common_service.region.form_item_name')}}<span class="am-form-group-label-tips-must">*</span></label>
<input type="text" placeholder="{{:MyLang('common_service.region.form_item_name_message')}}" name="name" minlength="2" maxlength="16" data-validation-message="{{:MyLang('common_service.region.form_item_name_message')}}" class="am-radius" required />
<label>{{:MyLang('common_service.region.form_item_code')}}</label>
<input type="text" placeholder="{{:MyLang('common_service.region.form_item_code')}}" name="code" maxlength="30" data-validation-message="{{:MyLang('common_service.region.form_item_code_message')}}" class="am-radius" />
</div>
</div>
</div>
@ -61,6 +61,7 @@
{{include file="lib/is_enable" /}}
<div class="am-form-popup-submit">
<input type="hidden" name="id" value="0" />
<input type="hidden" name="pid" value="0" />
<button type="submit" class="am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block" data-am-loading="{loadingText:'{{:MyLang('processing_tips')}}'}">{{:MyLang('save_title')}}</button>
</div>

8
app/lang/en.php
View File

@ -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',

8
app/lang/zh.php
View File

@ -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' => '纬度',

13
app/service/RegionService.php
View File

@ -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'];

2
app/service/UserAddressService.php
View File

@ -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);
}
/**