From 0c85029fa84d314c51dab930ef8437e38457f165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <2449271624@qq.com> Date: Tue, 7 Nov 2023 16:58:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/inc/inc_menu.php | 10 +++++----- src/admin/inc/inc_menu_module.php | 2 +- src/admin/templets/index.htm | 2 +- src/data/admin/ver.txt | 2 +- src/install/index.php | 2 +- src/static/web/css/admin.css | 2 +- src/static/web/img/colornew.htm | 4 ++-- src/system/common.inc.php | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 78323a3f..df4dcd45 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -35,7 +35,7 @@ $gitUrl = DEDEBIZURL."/git"; $dedebizUrl = DEDEBIZURL; $adminMenu1 = $adminMenu2 = ''; if ($cuserLogin->getUserType() >= 10) { - $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : " + $adminMenu1 = (DEDEBIZ_SAFE_MODE ? "" : " @@ -43,7 +43,7 @@ if ($cuserLogin->getUserType() >= 10) { ")." - ".(DEDEBIZ_SAFE_MODE? "" : "")." + ".(DEDEBIZ_SAFE_MODE ? "" : "")." @@ -64,8 +64,8 @@ if ($cuserLogin->getUserType() >= 10) { - ".(DEDEBIZ_SAFE_MODE? "" : "")." - ".(DEDEBIZ_SAFE_MODE? "" : "")." + ".(DEDEBIZ_SAFE_MODE ? "" : "")." + ".(DEDEBIZ_SAFE_MODE ? "" : "")." "; @@ -94,7 +94,7 @@ $adminMenu1 - ".(DEDEBIZ_SAFE_MODE? "" : "")." + ".(DEDEBIZ_SAFE_MODE ? "" : "")." {$GLOBALS['menusMoudle']} diff --git a/src/admin/inc/inc_menu_module.php b/src/admin/inc/inc_menu_module.php index 702d5bd1..c2adeaa0 100644 --- a/src/admin/inc/inc_menu_module.php +++ b/src/admin/inc/inc_menu_module.php @@ -26,7 +26,7 @@ while ($row = $dsql->GetObject()) { } $adminMenu = ''; if ($cuserLogin->getUserType() >= 10) { - $adminMenu = DEDEBIZ_SAFE_MODE? "" : " + $adminMenu = DEDEBIZ_SAFE_MODE ? "" : " "; diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm index 63f8f708..f4c1762a 100644 --- a/src/admin/templets/index.htm +++ b/src/admin/templets/index.htm @@ -35,7 +35,7 @@ getUserType() >= 5) {?>
    • -
    • +
    • diff --git a/src/data/admin/ver.txt b/src/data/admin/ver.txt index f14544c9..42d3ac84 100644 --- a/src/data/admin/ver.txt +++ b/src/data/admin/ver.txt @@ -1 +1 @@ -20231010 \ No newline at end of file +20231108 \ No newline at end of file diff --git a/src/install/index.php b/src/install/index.php index 0557fd44..04e47105 100644 --- a/src/install/index.php +++ b/src/install/index.php @@ -11,7 +11,7 @@ error_reporting(E_ALL || ~E_NOTICE); define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt'); $verMsg = 'V6'; $dfDbname = 'DedeBIZ'; -$cfg_version_detail = '6.2.12'; //详细版本号 +$cfg_version_detail = '6.3.0'; //详细版本号 $errmsg = ''; if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) { mysqli_report(MYSQLI_REPORT_OFF); diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 7523d5e7..c97622d7 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -119,7 +119,7 @@ body.menu-show .body-right{left:220px;transition:all 0.5s} #file_list li:hover .tools{display:block} #file_list li .tools .remove{cursor:pointer} #file_list li .tools .remove:after{font-family:'FontAwesome';font-size:18px;color:var(--danger);content:'\f1f8'} -#selColor{padding:5px;width:35px} +#selColor{padding:0.22rem;width:45px} #edsta{display:none;padding:0.5rem;position:absolute;top:100px;left:200px;width:450px;height:auto;background:var(--bg);border:1px solid var(--gray-300)} #browsehappy{padding:1rem 30px;color:var(--orange);background:var(--yellow)} .browsehappy-close{float:right;cursor:pointer} diff --git a/src/static/web/img/colornew.htm b/src/static/web/img/colornew.htm index a752a53a..90f25575 100644 --- a/src/static/web/img/colornew.htm +++ b/src/static/web/img/colornew.htm @@ -1,4 +1,4 @@ - +
    @@ -28,5 +28,5 @@
        
    -

    自定义：

    + \ No newline at end of file diff --git a/src/system/common.inc.php b/src/system/common.inc.php index 374a4360..86a830af 100755 --- a/src/system/common.inc.php +++ b/src/system/common.inc.php @@ -188,7 +188,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft'; $cfg_other_medias = $cfg_medias_dir.'/media'; //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息 $cfg_version = 'V6'; -$cfg_version_detail = '6.2.12';//详细版本号 +$cfg_version_detail = '6.3.0';//详细版本号 $cfg_soft_lang = 'utf-8'; $cfg_soft_public = 'base'; $cfg_softname = '得德系统';