From 65edb94998861cd9f6cd9a6711e6db5ae3d294fb Mon Sep 17 00:00:00 2001
From: "MI15\\Win" <10359480+tznb@user.noreply.gitee.com>
Date: Sun, 11 Jun 2023 18:20:56 +0800
Subject: [PATCH] v2.0.26-20230611

---
 system/public.php                             | 49 ++++++++++---------
 system/verify.php                             |  2 +-
 system/version.txt                            |  2 +-
 templates/admin/css/layuimini.css             | 14 +++++-
 templates/admin/index.php                     |  3 +-
 .../js/lay-module/layuimini/miniAdmin.js      | 40 +++++++++++++++
 templates/admin/page/updatelog.php            | 12 +++++
 7 files changed, 93 insertions(+), 29 deletions(-)

diff --git a/system/public.php b/system/public.php
index 5ce01cc..644c799 100644
--- a/system/public.php
+++ b/system/public.php
@@ -338,32 +338,33 @@ function is_login(){
     global $USER_DB;
     $time = time();
     $LoginConfig = unserialize($USER_DB['LoginConfig']);
-    
-    function delete_expired_info($time,$LoginConfig){
-        global $USER_DB;
-        if(empty($LoginConfig['Session'])){
-            $where = [ 
-                "uid" => $USER_DB['ID'],
-                //"expire_time" => 0,
-                "OR" => [
-                    "last_time[<]" => strtotime('-1 day'),
-                    "login_time[<]" => strtotime('-15 day')
-                ]
-            ];
-        }else{
-            $where = [ 
-                "uid" => $USER_DB['ID'],
-                "OR" => [
-                    "expire_time[<]" => $time,
-                    "last_time[<]" => strtotime("-{$LoginConfig['KeyClear']} day")
-                ]
-            ];
+    if (!function_exists('delete_expired_info')) {
+        function delete_expired_info($time,$LoginConfig){
+            global $USER_DB;
+            if(empty($LoginConfig['Session'])){
+                $where = [ 
+                    "uid" => $USER_DB['ID'],
+                    //"expire_time" => 0,
+                    "OR" => [
+                        "last_time[<]" => strtotime('-1 day'),
+                        "login_time[<]" => strtotime('-15 day')
+                    ]
+                ];
+            }else{
+                $where = [ 
+                    "uid" => $USER_DB['ID'],
+                    "OR" => [
+                        "expire_time[<]" => $time,
+                        "last_time[<]" => strtotime("-{$LoginConfig['KeyClear']} day")
+                    ]
+                ];
+            }
+            //var_dump(select_db('user_login_info','*',$where),$where);exit;
+            delete_db("user_login_info", $where); //清理到期Key
+            update_db("global_user",["kct"=>$time],["User" => $USER_DB['User']]); //记录清理时间
         }
-        //var_dump(select_db('user_login_info','*',$where),$where);exit;
-        delete_db("user_login_info", $where); //清理到期Key
-        update_db("global_user",["kct"=>$time],["User" => $USER_DB['User']]); //记录清理时间
     }
-    
+
     //清理间隔30分钟(1800秒)
     if( ($USER_DB['kct'] + 1800) < $time ){
         delete_expired_info($time,$LoginConfig);
diff --git a/system/verify.php b/system/verify.php
index c6069b0..5f81ec1 100644
--- a/system/verify.php
+++ b/system/verify.php
@@ -27,7 +27,7 @@ switch ($type) {
             setcookie($USER_DB['User'].'_Password2', md5($USER_DB['Password'].$_COOKIE[U.'_key'].$_POST['Password2']), 0,'','',false,true);
             msg(1,'二级密码正确!');
         }else{
-            msg(-1,'二级密码错误!'.$LoginConfig['Password2']);
+            msg(-1,'二级密码错误!');
         }
         break;
     case "link_pwd":
diff --git a/system/version.txt b/system/version.txt
index dddd80d..4475360 100644
--- a/system/version.txt
+++ b/system/version.txt
@@ -1 +1 @@
-v2.0.25-20230607
\ No newline at end of file
+v2.0.26-20230611
\ No newline at end of file
diff --git a/templates/admin/css/layuimini.css b/templates/admin/css/layuimini.css
index 7e5c45e..65fdd7b 100644
--- a/templates/admin/css/layuimini.css
+++ b/templates/admin/css/layuimini.css
@@ -649,7 +649,17 @@
     padding: 0px;
     overflow: hidden;
 }
-
+/**菜单缩放*/
+.popup-tips .layui-layer-TipsG{
+    display: none;
+}
+.popup-tips.layui-layer-tips .layui-layer-content{
+    padding: 0;
+}
+.popup-tips .layui-nav-tree{
+    width: 150px;
+    border-radius: 10px;
+}
 /**左侧菜单字体间距*/
 .layuimini-menu-left .layui-nav-item a span {
     letter-spacing: 1px;
@@ -879,4 +889,4 @@
 .layui-layout-admin .layui-logo {width: 155px;}
 .layui-body {left: 155px;}
 .layuimini-tool {left: 190px;}
-.layui-nav-tree {width: 155px!important;}
\ No newline at end of file
+.layui-nav-tree {width: 155px!important;}
diff --git a/templates/admin/index.php b/templates/admin/index.php
index abde654..2ce7c50 100644
--- a/templates/admin/index.php
+++ b/templates/admin/index.php
@@ -23,8 +23,9 @@
     <div class="layui-header header">
         <div class="layui-logo layuimini-logo"></div>
         <div class="layuimini-header-content">
-            <a><div class="layuimini-tool"><i title="左侧栏展开/收缩" class="fa fa-outdent" data-side-fold="1"></i></div></a>
+            <a><div class="layuimini-tool"><i title="左侧栏展开/收缩" class="fa fa-outdent" style="font-size: 1.1rem;" data-side-fold="1"></i></div></a>
             <ul class="layui-nav layui-layout-right">
+                <li class="layui-nav-item" lay-unselect><a href="javascript:;" data-home="主页" title="主页"><i class="fa fa-home" style="font-size: 1.08rem;"></i></a></li>
                 <li class="layui-nav-item" lay-unselect><a href="javascript:;" data-refresh="刷新" title="刷新"><i class="fa fa-refresh"></i></a></li>
                 <li class="layui-nav-item mobile layui-hide-xs" lay-unselect><a href="javascript:;" title="全屏" data-check-screen="full"><i class="fa fa-arrows-alt"></i></a></li>
                 <li class="layui-nav-item layuimini-setting">
diff --git a/templates/admin/js/lay-module/layuimini/miniAdmin.js b/templates/admin/js/lay-module/layuimini/miniAdmin.js
index ed0a20b..eb120fb 100644
--- a/templates/admin/js/lay-module/layuimini/miniAdmin.js
+++ b/templates/admin/js/lay-module/layuimini/miniAdmin.js
@@ -160,11 +160,51 @@ layui.define(["jquery", "miniMenu", "element","miniTab", "miniTheme"], function
         },
         // 监听
         listen: function () {
+            //主页
+            $('body').on('click','[data-home]', function () {
+                top.location.href='./index.php?u='+u;
+            });
             //刷新
             $('body').on('click','[data-refresh]', function () {
                 $(".layui-tab-item.layui-show").find("iframe")[0].contentWindow.location.reload();
                 miniAdmin.success('刷新成功');
             });
+            // 悬停菜单>移入
+            $("body").on("mouseenter", ".layui-nav-tree .menu-li", function () {
+                if (miniAdmin.checkMobile()) {
+                    return false;
+                }
+                var classInfo = $(this).attr('class'),
+                    tips = $(this).prop("innerHTML"),
+                    isShow = $('.layuimini-tool i').attr('data-side-fold');
+                if (isShow == 0 && tips) {
+                    tips = "<ul class='layuimini-menu-left-zoom layui-nav layui-nav-tree layui-this'><li class='layui-nav-item layui-nav-itemed'>"+tips+"</li></ul>" ;
+                    window.openTips = layer.tips(tips, $(this), {
+                        tips: [2, '#2f4056'],
+                        time: 300000,
+                        skin:"popup-tips",
+                        success:function (el) {
+                            var left = $(el).position().left - 10 ;
+                            $(el).css({ left:left });
+                            element.render();
+                        }
+                    });
+                }
+            });
+            // 悬停菜单>移出
+            $("body").on("mouseleave", ".popup-tips", function () {
+                if (miniAdmin.checkMobile()) {
+                    return false;
+                }
+                var isShow = $('.layuimini-tool i').attr('data-side-fold');
+                if (isShow == 0) {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
+                }
+            });
             //全屏
             $('body').on('click','[data-check-screen]', function () {
                 var check = $(this).attr('data-check-screen');
diff --git a/templates/admin/page/updatelog.php b/templates/admin/page/updatelog.php
index f88b110..8cac894 100644
--- a/templates/admin/page/updatelog.php
+++ b/templates/admin/page/updatelog.php
@@ -2,6 +2,18 @@
 <body>
 <div class="layuimini-container">
  <div class="layuimini-main" style=" margin-left: 20px;">
+    <li class="layui-timeline-item">
+        <i class="layui-icon layui-timeline-axis"></i>
+        <div class="layui-timeline-content layui-text">
+            <h4 class="layui-timeline-title">v2.0.26-20230611</h4>
+            <ul>
+                <li>[新增] 后台页面右上角新增主页图标用于返回主页</li>
+                <li>[修复] 后台左侧栏收起时无法使用二级菜单</li>
+                <li>[修复] 申请收录无法提交,v2.0.24更新造成</li>
+                <li>[修复] 二级密码输错时提示正确密码的bug</li>
+            </ul>
+        </div>
+    </li>
     <li class="layui-timeline-item">
         <i class="layui-icon layui-timeline-axis"></i>
         <div class="layui-timeline-content layui-text">