diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index a5f7726d..35e2cc1b 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -251,7 +251,7 @@ - + diff --git a/src/admin/templets/sys_info.htm b/src/admin/templets/sys_info.htm index 47e1d729..07509b17 100644 --- a/src/admin/templets/sys_info.htm +++ b/src/admin/templets/sys_info.htm @@ -15,28 +15,28 @@ diff --git a/src/static/web/css/admin.css b/src/static/web/css/admin.css index 46c93f37..59f51e4e 100644 --- a/src/static/web/css/admin.css +++ b/src/static/web/css/admin.css @@ -369,8 +369,13 @@ body.hidemenu .body-right { height:20px; vertical-align:bottom } -.list-group-item { - padding:.65rem 0 +.sys-search { + position:relative +} +.sys-search .sys-times { + position:absolute; + top:1px; + right:20px } .coolbg { padding:.25rem .65rem; @@ -549,6 +554,9 @@ body.hidemenu .body-right { .l-height-28 { line-height:28px } +.list-group-item { + padding:.65rem 0 +} .btn-xs { padding:2px; line-height:12px; diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css index 89d0a684..80487068 100644 --- a/src/static/web/css/style.css +++ b/src/static/web/css/style.css @@ -352,6 +352,11 @@ input[type=file] { font-size:22px!important; color:#1eb867 } +.userspace .info { + font-size:14px; + font-weight:400; + color:#545b62 +} .list-group-item.active a { color:#fff } @@ -477,9 +482,4 @@ input[type=file] { .feedbacks .feedback-action { float:none } -} -.userspace .info{ - font-size: 14px; - font-weight: normal; - color: #545b62; } \ No newline at end of file diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php index e8014150..f4b9b716 100755 --- a/src/system/memberlogin.class.php +++ b/src/system/memberlogin.class.php @@ -26,11 +26,11 @@ function CheckUserID($uid, $msgtitle = '会员名', $ckhas = TRUE) if ($cfg_mb_notallow != '') { $nas = explode(',', $cfg_mb_notallow); if (in_array($uid, $nas)) { - return $msgtitle.'为系统禁止的标识'; + return $msgtitle.'系统禁止的标识'; } } if ($cfg_md_idurl == 'Y' && preg_match("/[^a-z0-9]/i", $uid)) { - return $msgtitle.'必须由英文字母或数字组成'; + return $msgtitle.'必须由英文字母和数字组合'; } if ($cfg_soft_lang == 'utf-8') { $ck_uid = utf82gb($uid); @@ -46,13 +46,13 @@ function CheckUserID($uid, $msgtitle = '会员名', $ckhas = TRUE) } } else { if (preg_match("/[^0-9a-z@\.-]/i", $ck_uid[$i])) { - return $msgtitle.'不能含有[@]、[.]、[-]以外的特殊符号'; + return $msgtitle.'只能用[0-9a-zA-Z_@!.-]以内范围的字符'; } } } if ($ckhas) { $row = $dsql->GetOne("SELECT * FROM `#@__member` WHERE userid LIKE '$uid' "); - if (is_array($row)) return $msgtitle."已经存在"; + if (is_array($row)) return $msgtitle."已存在"; } return 'ok'; } @@ -69,10 +69,10 @@ function CheckNotAllow() ShowMsg("您已经被禁言,请与管理员联系", "-1"); exit(); } else if ($cfg_ml->M_Spacesta == -10) { - ShowMsg("系统开启了邮件审核机制,因此您的帐号需要审核后才能发信息", "-1"); + ShowMsg("系统开启了邮件审核机制,您的帐号需要审核后才能发信息", "-1"); exit(); } else if ($cfg_ml->M_Spacesta < 0) { - ShowMsg('系统开启了审核机制,因此您的帐号需要管理员审核后才能发信息', '-1'); + ShowMsg('系统开启了审核机制,您的帐号需要管理员审核后才能发信息', '-1'); exit(); } } diff --git a/src/user/index.php b/src/user/index.php index f9ce277c..f09974e3 100755 --- a/src/user/index.php +++ b/src/user/index.php @@ -43,3 +43,4 @@ if ($uid == '') { $dpl->display(); } } +?> \ No newline at end of file diff --git a/src/user/index_do.php b/src/user/index_do.php index 6bab216e..2c0f36f3 100755 --- a/src/user/index_do.php +++ b/src/user/index_do.php @@ -76,7 +76,7 @@ if ($fmdo == 'sendMail') { $msg = ''; $uid = trim($uid); if ($cktype == 0) { - $msgtitle = '会员名称'; + $msgtitle = '会员名'; } else { $msgtitle = '会员名'; } @@ -106,7 +106,7 @@ if ($fmdo == 'sendMail') { if (!is_array($row)) { $msg = " 可以使用"; } else { - $msg = " 邮箱已经被另一个帐号占用"; + $msg = " 邮箱已经被另一个会员占用"; } } } diff --git a/src/user/templets/index.htm b/src/user/templets/index.htm index ae0209b5..03bb3d14 100755 --- a/src/user/templets/index.htm +++ b/src/user/templets/index.htm @@ -69,18 +69,18 @@ - 0){ ?> + 0){?>

用户空间MB/MB)

-
%
+
%
- +
-
+ - - 搜索1) echo "{$dls[1]}"; - else { - echo "{$dls[1]}"; - } + + + 搜索 + 1) echo "{$dls[1]}"; + else { + echo "{$dls[1]}"; } - ?>添加变量 -
+ } + ?> + 添加变量