From cfe3b03b239cd139dd27b6feb13829302a22e013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com>
Date: Fri, 4 Sep 2020 18:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
component/pear/module/admin.js | 6 ++----
pear.config.json | 4 ++--
view/console/console1.html | 4 +++-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js
index af05ca5..b5f0f32 100644
--- a/component/pear/module/admin.js
+++ b/component/pear/module/admin.js
@@ -142,11 +142,12 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
}
var colorId = localStorage.getItem("theme-color");
var menu = localStorage.getItem("theme-menu");
+ console.log("主题标识:"+colorId);
+ console.log("菜单主题:"+menu);
var color = getColorById(colorId);
if (menu == "null") {
menu = option.theme.defaultMenu;
} else {
-
if (option.theme.allowCustom == false) {
menu = option.theme.defaultMenu;
}
@@ -209,9 +210,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
if ($("iframe").contents().find("#customTheme").length > 0) {
$("iframe").contents().find("#customTheme").remove();
}
- /* var theme = "';
- $("iframe").contents().find("head").append(theme); */
$("#pearadmin-bg-color").html(style);
}
};
diff --git a/pear.config.json b/pear.config.json
index 53a765c..de42bd3 100644
--- a/pear.config.json
+++ b/pear.config.json
@@ -20,8 +20,8 @@
}
},
"theme": {
- "defaultColor": "2",
- "defaultMenu": "dark-theme",
+ "defaultColor": "3",
+ "defaultMenu": "light-theme",
"allowCustom": true
},
"colors": [{
diff --git a/view/console/console1.html b/view/console/console1.html
index 568cad5..eb9c1a2 100644
--- a/view/console/console1.html
+++ b/view/console/console1.html
@@ -227,7 +227,9 @@