From 00854ea103fdc2d8e2dddaaea587fbb6a39c3352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Fri, 19 Jul 2024 18:14:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E3=80=81=E5=AE=89=E8=A3=85=E9=A1=B5UI=E5=92=8C=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E8=AE=BE=E7=BD=AE=E6=96=B0=E5=A2=9E=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA=E7=AE=A1=E7=90=86=E5=91=98=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/setting/template/main.htm | 8 +++ core/core_version.php | 4 +- core/template/default/common/adminlogin.htm | 6 +- install/data/install_data.sql | 6 +- static/bootstrap/css/bootstrap.min.css | 9 +-- user/login/template/getpasswd.htm | 5 +- user/login/template/getpasswd2.htm | 5 +- user/login/template/getpasswd3.htm | 5 +- user/login/template/login_single1.htm | 54 ++++++++--------- user/login/template/login_single2.htm | 67 ++++++++++----------- user/login/template/login_single3.htm | 9 ++- user/login/template/login_single4.htm | 9 ++- user/login/template/lostpasswd.htm | 5 +- user/login/template/lostpasswd2.htm | 5 +- user/login/template/lostpasswd3.htm | 5 +- user/register/template/register.htm | 5 +- user/register/template/register2.htm | 7 +-- user/register/template/register3.htm | 5 +- 18 files changed, 93 insertions(+), 126 deletions(-) diff --git a/admin/setting/template/main.htm b/admin/setting/template/main.htm index 11b47d2..fd0e4af 100644 --- a/admin/setting/template/main.htm +++ b/admin/setting/template/main.htm @@ -672,6 +672,14 @@ +
+ +
+
+ checked="checked"> +
+
+
diff --git a/core/core_version.php b/core/core_version.php index 2cbae71..f211e51 100644 --- a/core/core_version.php +++ b/core/core_version.php @@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) { define('CORE_VERSION', '2.02'); define('CORE_RELEASE', '20180909'); define('CORE_FIXBUG' , '20000000'); - define('CORE_XHVERSION', '1.88.1'); - define('CORE_XHRELEASE', '20240714'); + define('CORE_XHVERSION', '1.88.2'); + define('CORE_XHRELEASE', '20240719'); define('CORE_XHFIXBUG' , '20240706'); } \ No newline at end of file diff --git a/core/template/default/common/adminlogin.htm b/core/template/default/common/adminlogin.htm index cb224ee..9465c76 100644 --- a/core/template/default/common/adminlogin.htm +++ b/core/template/default/common/adminlogin.htm @@ -52,7 +52,7 @@ -
+
@@ -90,7 +90,7 @@
-
+
-
+
$avastar diff --git a/install/data/install_data.sql b/install/data/install_data.sql index 273564a..14f9a54 100644 --- a/install/data/install_data.sql +++ b/install/data/install_data.sql @@ -11,7 +11,7 @@ INSERT INTO `dzz_app_market` (`appid`,`mid`, `appname`, `appico`, `appdesc`, `ap (7, 7, '分享管理', 'appico/201712/21/165535t47bad99b7qqqdwq.png', '管理和查阅所有分享', '{dzzscript}?mod=share', '', '', 0, 7, '乐云网络', 0, 1, 1, 0, '', '', 1, 0, 1, 2, 1, 1, 0, 'share', 'dzz', 1, '2.0', '', 20180206, ''), (8, 8, '系统日志', 'appico/201712/21/113527zz2665xg7d3h2777.png', 'Dzz 日志记录', '{adminscript}?mod=systemlog', '{adminscript}?mod=systemlog&op=admin', '', 0, 8, '乐云网络', 0, 1, 1, 0, '', '', 3, 0, 0, 2, 1, 0, 0, 'systemlog', 'admin', 1, '2.0', '', 20171115, 'a:2:{s:11:\"installfile\";s:11:\"install.php\";s:13:\"uninstallfile\";s:13:\"uninstall.php\";}'), (9, 9, '系统工具', 'appico/201712/21/160537cikgw2v6s6z4scuv.png', '系统维护相关工具集合，如：更新缓存、数据库备份，计划任务，在线升级等', '{adminscript}?mod=system', '', '', 1377677136, 9, '乐云网络', 0, 1, 1, 0, '', '', 3, 0, 0, 2, 1, 0, 0, 'system', 'admin', 1, '2.0', '', 20171115, ''), -(10, 10, '投票', 'appico/201712/21/150002d834yjjqnq82qj8z.png', 'Dzz 内置投票组件，结合其他应用使用，如新闻中用到投票插件，其他开发者也可以为自己的应用调用这个通用评论插件', '{dzzscript}?mod=dzzvote', '', '', 1378615073, 11, '乐云网络', 0, 0, 1, 0, '', '', 1, 0, 0, 2, 1, 1, 0, 'dzzvote', 'dzz', 1, '2.0', '', 20171115, ''), +(10, 10, '投票', 'appico/201712/21/150002d834yjjqnq82qj8z.png', 'Dzz 内置投票组件，结合其他应用使用，如新闻中用到投票插件，其他开发者也可以为自己的应用调用这个通用评论插件', '{dzzscript}?mod=dzzvote', '', '', 1378615073, 11, '乐云网络', 0, 0, 1, 0, '', '', 1, 0, 1, 2, 1, 1, 0, 'dzzvote', 'dzz', 1, '2.0', '', 20171115, ''), (11, 11, '评论', 'appico/201712/21/128754pb0s666i6sjws1jc.png', 'Dzz 系统评论组件，结合在其他应用使用，如新闻。其他开发者也可以为自己的应用调用这个通用评论插件', '{dzzscript}?mod=comment', '', '', 1378615073, 12, '乐云网络', 0, 1, 0, 0, '', '', 1, 0, 1, 2, 1, 1, 0, 'comment', 'dzz', 1, '2.0', '', 20171115, ''), (12, 37, '用户资料管理', 'appico/201712/21/103805dczcm89b0gi8i9gc.png', '管理用户资料、资料审核、认证等', '{adminscript}?mod=member', '', '', 1378615073, 13, '乐云网络', 0, 1, 1, 0, '', '', 3, 0, 0, 2, 1, 0, 0, 'member', 'admin', 1, '2.0', '', 20171115, ''), (13, 0, 'DPlayer', 'appico/202308/19/205443f8ucb4pueqebbrvp.png', 'DPlayer，支持MP3,mp4,flv,wav等格式', '{dzzscript}?mod=DPlayer', '', '', 1378615073, 0, '小胡', 1, 0, 1, 0, '', 'mp3,mp4,flv,webm,ogv,ogg,wav,m3u8', 0, 0, 1, 2, 1, 1, 0, 'DPlayer', 'dzz', 1, '1.2', '', 20230819, ''); @@ -164,7 +164,7 @@ INSERT INTO `dzz_setting` VALUES('attachurl', 'data/attachment'); INSERT INTO `dzz_setting` VALUES('jspath', 'static/js/'); INSERT INTO `dzz_setting` VALUES('seccodestatus', '5'); INSERT INTO `dzz_setting` VALUES('oltimespan', '15'); -INSERT INTO `dzz_setting` VALUES('sitecopyright', 'Copyright ©2012-2023 DzzOffice All Rights Reserved'); +INSERT INTO `dzz_setting` VALUES('sitecopyright', 'Copyright ©2012-2024 DzzOffice All Rights Reserved'); INSERT INTO `dzz_setting` VALUES('imgdir', 'static/image/common'); INSERT INTO `dzz_setting` VALUES('avatarmethod', '1'); INSERT INTO `dzz_setting` VALUES('reglinkname', '立即注册'); @@ -214,7 +214,7 @@ INSERT INTO `dzz_setting` VALUES('at_range', 'a:3:{i:9;s:1:"1";i:2;s:1:"2";i:1;s INSERT INTO `dzz_setting` VALUES('loginset', 'a:5:{s:5:"title";s:9:"DzzOffice";s:8:"subtitle";s:18:"协同办公平台";s:10:"background";s:0:"";s:8:"template";s:1:"1";s:6:"bcolor";s:0:"";}'); INSERT INTO `dzz_setting` VALUES('privacy', 'a:1:{s:7:"profile";a:17:{s:9:"education";i:1;s:8:"realname";i:-1;s:7:"address";i:0;s:9:"telephone";i:0;s:15:"affectivestatus";i:0;s:10:"department";i:0;s:8:"birthday";i:0;s:13:"constellation";i:0;s:9:"bloodtype";i:0;s:6:"gender";i:0;s:6:"mobile";i:0;s:2:"qq";i:0;s:7:"zipcode";i:0;s:11:"nationality";i:0;s:14:"graduateschool";i:0;s:8:"interest";i:0;s:3:"bio";i:0;}}'); INSERT INTO `dzz_setting` VALUES('thumbsize', 'a:3:{s:5:"small";a:2:{s:5:"width";i:256;s:6:"height";i:256;}s:6:"middle";a:2:{s:5:"width";i:800;s:6:"height";i:600;}s:5:"large";a:2:{s:5:"width";i:1440;s:6:"height";i:900;}}'); -INSERT INTO `dzz_setting` VALUES('verify', 'a:8:{i:1;a:9:{s:4:"desc";s:0:"";s:9:"available";s:1:"1";s:8:"showicon";s:1:"0";s:5:"field";a:1:{s:8:"realname";s:8:"realname";}s:8:"readonly";i:1;s:5:"title";s:12:"实名认证";s:4:"icon";s:31:"common/verify/1/verify_icon.jpg";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:2;a:8:{s:5:"title";s:0:"";s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:8:"readonly";N;s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:3;a:8:{s:5:"title";s:0:"";s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:8:"readonly";N;s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:4;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:5;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:6;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:7;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}s:7:"enabled";b:1;}'); +INSERT INTO `dzz_setting` VALUES('verify', 'a:8:{i:1;a:9:{s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:5:"field";a:1:{s:8:"realname";s:8:"realname";}s:8:"readonly";i:1;s:5:"title";s:12:"实名认证";s:4:"icon";s:31:"common/verify/1/verify_icon.jpg";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:2;a:8:{s:5:"title";s:0:"";s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:8:"readonly";N;s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:3;a:8:{s:5:"title";s:0:"";s:4:"desc";s:0:"";s:9:"available";s:1:"0";s:8:"showicon";s:1:"0";s:8:"readonly";N;s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:7:"groupid";a:0:{}}i:4;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:5;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:6;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}i:7;a:4:{s:4:"icon";s:0:"";s:12:"unverifyicon";s:0:"";s:9:"available";i:0;s:5:"title";s:0:"";}s:7:"enabled";b:1;}'); INSERT INTO `dzz_setting` VALUES('systemlog_open', '1'); INSERT INTO `dzz_setting` VALUES('systemlog_setting','a:7:{s:8:"errorlog";a:3:{s:5:"title";s:12:"系统错误";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:5:"cplog";a:3:{s:5:"title";s:12:"后台访问";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:9:"deletelog";a:3:{s:5:"title";s:12:"数据删除";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:9:"updatelog";a:3:{s:5:"title";s:12:"数据更新";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:8:"loginlog";a:3:{s:5:"title";s:12:"用户登录";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:8:"sendmail";a:3:{s:5:"title";s:12:"邮件发送";s:7:"is_open";i:1;s:8:"issystem";i:1;}s:8:"otherlog";a:3:{s:5:"title";s:12:"其他信息";s:7:"is_open";i:1;s:8:"issystem";i:1;}}'); diff --git a/static/bootstrap/css/bootstrap.min.css b/static/bootstrap/css/bootstrap.min.css index 020c77b..87b350a 100644 --- a/static/bootstrap/css/bootstrap.min.css +++ b/static/bootstrap/css/bootstrap.min.css @@ -15999,7 +15999,7 @@ fieldset:disabled .btn { .error-msg{ color: #FF0000; } -.avatar,.img-avatar{ +.avatar, .img-avatar{ -webkit-box-pack: center; -ms-flex-pack: center; justify-content: center; @@ -16015,7 +16015,7 @@ fieldset:disabled .btn { line-height: 48px; max-width: inherit; color: #fff; - font-size: 18px; + font-size: large; visibility: visible; border: 2px solid #fff; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); @@ -16238,7 +16238,7 @@ fieldset:disabled .btn { .user-ul li .user-a .cavatar { position:absolute; left:6px; - top:5px; + top:3px; } .user-ul li .user-a .cavatar .img-avatar { width:35px; @@ -16262,9 +16262,6 @@ fieldset:disabled .btn { display: flex; flex-wrap: wrap; } -.signin-form{ - max-width: 480px; -} .main-content { width: 100%; diff --git a/user/login/template/getpasswd.htm b/user/login/template/getpasswd.htm index 2e34b9d..d760a5c 100644 --- a/user/login/template/getpasswd.htm +++ b/user/login/template/getpasswd.htm @@ -26,9 +26,6 @@ text-align: center; pointer-events: none; } - html, body{ - overflow:auto; - } .card{ background-color:$_G[setting][loginset][kbcolor]; @@ -42,7 +39,7 @@ -
+
light year admin diff --git a/user/login/template/getpasswd2.htm b/user/login/template/getpasswd2.htm index 21f03e6..46e95f7 100644 --- a/user/login/template/getpasswd2.htm +++ b/user/login/template/getpasswd2.htm @@ -3,9 +3,6 @@ -
+
light year admin @@ -50,51 +47,52 @@

$_G[setting][loginset][subtitle]

diff --git a/user/login/template/login_single2.htm b/user/login/template/login_single2.htm index 25a9593..35cf49d 100644 --- a/user/login/template/login_single2.htm +++ b/user/login/template/login_single2.htm @@ -3,9 +3,6 @@ -
+
light year admin @@ -68,7 +65,9 @@
- 管理员登录 + + 管理员登录 +

{lang site_closed_please_admin}

diff --git a/user/login/template/lostpasswd.htm b/user/login/template/lostpasswd.htm index e777f59..36e6f4a 100644 --- a/user/login/template/lostpasswd.htm +++ b/user/login/template/lostpasswd.htm @@ -7,9 +7,6 @@ -
+