diff --git a/application/admin/view/default/site/siteset/extends.html b/application/admin/view/default/site/siteset/extends.html
index 5a5a59012..9c2703767 100644
--- a/application/admin/view/default/site/siteset/extends.html
+++ b/application/admin/view/default/site/siteset/extends.html
@@ -91,6 +91,15 @@
                             {{/foreach}}
                         </select>
                     </div>
+
+                    <div class="am-form-group">
+                        <label>{{$data.home_extraction_address_position.name}}<span class="am-form-group-label-tips">{{$data.home_extraction_address_position.describe}}</span></label>
+                        <select name="{{$data.home_extraction_address_position.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_extraction_address_position.error_tips}}" required>
+                            {{foreach $common_close_open_list as $v}}
+                                <option value="{{$v.value}}" {{if isset($data['home_extraction_address_position']['value']) and $data['home_extraction_address_position']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
                 </div>
             </div>
 
diff --git a/application/admin/view/default/site/siteset/order.html b/application/admin/view/default/site/siteset/order.html
index 713ad610d..ab7e38085 100644
--- a/application/admin/view/default/site/siteset/order.html
+++ b/application/admin/view/default/site/siteset/order.html
@@ -22,15 +22,6 @@
                 </select>
             </div>
 
-            <div class="am-form-group">
-                <label>{{$data.home_buy_extraction_address_position.name}}<span class="am-form-group-label-tips">{{$data.home_buy_extraction_address_position.describe}}</span></label>
-                <select name="{{$data.home_buy_extraction_address_position.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_buy_extraction_address_position.error_tips}}" required>
-                    {{foreach $common_close_open_list as $v}}
-                        <option value="{{$v.value}}" {{if isset($data['home_buy_extraction_address_position']['value']) and $data['home_buy_extraction_address_position']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
-                    {{/foreach}}
-                </select>
-            </div>
-
             <div class="am-form-group am-form-group-refreshing am-margin-top-lg am-padding-left-0">
                 <input type="hidden" name="nav_type" value="{{$nav_type}}" />
                 <input type="hidden" name="view_type" value="{{$view_type}}" />
diff --git a/sourcecode/weixin/default/app.json b/sourcecode/weixin/default/app.json
index de7123709..b8f09ae13 100755
--- a/sourcecode/weixin/default/app.json
+++ b/sourcecode/weixin/default/app.json
@@ -50,7 +50,7 @@
     "pages/plugins/distribution/extraction/extraction",
     "pages/plugins/distribution/extraction-apply/extraction-apply",
     "pages/plugins/distribution/extraction-order/extraction-order",
-    "pages/plugins/distribution/extraction-switch//extraction-switch",
+    "pages/plugins/distribution/extraction-switch/extraction-switch",
     "pages/plugins/distribution/introduce/introduce",
     "pages/plugins/wallet/user/user",
     "pages/plugins/wallet/recharge/recharge",
diff --git a/sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.js b/sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.js
index 7a46477af..9d0cbcf4a 100644
--- a/sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.js
+++ b/sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.js
@@ -24,7 +24,7 @@ Page({
     wx.removeStorage({key: this.data.user_location_cache_key});
 
     // 是否获取位置
-    if((this.data.params.is_buy || 0) == 1 && this.data.home_buy_extraction_address_position == 1)
+    if(this.data.home_buy_extraction_address_position == 1)
     {
       wx.navigateTo({
         url: '/pages/common/open-setting-location/open-setting-location'
@@ -73,6 +73,22 @@ Page({
     }
   },
 
+  // 地址信息初始化
+  user_location_init() {
+    var result = wx.getStorageSync(this.data.user_location_cache_key) || null;
+    var data = null;
+    if (result != null)
+    {
+      data = {
+        name: result.name || null,
+        address: result.address || null,
+        lat: result.latitude || null,
+        lng: result.longitude || null
+      }
+    }
+    this.setData({user_location: data});
+  },
+
   // 获取数据列表
   get_data_list() {
     // 加载loding