diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php index c6d39325d..c9ff9b512 100755 --- a/app/admin/controller/Common.php +++ b/app/admin/controller/Common.php @@ -75,8 +75,8 @@ class Common extends BaseController protected $system_type; // 主题颜色key - protected $admin_color_value_key = 'admin_color_value'; - protected $admin_color_value = 0; + protected $theme_color_value_key = 'admin_theme_color_value'; + protected $theme_color_value = 0; /** * 构造方法 @@ -300,16 +300,16 @@ class Common extends BaseController $assign['env_max_input_vars_count'] = SystemService::EnvMaxInputVarsCount(); // 主题配色 - $this->admin_color_value = intval(MyCookie($this->admin_color_value_key)); - if($this->admin_color_value == 1) + $this->theme_color_value = intval(MyCookie($this->theme_color_value_key)); + if($this->theme_color_value == 1) { - $assign['admin_color_name'] = '普通白色'; - $assign['admin_color_url'] = MyUrl('admin/index/color', ['value'=>0]); + $assign['theme_color_name'] = '普通白色'; + $assign['theme_color_url'] = MyUrl('admin/index/color', ['value'=>0]); } else { - $assign['admin_color_name'] = '夜间深色'; - $assign['admin_color_url'] = MyUrl('admin/index/color', ['value'=>1]); + $assign['theme_color_name'] = '夜间深色'; + $assign['theme_color_url'] = MyUrl('admin/index/color', ['value'=>1]); } - $assign['admin_color_value'] = $this->admin_color_value; + $assign['theme_color_value'] = $this->theme_color_value; // 页面语言 $assign['lang_data'] = SystemService::PageViewLangData(); diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 2c34fb051..03a8b66ac 100755 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -158,9 +158,9 @@ class Index extends Common // 是否指定配色（0默认白色、1黑色） if(isset($this->data_request['value']) && $this->data_request['value'] == 1) { - MyCookie($this->admin_color_value_key, 1); + MyCookie($this->theme_color_value_key, 1); } else { - MyCookie($this->admin_color_value_key, null); + MyCookie($this->theme_color_value_key, null); } // 跳转首页 return MyRedirect(MyUrl('admin/index/index')); diff --git a/app/admin/view/default/public/header.html b/app/admin/view/default/public/header.html index ec649647d..7f9d719b3 100755 --- a/app/admin/view/default/public/header.html +++ b/app/admin/view/default/public/header.html @@ -69,35 +69,36 @@ {{/if}} - {{if isset($admin_color_value) and $admin_color_value eq 1}} - + {{if isset($theme_color_value) and $theme_color_value eq 1}} + {{/if}} + + - {{if $module_name.$controller_name.$action_name neq 'adminindexindex'}} {{include file="public/page_loading" /}} diff --git a/app/admin/view/default/public/nav.html b/app/admin/view/default/public/nav.html index 349253de4..cf63bb023 100755 --- a/app/admin/view/default/public/nav.html +++ b/app/admin/view/default/public/nav.html @@ -11,9 +11,9 @@