From ee082c9b5fe6dc70d83fa1f912b3f7f3fed1de36 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 12 Dec 2019 16:20:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=8A=A0=E8=BD=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Site.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/application/admin/controller/Site.php b/application/admin/controller/Site.php
index 1b3991051..9d5214658 100755
--- a/application/admin/controller/Site.php
+++ b/application/admin/controller/Site.php
@@ -87,15 +87,19 @@ class Site extends Common
 		$data = ConfigService::ConfigList();
 		$this->assign('data', $data);
 
-		// 自提点地址处理
-		if($nav_type == 'sitetype' && !empty($data['common_self_extraction_address']) && !empty($data['common_self_extraction_address']['value']))
+		// 自提点
+		if($nav_type == 'sitetype')
 		{
-			$address = ConfigService::SiteTypeExtractionAddressList($data['common_self_extraction_address']['value']);
-			$this->assign('sitetype_address_list', $address['data']);
-		}
+			// 地址处理
+        	if(!empty($data['common_self_extraction_address']) && !empty($data['common_self_extraction_address']['value']))
+			{
+				$address = ConfigService::SiteTypeExtractionAddressList($data['common_self_extraction_address']['value']);
+				$this->assign('sitetype_address_list', $address['data']);
+			}
 
-		// 加载百度地图api
-        $this->assign('is_load_baidu_map_api', 1);
+			// 加载百度地图api
+        	$this->assign('is_load_baidu_map_api', 1);
+		}
 
 		// 编辑器文件存放地址
         $this->assign('editor_path_type', 'common');