diff --git a/application/admin/controller/Site.php b/application/admin/controller/Site.php
index 9d521465829c92cf5581a01a6582b8fc99466427..54ac495c6cfa434afc47d59a1c067de8a2faba73 100755
--- a/application/admin/controller/Site.php
+++ b/application/admin/controller/Site.php
@@ -117,6 +117,9 @@ class Site extends Common
 	 */
 	public function Save()
 	{
+		// 参数
+		$params = $_POST;
+
 		// 导航
 		$nav_type = input('nav_type', 'base');
 
@@ -150,6 +153,25 @@ class Site extends Common
 			case 'imagesverify' :
 				$field_list[] = 'common_images_verify_rules';
 				break;
+
+			// 站点类型
+			case 'sitetype' :
+				// 自提地址处理
+				if(!empty($params['common_self_extraction_address']))
+				{
+					if(!is_array($params['common_self_extraction_address']))
+					{
+						$address = json_decode($params['common_self_extraction_address'], true);
+					} else {
+						$address = $params['common_self_extraction_address'];
+					}
+					foreach($address as $k=>$v)
+					{
+						$address[$k]['id'] = $k;
+					}
+					$params['common_self_extraction_address'] = json_encode($address, JSON_UNESCAPED_UNICODE);
+				}
+				break;
 		}
 
 		// 开始处理空值
@@ -157,15 +179,15 @@ class Site extends Common
 		{
 			foreach($field_list as $field)
 			{
-				if(!isset($_POST[$field]))
+				if(!isset($params[$field]))
 				{
-					$_POST[$field] = '';
+					$params[$field] = '';
 				}
 			}
 		}
 
 		// 基础配置
-		$ret = ConfigService::ConfigSave($_POST);
+		$ret = ConfigService::ConfigSave($params);
 
 		// 清除缓存
 		if($ret['code'] == 0)
