diff --git a/application/admin/controller/Useraddress.php b/application/admin/controller/Useraddress.php
index 1e7d474ed..7d52e35e4 100644
--- a/application/admin/controller/Useraddress.php
+++ b/application/admin/controller/Useraddress.php
@@ -70,6 +70,9 @@ class UserAddress extends Common
         ];
         $ret = UserAddressService::UserAddressAdminList($data_params);
 
+        // 加载百度地图api
+        $this->assign('is_load_baidu_map_api', 1);
+
         // 基础参数赋值
         $this->assign('params', $this->data_request);
         $this->assign('page_html', $page->GetPageHtml());
diff --git a/application/admin/controller/Warehouse.php b/application/admin/controller/Warehouse.php
index b9ccff7ee..f717e33ff 100644
--- a/application/admin/controller/Warehouse.php
+++ b/application/admin/controller/Warehouse.php
@@ -58,10 +58,13 @@ class Warehouse extends Common
             'where'         => $this->form_where,
         ];
         $ret = WarehouseService::WarehouseList($data_params);
+        $this->assign('data_list', $ret['data']);
+
+        // 加载百度地图api
+        $this->assign('is_load_baidu_map_api', 1);
 
         // 基础参数赋值
         $this->assign('params', $this->data_request);
-        $this->assign('data_list', $ret['data']);
         return $this->fetch();
     }
 
diff --git a/application/admin/form/Useraddress.php b/application/admin/form/Useraddress.php
index 73222f914..25a15a90a 100644
--- a/application/admin/form/Useraddress.php
+++ b/application/admin/form/Useraddress.php
@@ -46,7 +46,6 @@ class UserAddress
                 'is_delete'     => 1,
                 'delete_url'    => MyUrl('admin/useraddress/delete'),
                 'delete_key'    => 'ids',
-                'detail_title'  => '基础信息',
             ],
             // 表单配置
             'form' => [
diff --git a/application/admin/form/Warehouse.php b/application/admin/form/Warehouse.php
index 043bf9909..a25419ea3 100644
--- a/application/admin/form/Warehouse.php
+++ b/application/admin/form/Warehouse.php
@@ -50,7 +50,6 @@ class Warehouse
                 'is_delete'     => 1,
                 'delete_url'    => MyUrl('admin/warehouse/delete'),
                 'delete_key'    => 'ids',
-                'detail_title'  => '基础信息',
             ],
             // 表单配置
             'form' => [
diff --git a/application/admin/view/default/useraddress/detail.html b/application/admin/view/default/useraddress/detail.html
index 2edc34102..06eeee457 100644
--- a/application/admin/view/default/useraddress/detail.html
+++ b/application/admin/view/default/useraddress/detail.html
@@ -1,31 +1,2 @@
 <!-- 继承公共的 form -->
-{{extend name="public/module/detail" /}}
-
-<!-- 重写数据模块 -->
-{{block name="detail_data"}}
-    <!-- 父级内容 -->
-    {__block__}
-    
-    <!-- 地图位置 -->
-    <div class="am-panel am-panel-default">
-        <div class="am-panel-hd">地图位置</div>
-        <div class="am-panel-bd">
-            {{if !empty($data['lng']) and !empty($data['lat'])}}
-                <div id="map" data-level="17" class="am-margin-top-xs"></div>
-            {{else /}}
-                <div class="table-no"><i class="am-icon-warning"></i> 未配置</div>
-            {{/if}}
-        </div>
-    </div>
-{{/block}}
-
-<!-- 底部内容重写 -->
-{{block name="form_page_bottom"}}
-    <script type="text/javascript">
-    $(function()
-    {
-        // 百度地图初始化
-        MapInit({{if !empty($data['lng'])}}{{$data['lng']}}{{else /}}116.400244{{/if}},{{if !empty($data['lat'])}}{{$data['lat']}}{{else /}}39.92556{{/if}}, null, null, false);
-    });
-    </script>
-{{/block}}
\ No newline at end of file
+{{extend name="public/module/detail" /}}
\ No newline at end of file
diff --git a/application/admin/view/default/useraddress/module/position.html b/application/admin/view/default/useraddress/module/position.html
index e7da4ff8a..92afe207c 100644
--- a/application/admin/view/default/useraddress/module/position.html
+++ b/application/admin/view/default/useraddress/module/position.html
@@ -1,7 +1,12 @@
 <!--  经纬度 -->
 {{if !empty($module_data['lng'])}}
-    <p><span class="am-badge am-radius">经度</span> {{$module_data.lng}}</p>
+    <p><span>经度：</span>{{$module_data.lng}}</p>
 {{/if}}
 {{if !empty($module_data['lat'])}}
-    <p class="am-margin-top-xs"><span class="am-badge am-radius">纬度</span> {{$module_data.lat}}</p>
+    <p class="am-margin-top-xs"><span>纬度：</span>{{$module_data.lat}}</p>
+{{/if}}
+{{if !empty($module_data['lng']) and !empty($module_data['lat'])}}
+    <div class="am-margin-top-xs">
+        <button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$module_data.lng}}" data-lat="{{$module_data.lat}}"> 查看位置</button>
+    </div>
 {{/if}}
