From daa8f1bf9c463e5efd7d270f8c6f6bbcd1c6b774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=9D=B0?= <l>
Date: Thu, 20 Sep 2018 13:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AE=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=88=B7=E6=96=B0=E5=90=8E=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E7=9A=84bug,=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=A2=98=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/common/setting.html   | 20 ++++++++-----------
 src/main/resources/templates/index.html       |  3 +--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/common/setting.html b/src/main/resources/templates/common/setting.html
index c10e33c..caeea22 100644
--- a/src/main/resources/templates/common/setting.html
+++ b/src/main/resources/templates/common/setting.html
@@ -153,23 +153,19 @@
   </div>
   <script th:src="@{'/js/jquery.min.js'}"></script>
   <script>
-      /**
-       * 默认选中状态
-       * @type {string}
-       */
-      var themeKey = 'KITADMIN_SETTING_THEME';
-      var theme = localStorage.getItem(themeKey);
-
-      if(theme == null){
-          $("input[name='setting-theme']")[0].attr("checked","checked");
-      } else {
-          var themeName = $.parseJSON(theme).theme;
+      $(function () {
+          var themeKey = 'KITADMIN_SETTING_THEME';
+          var theme = localStorage.getItem(themeKey);
+          var themeName = "default"
+          if(theme != null){
+              themeName = $.parseJSON(theme).theme;
+          }
           $("input[name='setting-theme']").each(function () {
               if($(this).parent().attr("data-theme") == themeName){
                   $(this).attr("checked","checked");
               }
           })
-      }
+      })
       layui.use(['form', 'utils'], function () {
           var form = layui.form,
               $ = layui.jquery,
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index af692dc..ea16981 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -129,9 +129,8 @@
        */
       var themeKey = 'KITADMIN_SETTING_THEME';
       var theme = localStorage.getItem(themeKey);
-      var themeName = ""
       if(theme != null){
-          themeName = $.parseJSON(theme).theme;
+          var themeName = $.parseJSON(theme).theme;
           var str = $('#theme').attr('href');
           var _themeUrl = str.substr(0, str.lastIndexOf('/') + 1);
           $('#theme').attr('href', _themeUrl + themeName + '.css');