站点模式管理优化

application/admin/view/default/site/sitetype.html

@@ -15,6 +15,15 @@
                     <span class="am-panel-title">基础配置</span>
                 </div>
                 <div class="am-panel-bd">
+                    <!-- 提示 -->
+                    <div class="am-alert am-alert-warning am-radius" data-am-alert>
+                        <button type="button" class="am-close">&times;</button>
+                        <p class="am-text-xs">1. 销售型、常规电商流程，用户选择收货地址下单支付 -> 商家发货 -> 确认收货 -> 订单完成</p>
+                        <p class="am-text-xs">2. 展示型、仅展示产品，可发起咨询（不能下单）</p>
+                        <p class="am-text-xs">3. 自提点、下单时选择自提货物地址，用户下单支付 -> 确认提货 -> 订单完成</p>
+                        <p class="am-text-xs">4. 虚拟销售、常规电商流程，用户下单支付 -> 自动发货 -> 确认提货 -> 订单完成</p>
+                    </div>
+
                     <!-- 站点类型 -->
                     <div class="am-form-group">
                         <label>{{$data.common_site_type.name}}<span class="am-form-group-label-tips">{{$data.common_site_type.describe}}</span></label>
@@ -50,7 +59,7 @@
                         {{if !empty($sitetype_address_list) and is_array($sitetype_address_list)}}
                             {{foreach $sitetype_address_list as $address}}
                                 <li>
-                                    <span>{{$address.province_name}} {{$address.city_name}} {{$address.county_name}} {{$address.address}}{{if !empty($address['alias'])}}<span class="am-badge am-radius am-badge-success am-margin-left-xs">{{$address.alias}}</span>{{/if}}</span>
+                                    <span>{{$address.province_name}} {{$address.city_name}} {{$address.county_name}} {{$address.address}}（{{$address.name}}-{{$address.tel}}）{{if !empty($address['alias'])}}<span class="am-badge am-radius am-badge-success am-margin-left-xs">{{$address.alias}}</span>{{/if}}</span>
                                     <span class="am-badge am-radius am-icon-remove delete-submit"> 移除</span>
                                     <span class="am-badge am-radius am-icon-edit edit-submit"> 编辑</span>
                                 </li>

public/static/admin/default/js/site.js

@@ -37,7 +37,7 @@ function AddressModalHandle(data)
 
         // 数据拼接
         var html = '<li>';
-            html += '<span>'+data['province_name']+' '+data['city_name']+' '+data['county_name']+' '+address;
+            html += '<span>'+data['province_name']+' '+data['city_name']+' '+data['county_name']+' '+address+'（'+name+'-'+tel+'）';
             if(alias != null)
             {
                 html += '<span class="am-badge am-radius am-badge-success am-margin-left-xs">'+alias+'</span>';
@@ -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('<option value="">城市</option><option value="'+item['city']+'">'+item['city_name']+'</option>');
-        $('.region-linkage select[name="county"]').html('<option value="">区/县</option><option value="'+item['county']+'">'+item['county_name']+'</option>');
-
         // 数据填充
         FormDataFill(item, 'form.form-validation-address');