From c051a05ed073afa9d03334e36d26ede6171755ea Mon Sep 17 00:00:00 2001
From: zhizous <zhizous@163.com>
Date: Mon, 6 Apr 2020 18:45:55 +0800
Subject: [PATCH] reload

---
 js/okadmin.js             | 7 +++----
 lib/loading/okLoading.css | 8 +++++++-
 lib/loading/okLoading.js  | 7 +++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/js/okadmin.js b/js/okadmin.js
index 57be1f4..b2d9056 100644
--- a/js/okadmin.js
+++ b/js/okadmin.js
@@ -21,10 +21,9 @@ layui.use(["element", "layer", "okUtils", "okTab", "okLayer", "okContextMenu", "
    objOkTab = okTab;
    okLoading && okLoading.close();/**关闭加载动画*/
 
-   if(config.theme){ //主题颜色
-      $(".layui-layout-admin").removeClass("orange_theme blue_theme");
-      $(".layui-layout-admin").addClass(config.theme);
-   }
+   $(".layui-layout-admin").removeClass("orange_theme blue_theme");
+   $(".layui-layout-admin").addClass(config.theme);
+
    if(config.menuArrow){ //tab箭头样式
       $("#navBar").addClass(config.menuArrow);
    }
diff --git a/lib/loading/okLoading.css b/lib/loading/okLoading.css
index cacd45b..b2c0bd0 100644
--- a/lib/loading/okLoading.css
+++ b/lib/loading/okLoading.css
@@ -24,9 +24,15 @@
     -webkit-transform:translate(-50%, -50%)
 }
 .ball-loader>span, .signal-loader>span {
-    background-color:#4aca85;
+    background-color: #4aca85;
     display:inline-block
 }
+.ok-loading.orange_theme .ball-loader>span, .signal-loader>span{
+    background-color: #FF4806;
+}
+.ok-loading.blue_theme .ball-loader>span, .signal-loader>span{
+    background-color: #2D8CF0;
+}
 .ball-loader>span:nth-child(1), .ball-loader.sm>span:nth-child(1), .signal-loader>span:nth-child(1), .signal-loader.sm>span:nth-child(1) {
     -webkit-animation-delay:0s;
     animation-delay:0s
diff --git a/lib/loading/okLoading.js b/lib/loading/okLoading.js
index 7add461..fc290ab 100644
--- a/lib/loading/okLoading.js
+++ b/lib/loading/okLoading.js
@@ -3,9 +3,12 @@ var ok_load_options = {
 	content: "ok-admin..."
 };
 !function (content, options) {
-
+   var config = localStorage.getItem("okConfig") || okConfig || {};
+   if(typeof config == "string"){
+      config = JSON.parse(config);
+   }
 	function templateFun(options) {
-		return `<div class="ok-loading">
+		return `<div class="ok-loading ${config.theme}">
 						<div class="ball-loader">
 							<span></span><span></span><span></span><span></span>
 						</div>