调整

src/admin/templets/catalog_edit.htm

@@ -251,7 +251,7 @@
 						<label><input type="radio" name="apienabled" value="1" <?php if ($myrow['apienabled']=="1") echo "checked='1'";?>> 支持</label>
 						<label><input type="radio" name="apienabled" value="0" <?php if ($myrow['apienabled']=="0") echo "checked='1'";?>> 不支持</label>
 						<span class="btn btn-success btn-sm ml-2" title="更新秘钥" onclick="makeAPIKey()"><i class="fa fa-repeat"></i></span>
-						<?php if ($myrow['apienabled']=="1") {;?><span class="btn btn-success btn-sm" title="秘钥标签" onclick="showAPI(<?php echo $id;?>)"><i class="fa fa-question-circle"></i></span><?php } ;?>
+						<span class="btn btn-success btn-sm" title="秘钥标签" onclick="showAPI(<?php echo $id;?>)"><i class="fa fa-question-circle"></i></span>
 					</td>
 				</tr>
 				<tr>

src/admin/templets/sys_info.htm

@@ -15,28 +15,28 @@
 		<table cellpadding="2" cellspacing="1" align="center" class="table maintable my-3">
 			<tr bgcolor="#f5f5f5">
 				<td>
-					<div class="input-group">
+					<span class="sys-search d-inline-block">
 						<input type="text" name="keywds" id="keywds" class="admin-input-lg mr-3" placeholder="请输入变量说明">
-						<button id="btnClear" type="button" class="btn bg-transparent d-none" style="margin-left: -40px; z-index: 100;">
-						  <i class="fa fa-times"></i>
-						</button>
-						<a href="javascript:getSearch();" class="btn btn-success btn-sm">搜索</a><?php
-						$ds = file(DEDEADMIN.'/inc/configgroup.txt');
-						$totalGroup = count($ds);
-						$i = 0;
-						foreach($ds as $dl)
-						{
-							$dl = trim($dl);
-							if (empty($dl)) continue;
-							$dls = explode(',',$dl);
-							$i++;
-							if ($i>1) echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
-							else {
-								echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
-							}
+						<button type="button" id="btnClear" class="btn btn-sm d-none sys-times"><i class="fa fa-times"></i></button>
+					</span>
+					<a href="javascript:getSearch();" class="btn btn-success btn-sm">搜索</a>
+					<?php
+					$ds = file(DEDEADMIN.'/inc/configgroup.txt');
+					$totalGroup = count($ds);
+					$i = 0;
+					foreach($ds as $dl)
+					{
+						$dl = trim($dl);
+						if (empty($dl)) continue;
+						$dls = explode(',',$dl);
+						$i++;
+						if ($i>1) echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
+						else {
+							echo "<a href='javascript:ShowConfig($i,$totalGroup)' class='btn btn-success btn-sm'>{$dls[1]}</a>";
 						}
-						?><a href="javascript:;" onclick="ShowHide('addvar')" class="btn btn-success btn-sm">添加变量</a>
-					</div>
+					}
+					?>
+					<a href="javascript:;" onclick="ShowHide('addvar')" class="btn btn-success btn-sm">添加变量</a>
 				</td>
 			</tr>
 			<tr id="addvar" style="display:none">

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;

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;
 }

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();
     }
 }

src/user/index.php

@@ -43,3 +43,4 @@ if ($uid == '') {
         $dpl->display();
     }
 }
+?>

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 = "<span class='text-success'><i class='fa fa-check'></i> 可以使用</span>";
                 } else {
-                    $msg = "<span class='text-danger'><i class='fa fa-times'></i> 邮箱已经被另一个帐号占用</span>";
+                    $msg = "<span class='text-danger'><i class='fa fa-times'></i> 邮箱已经被另一个会员占用</span>";
                 }
             }
         }

src/user/templets/index.htm

@@ -69,18 +69,18 @@
 							</div>
 						</div>
 					</div>
-					<?php if($cfg_mb_max > 0){ ?>
+					<?php if($cfg_mb_max > 0){?>
 					<div class="py-3">
 						<div class="pannel-main-container shadow-sm rounded">
 							<div class="media-body item-article">
 								<h4 class="mb-3 userspace">用户空间<span class="info">（<?php echo $minfos['totaluse'];?>MB/<?php echo $cfg_mb_max;?>MB）</span></h4>
 								<div class="progress">
-									<div class="progress-bar progress-bar-striped bg-success" role="progressbar" style="width: <?php echo $ddsize;?>%" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100"><?php echo $ddsize;?>%</div>
+									<div class="progress-bar progress-bar-striped bg-success" role="progressbar" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" style="width:<?php echo $ddsize;?>%"><?php echo $ddsize;?>%</div>
 								</div>
 							</div>
 						</div>
 					</div>
-					<?php } ?>
+					<?php }?>
 					<div class="pt-3">
 						<div class="pannel-main-container shadow-sm rounded">
 							<div class="media-body item-article">