From 41fc1d1b3a05ff8d4e54b537fb0525e252cd979e Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Tue, 28 Dec 2021 16:43:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A7=E5=88=B6=E6=A0=8F&?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/js/backend/index.js | 13 +++----------
 public/assets/js/require-form.js  |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/public/assets/js/backend/index.js b/public/assets/js/backend/index.js
index 74f2abcd..90ca20bc 100755
--- a/public/assets/js/backend/index.js
+++ b/public/assets/js/backend/index.js
@@ -284,13 +284,9 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
             });
 
             // 切换子菜单显示和菜单小图标的显示
-            $("[data-menu]").on('click', function () {
-                if ($(this).data("menu") == 'show-submenu') {
-                    createCookie('show_submenu', $(this).prop("checked") ? 1 : 0);
-                    location.reload();
-                } else {
-                    nav.toggleClass("disable-top-badge");
-                }
+            $("[data-menu='show-submenu']").on('click', function () {
+                createCookie('show_submenu', $(this).prop("checked") ? 1 : 0);
+                location.reload();
             });
 
             // 右侧控制栏切换
@@ -369,9 +365,6 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
             if ($('ul.sidebar-menu').hasClass('show-submenu')) {
                 $("[data-menu='show-submenu']").attr('checked', 'checked');
             }
-            if (nav.hasClass('disable-top-badge')) {
-                $("[data-menu='disable-top-badge']").attr('checked', 'checked');
-            }
 
             var sidebarExpandOnHover = localStorage.getItem('sidebarExpandOnHover');
             if (sidebarExpandOnHover == '1') {
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index 8d9ab869..baa2d2a5 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -216,7 +216,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
                             $(this).on('cancel.daterangepicker', function (ev, picker) {
                                 $(this).val('').trigger('blur');
                             });
-                            $(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {}), callback);
+                            $(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {}));
                         });
                     });
                 }