diff --git a/application/admin/controller/Region.php b/application/admin/controller/Region.php
index 822eaf117..55147b70e 100755
--- a/application/admin/controller/Region.php
+++ b/application/admin/controller/Region.php
@@ -35,9 +35,6 @@ class Region extends Common
// 登录校验
$this->IsLogin();
-
- // 权限校验
- $this->IsPower();
}
/**
@@ -49,6 +46,9 @@ class Region extends Common
*/
public function Index()
{
+ // 权限校验
+ $this->IsPower();
+
// 是否启用
$this->assign('common_is_enable_list', lang('common_is_enable_list'));
@@ -64,6 +64,9 @@ class Region extends Common
*/
public function GetNodeSon()
{
+ // 权限校验
+ $this->IsPower();
+
// 是否ajax请求
if(!IS_AJAX)
{
@@ -83,6 +86,9 @@ class Region extends Common
*/
public function Save()
{
+ // 权限校验
+ $this->IsPower();
+
// 是否ajax请求
if(!IS_AJAX)
{
@@ -102,6 +108,9 @@ class Region extends Common
*/
public function Delete()
{
+ // 权限校验
+ $this->IsPower();
+
// 是否ajax
if(!IS_AJAX)
{
@@ -113,5 +122,31 @@ class Region extends Common
$params['admin'] = $this->admin;
return RegionService::RegionDelete($params);
}
+
+ /**
+ * 获取地区节点数据
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2018-09-21
+ * @desc description
+ */
+ public function Node()
+ {
+ // 是否ajax请求
+ if(!IS_AJAX)
+ {
+ $this->error('非法访问');
+ }
+
+ // 获取地区
+ $params = [
+ 'where' => [
+ 'pid' => intval(input('pid', 0)),
+ ],
+ ];
+ $data = RegionService::RegionNode($params);
+ return DataReturn('操作成功', 0, $data);
+ }
}
?>
\ No newline at end of file
diff --git a/application/admin/controller/Site.php b/application/admin/controller/Site.php
index f42e3d119..c2421438c 100755
--- a/application/admin/controller/Site.php
+++ b/application/admin/controller/Site.php
@@ -49,6 +49,10 @@ class Site extends Common
*/
public function Index()
{
+ // 导航
+ $nav_type = input('nav_type', 'base');
+ $this->assign('nav_type', $nav_type);
+
// 时区
$this->assign('site_timezone_list', lang('site_timezone_list'));
@@ -77,14 +81,23 @@ class Site extends Common
$this->assign('common_site_type_list', lang('common_site_type_list'));
// 配置信息
- $this->assign('data', ConfigService::ConfigList());
+ $data = ConfigService::ConfigList();
+ $this->assign('data', $data);
+
+ // 自提点地址处理
+ if($nav_type == 'sitetype' && !empty($data['common_self_extraction_address']) && !empty($data['common_self_extraction_address']['value']))
+ {
+ $address_list = json_decode($data['common_self_extraction_address']['value'], true);
+ if(!empty($address_list) && is_array($address_list))
+ {
+ $this->assign('sitetype_address_list', $address_list);
+ }
+ }
// 编辑器文件存放地址
$this->assign('editor_path_type', 'common');
- // 导航/视图
- $nav_type = input('nav_type', 'base');
- $this->assign('nav_type', $nav_type);
+ // 视图
return $this->fetch($nav_type);
}
@@ -103,33 +116,33 @@ class Site extends Common
// 字段不存在赋空值
$field_list = [];
- // 用户注册
- if($nav_type == 'register')
+ // 导航类型
+ switch($nav_type)
{
- $field_list[] = 'home_user_reg_state';
- $field_list[] = 'home_site_user_register_bg_images';
- }
+ // 用户注册
+ case 'register' :
+ $field_list[] = 'home_user_reg_state';
+ $field_list[] = 'home_site_user_register_bg_images';
+ break;
- // 用户登录
- if($nav_type == 'login')
- {
- $field_list[] = 'home_site_user_login_ad1_images';
- $field_list[] = 'home_site_user_login_ad2_images';
- $field_list[] = 'home_site_user_login_ad3_images';
- }
+ // 用户登录
+ case 'login' :
+ $field_list[] = 'home_site_user_login_ad1_images';
+ $field_list[] = 'home_site_user_login_ad2_images';
+ $field_list[] = 'home_site_user_login_ad3_images';
+ break;
- // 密码找回
- if($nav_type == 'forgetpwd')
- {
- $field_list[] = 'home_site_user_forgetpwd_ad1_images';
- $field_list[] = 'home_site_user_forgetpwd_ad2_images';
- $field_list[] = 'home_site_user_forgetpwd_ad3_images';
- }
+ // 密码找回
+ case 'forgetpwd' :
+ $field_list[] = 'home_site_user_forgetpwd_ad1_images';
+ $field_list[] = 'home_site_user_forgetpwd_ad2_images';
+ $field_list[] = 'home_site_user_forgetpwd_ad3_images';
+ break;
- // 图片验证码
- if($nav_type == 'imagesverify')
- {
- $field_list[] = 'common_images_verify_rules';
+ // 图片验证码
+ case 'imagesverify' :
+ $field_list[] = 'common_images_verify_rules';
+ break;
}
// 开始处理空值
diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index caea46be6..ff7149237 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -674,10 +674,9 @@
+
{{include file="public/footer" /}}
-
+
+
\ No newline at end of file
diff --git a/application/index/view/default/useraddress/save_info.html b/application/index/view/default/useraddress/save_info.html
index 26097995c..c3ada7623 100755
--- a/application/index/view/default/useraddress/save_info.html
+++ b/application/index/view/default/useraddress/save_info.html
@@ -46,46 +46,18 @@
+
+
{{include file="public/footer" /}}
-
-