diff --git a/sourcecode/alipay/pages/buy/buy.js b/sourcecode/alipay/pages/buy/buy.js
index 0271e171a65c4c1c58c690ee8a67ae376c9f1d2c..58c924c3f9ffba7d6931fcd4675ceac8edf26554 100644
--- a/sourcecode/alipay/pages/buy/buy.js
+++ b/sourcecode/alipay/pages/buy/buy.js
@@ -78,7 +78,7 @@ Page({
       {
         this.setData({
           address: cache_address.data,
-          address_id: cache_address.data.id || 0,
+          address_id: cache_address.id,
         });
       }
     }
@@ -135,7 +135,7 @@ Page({
             // 地址
             this.setData({
               address: data.base.address || null,
-              address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null,
+              address_id: ((data.base.address || null) != null) ? data.base.address.id : null,
             });
             my.setStorage({
               key: app.data.cache_buy_user_address_select_key,
@@ -303,17 +303,21 @@ Page({
 
   // 销售+自提 模式选择事件
   buy_header_nav_event(e) {
-    // 数据设置
-    this.setData({
-      address: null,
-      address_id: null,
-      site_model: e.currentTarget.dataset.value || 0,
-    });
-    
-    // 删除地址缓存
-    my.removeStorageSync({key: app.data.cache_buy_user_address_select_key});
+    var value = e.currentTarget.dataset.value || 0;
+    if (value != this.data.site_model)
+    {
+      // 数据设置
+      this.setData({
+        address: null,
+        address_id: null,
+        site_model: value,
+      });
 
-    // 数据初始化
-    this.init();
+      // 删除地址缓存
+      my.removeStorageSync({key: app.data.cache_buy_user_address_select_key});
+
+      // 数据初始化
+      this.init();
+    }
   },
 });
diff --git a/sourcecode/baidu/pages/buy/buy.js b/sourcecode/baidu/pages/buy/buy.js
index db72b70fb97162920fcfbae78ca232ee08002039..be9f6c58cf4e38316007bc02b328eddb951553ab 100755
--- a/sourcecode/baidu/pages/buy/buy.js
+++ b/sourcecode/baidu/pages/buy/buy.js
@@ -63,7 +63,7 @@ Page({
       if ((cache_address || null) != null) {
         this.setData({
           address: cache_address,
-          address_id: cache_address.id || null
+          address_id: cache_address.id,
         });
       }
     }
@@ -116,7 +116,7 @@ Page({
             // 地址
             this.setData({
               address: data.base.address || null,
-              address_id: (data.base.address || null) != null && (data.base.address.id || null) != null ? data.base.address.id : null
+              address_id: ((data.base.address || null) != null) ? data.base.address.id : null
             });
             swan.setStorage({
               key: app.data.cache_buy_user_address_select_key,
@@ -280,17 +280,21 @@ Page({
 
     // 销售+自提 模式选择事件
   buy_header_nav_event(e) {
-    // 数据设置
-    this.setData({
-      address: null,
-      address_id: null,
-      site_model: e.currentTarget.dataset.value || 0,
-    });
-    
-    // 删除地址缓存
-    swan.removeStorageSync(app.data.cache_buy_user_address_select_key);
+    var value = e.currentTarget.dataset.value || 0;
+    if (value != this.data.site_model)
+    {
+      // 数据设置
+      this.setData({
+        address: null,
+        address_id: null,
+        site_model: value,
+      });
 
-    // 数据初始化
-    this.init();
+      // 删除地址缓存
+      swan.removeStorageSync(app.data.cache_buy_user_address_select_key);
+
+      // 数据初始化
+      this.init();
+    }
   },
 });
\ No newline at end of file
diff --git a/sourcecode/qq/pages/buy/buy.js b/sourcecode/qq/pages/buy/buy.js
index 6c318b645634d1a0b71f3ba0aab3903b01501c34..47f74831990c263e5adab5a987edc7acf78edfc4 100755
--- a/sourcecode/qq/pages/buy/buy.js
+++ b/sourcecode/qq/pages/buy/buy.js
@@ -66,7 +66,7 @@ Page({
       {
         this.setData({
           address: cache_address,
-          address_id: cache_address.id || null,
+          address_id: cache_address.id,
         });
       }
     }
@@ -122,7 +122,7 @@ Page({
             // 地址
             this.setData({
               address: data.base.address || null,
-              address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null,
+              address_id: ((data.base.address || null) != null) ? data.base.address.id : null,
             });
             qq.setStorage({
               key: app.data.cache_buy_user_address_select_key,
@@ -289,17 +289,21 @@ Page({
 
   // 销售+自提 模式选择事件
   buy_header_nav_event(e) {
-    // 数据设置
-    this.setData({
-      address: null,
-      address_id: null,
-      site_model: e.currentTarget.dataset.value || 0,
-    });
-    
-    // 删除地址缓存
-    qq.removeStorageSync(app.data.cache_buy_user_address_select_key);
+    var value = e.currentTarget.dataset.value || 0;
+    if (value != this.data.site_model)
+    {
+      // 数据设置
+      this.setData({
+        address: null,
+        address_id: null,
+        site_model: value,
+      });
 
-    // 数据初始化
-    this.init();
+      // 删除地址缓存
+      qq.removeStorageSync(app.data.cache_buy_user_address_select_key);
+
+      // 数据初始化
+      this.init();
+    }
   },
 });
diff --git a/sourcecode/toutiao/pages/buy/buy.js b/sourcecode/toutiao/pages/buy/buy.js
index 1706a4da1638ea093523142634b2d45cf294b1f5..305885a61c82d4ae23047a04e5fc630ebf1a99df 100755
--- a/sourcecode/toutiao/pages/buy/buy.js
+++ b/sourcecode/toutiao/pages/buy/buy.js
@@ -66,7 +66,7 @@ Page({
       {
         this.setData({
           address: cache_address,
-          address_id: cache_address.id || null,
+          address_id: cache_address.id,
         });
       }
     }
@@ -122,7 +122,7 @@ Page({
             // 地址
             this.setData({
               address: data.base.address || null,
-              address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null,
+              address_id: ((data.base.address || null) != null) ? data.base.address.id : null,
             });
             tt.setStorage({
               key: app.data.cache_buy_user_address_select_key,
@@ -289,17 +289,21 @@ Page({
 
   // 销售+自提 模式选择事件
   buy_header_nav_event(e) {
-    // 数据设置
-    this.setData({
-      address: null,
-      address_id: null,
-      site_model: e.currentTarget.dataset.value || 0,
-    });
-    
-    // 删除地址缓存
-    tt.removeStorageSync(app.data.cache_buy_user_address_select_key);
+    var value = e.currentTarget.dataset.value || 0;
+    if (value != this.data.site_model)
+    {
+      // 数据设置
+      this.setData({
+        address: null,
+        address_id: null,
+        site_model: value,
+      });
 
-    // 数据初始化
-    this.init();
+      // 删除地址缓存
+      tt.removeStorageSync(app.data.cache_buy_user_address_select_key);
+
+      // 数据初始化
+      this.init();
+    }
   },
 });
diff --git a/sourcecode/weixin/pages/buy/buy.js b/sourcecode/weixin/pages/buy/buy.js
index 80c770b94675747a377ccbf7eb5c99b63a66e54f..e3dbe5d31ac78fc392275c2f988636576b088f49 100755
--- a/sourcecode/weixin/pages/buy/buy.js
+++ b/sourcecode/weixin/pages/buy/buy.js
@@ -66,7 +66,7 @@ Page({
       {
         this.setData({
           address: cache_address,
-          address_id: cache_address.id || null,
+          address_id: cache_address.id,
         });
       }
     }
@@ -122,7 +122,7 @@ Page({
             // 地址
             this.setData({
               address: data.base.address || null,
-              address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null,
+              address_id: ((data.base.address || null) != null) ? data.base.address.id : null,
             });
             wx.setStorage({
               key: app.data.cache_buy_user_address_select_key,
@@ -184,6 +184,7 @@ Page({
     if (this.data.common_order_is_booking != 1) {
       validation.push({ fields: 'payment_id', msg: '请选择支付方式' });
     }
+
     if (app.fields_check(data, validation)) {
       // 加载loding
       wx.showLoading({title: '提交中...'});
@@ -289,17 +290,21 @@ Page({
 
   // 销售+自提 模式选择事件
   buy_header_nav_event(e) {
-    // 数据设置
-    this.setData({
-      address: null,
-      address_id: null,
-      site_model: e.currentTarget.dataset.value || 0,
-    });
-    
-    // 删除地址缓存
-    wx.removeStorageSync(app.data.cache_buy_user_address_select_key);
+    var value = e.currentTarget.dataset.value || 0;
+    if (value != this.data.site_model)
+    {
+      // 数据设置
+      this.setData({
+        address: null,
+        address_id: null,
+        site_model: value,
+      });
 
-    // 数据初始化
-    this.init();
+      // 删除地址缓存
+      wx.removeStorageSync(app.data.cache_buy_user_address_select_key);
+
+      // 数据初始化
+      this.init();
+    }
   },
 });