\ No newline at end of file
diff --git a/application/admin/view/default/warehouse/detail.html b/application/admin/view/default/warehouse/detail.html
index 85f2d6e0d..06eeee457 100644
--- a/application/admin/view/default/warehouse/detail.html
+++ b/application/admin/view/default/warehouse/detail.html
@@ -1,31 +1,2 @@
 <!-- 继承公共的 form -->
-{{extend name="public/module/detail" /}}
-
-<!-- 重写数据模块 -->
-{{block name="detail_data"}}
-    <!-- 父级内容 -->
-    {__block__}
-    
-    <!-- 地图 -->
-    <div class="am-panel am-panel-default">
-        <div class="am-panel-hd">地图</div>
-        <div class="am-panel-bd">
-            {{if !empty($data['lng']) and !empty($data['lat'])}}
-                <div id="map" data-level="17" class="am-margin-top-xs"></div>
-            {{else /}}
-                <div class="table-no"><i class="am-icon-warning"></i> 未配置</div>
-            {{/if}}
-        </div>
-    </div>
-{{/block}}
-
-<!-- 底部内容重写 -->
-{{block name="form_page_bottom"}}
-    <script type="text/javascript">
-    $(function()
-    {
-        // 百度地图初始化
-        MapInit({{if !empty($data['lng'])}}{{$data['lng']}}{{else /}}116.400244{{/if}},{{if !empty($data['lat'])}}{{$data['lat']}}{{else /}}39.92556{{/if}}, null, null, false);
-    });
-    </script>
-{{/block}}
\ No newline at end of file
+{{extend name="public/module/detail" /}}
\ No newline at end of file
diff --git a/application/admin/view/default/warehouse/module/position.html b/application/admin/view/default/warehouse/module/position.html
index e7da4ff8a..92afe207c 100644
--- a/application/admin/view/default/warehouse/module/position.html
+++ b/application/admin/view/default/warehouse/module/position.html
@@ -1,7 +1,12 @@
 <!--  经纬度 -->
 {{if !empty($module_data['lng'])}}
-    <p><span class="am-badge am-radius">经度</span> {{$module_data.lng}}</p>
+    <p><span>经度：</span>{{$module_data.lng}}</p>
 {{/if}}
 {{if !empty($module_data['lat'])}}
-    <p class="am-margin-top-xs"><span class="am-badge am-radius">纬度</span> {{$module_data.lat}}</p>
+    <p class="am-margin-top-xs"><span>纬度：</span>{{$module_data.lat}}</p>
+{{/if}}
+{{if !empty($module_data['lng']) and !empty($module_data['lat'])}}
+    <div class="am-margin-top-xs">
+        <button type="button" class="am-btn am-btn-success am-btn-xs am-radius am-icon-map-marker am-padding-xs submit-map-popup" data-lng="{{$module_data.lng}}" data-lat="{{$module_data.lat}}"> 查看位置</button>
+    </div>
 {{/if}}
\ No newline at end of file