diff --git a/application/admin/view/default/site/sitetype.html b/application/admin/view/default/site/sitetype.html
index 1de93f15d..7e9834f4e 100644
--- a/application/admin/view/default/site/sitetype.html
+++ b/application/admin/view/default/site/sitetype.html
@@ -15,6 +15,15 @@
基础配置
+
+
+
+
1. 销售型、常规电商流程,用户选择收货地址下单支付 -> 商家发货 -> 确认收货 -> 订单完成
+
2. 展示型、仅展示产品,可发起咨询(不能下单)
+
3. 自提点、下单时选择自提货物地址,用户下单支付 -> 确认提货 -> 订单完成
+
4. 虚拟销售、常规电商流程,用户下单支付 -> 自动发货 -> 确认提货 -> 订单完成
+
+
@@ -50,7 +59,7 @@
{{if !empty($sitetype_address_list) and is_array($sitetype_address_list)}}
{{foreach $sitetype_address_list as $address}}
- {{$address.province_name}} {{$address.city_name}} {{$address.county_name}} {{$address.address}}{{if !empty($address['alias'])}}{{$address.alias}}{{/if}}
+ {{$address.province_name}} {{$address.city_name}} {{$address.county_name}} {{$address.address}}({{$address.name}}-{{$address.tel}}){{if !empty($address['alias'])}}{{$address.alias}}{{/if}}
移除
编辑
diff --git a/public/static/admin/default/js/site.js b/public/static/admin/default/js/site.js
index 369c05451..025c416d6 100644
--- a/public/static/admin/default/js/site.js
+++ b/public/static/admin/default/js/site.js
@@ -37,7 +37,7 @@ function AddressModalHandle(data)
// 数据拼接
var html = '';
- html += ''+data['province_name']+' '+data['city_name']+' '+data['county_name']+' '+address;
+ html += ''+data['province_name']+' '+data['city_name']+' '+data['county_name']+' '+address+'('+name+'-'+tel+')';
if(alias != null)
{
html += ''+alias+'';
@@ -94,6 +94,9 @@ $(function()
$popup.modal();
$popup.attr('data-type', 'add');
+ // 清空数据
+ FormDataFill({"alias":"", "name":"", "tel":"", "address":"", "province":0, "city":0, "county":0, "lng":"", "lat":""}, 'form.form-validation-address');
+
// 地图初始化
MapInit();
});
@@ -139,10 +142,6 @@ $(function()
return false;
}
- // 城市, 区/县数据处理
- $('.region-linkage select[name="city"]').html('');
- $('.region-linkage select[name="county"]').html('');
-
// 数据填充
FormDataFill(item, 'form.form-validation-address');