From 0a38d4fee13f9427b0e4231e808efa8ca338fb3e 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: Mon, 16 Oct 2023 10:13:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=AE=A1=E6=A0=B8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/feedback_main.php           |  2 +-
 src/admin/templets/diy_list.htm       |  8 ++++----
 src/user/templets/content_list.htm    | 15 +++++----------
 src/user/templets/content_sg_list.htm |  6 +++---
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/admin/feedback_main.php b/src/admin/feedback_main.php
index 1d6bdf4b..0e5f4b60 100644
--- a/src/admin/feedback_main.php
+++ b/src/admin/feedback_main.php
@@ -16,7 +16,7 @@ require_once(DEDEINC."/typelink/typelink.class.php");
 setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/");
 function IsCheck($st)
 {
-    return $st == 1 ? '<span class="btn btn-success btn-sm">已审核</span>' : '<span class="btn btn-warning btn-sm">未审核</span>';
+    return $st == 1 ? '已审核':'未审核';
 }
 function jsTrimjajx($str, $len)
 {
diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm
index 227397fa..db04e6c1 100644
--- a/src/admin/templets/diy_list.htm
+++ b/src/admin/templets/diy_list.htm
@@ -19,8 +19,8 @@
 				<?php 
 				if (!empty($fields)) {
 					$allowhtml = array('htmltext');
-					$fields['sta'] = $fields['ifcheck'] == 1 ? '<span class="btn btn-success btn-sm">已审核</span>':'<span class="btn btn-danger btn-sm">未审核</span>';
-					echo '<tr bgcolor="#e9ecef"><td width="16%"><input type="checkbox" name="id[]" value="'.$fields['id'].'"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'" class="ml-2">表单'.$fields['id'].'</a></td><td align="right">'.$fields['sta'].'<a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'" class="btn btn-light btn-sm"><i class="fa fa-pencil-square"></i></a></td></tr>';
+					$fields['sta'] = $fields['ifcheck'] == 1 ? '已审核':'未审核';
+					echo '<tr bgcolor="#e9ecef"><td width="16%"><input type="checkbox" name="id[]" value="'.$fields['id'].'"><span>'.$fields['id'].'表单'.$fields['sta'].'</span></td><td align="right"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'" class="btn btn-light btn-sm"><i class="fa fa-pencil-square"></i></a></td></tr>';
 					foreach($fieldlist as $field=>$fielddata)
 					{
 						if ($fields[$field]=='') continue;
@@ -36,10 +36,10 @@
 				{/dede:datalist}
 				<tr>
 					<td colspan="3">
-						<input type="button" name="select" onclick="selAll()" class="btn btn-success btn-sm" value="全选">
-						<input type="button" name="select" onclick="noSelAll()" class="btn btn-success btn-sm mr-2" value="取消">
 						<label class="mr-2"><input type="radio" name="action" value="check"> 审核</label>
 						<label class="mr-2"><input type="radio" name="action" value="delete"> 删除</label>
+						<input type="button" name="select" onclick="selAll()" class="btn btn-success btn-sm" value="全选">
+						<input type="button" name="select" onclick="noSelAll()" class="btn btn-success btn-sm" value="取消">
 						<button type="submit" name="submit" class="btn btn-success btn-sm">提交</button>
 						<a href="<?php echo $cfg_phpurl;?>/diy.php?action=list&diyid=<?php echo $diy->diyid;?>" target="_blank" class="btn btn-success btn-sm">预览</a>
 					</td>
diff --git a/src/user/templets/content_list.htm b/src/user/templets/content_list.htm
index a9b43a17..2f366a8d 100755
--- a/src/user/templets/content_list.htm
+++ b/src/user/templets/content_list.htm
@@ -45,23 +45,18 @@
 										<td><?php echo $fields['typename'];?></td>
 										<td>
 											<?php
-											if ($fields['arcrank']>=0) echo '<span class="btn btn-outline-success btn-sm">已审核</span>';
-											else if ($fields['arcrank']==-2) echo '<span class="btn btn-outline-danger btn-sm">审核失败</span>';
-											else echo '<span class="btn btn-outline-danger btn-sm">未审核</span>';
+											if ($fields['arcrank']>=0) echo '已审核';
+											else if ($fields['arcrank']==-2) echo '审核失败';
+											else echo '未审核';
 											?>
 										</td>
 										<td><?php echo GetDateMk($fields['senddate']);?></td>
 										<td>
 											<a href="javascript:viewArc(<?php echo $fields['id'];?>);" class="btn btn-success btn-sm">预览</a>
-											<?php
-											if ($fields['arcrank']<0 || $dtime - $fields['senddate'] < $maxtime)
-											{
-											?>
+											<?php if ($fields['arcrank']<0 || $dtime - $fields['senddate'] < $maxtime) {?>
 											<a href="javascript:editArc(<?php echo $fields['id']?>,<?php echo $fields['channel']?>);" class="btn btn-success btn-sm">修改</a>
 											<a href="javascript:delArc(<?php echo $fields['id']?>);" class="btn btn-danger btn-sm">删除</a>
-											<?php
-											}
-											?>
+											<?php }?>
 										</td>
 									</tr>
 									{/dede:datalist}
diff --git a/src/user/templets/content_sg_list.htm b/src/user/templets/content_sg_list.htm
index b937b481..58426802 100755
--- a/src/user/templets/content_sg_list.htm
+++ b/src/user/templets/content_sg_list.htm
@@ -45,9 +45,9 @@
 										<td><?php echo $fields['typename'];?></td>
 										<td>
 											<?php
-											if ($fields['arcrank']>=0) echo '<span class="btn btn-outline-success btn-sm">已审核</span>';
-											else if ($fields['arcrank']==-2) echo '<span class="btn btn-outline-danger btn-sm">审核失败</span>';
-											else echo '<span class="btn btn-outline-danger btn-sm">未审核</span>';
+											if ($fields['arcrank'] >= 0) echo '已审核';
+											else if ($fields['arcrank'] == -2) echo '审核失败';
+											else echo '未审核';
 											?>
 										</td>
 										<td><?php echo GetDateMk($fields['senddate']);?></td>