From df812332b3b15cf7ef83929762deb64371d74294 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?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Tue, 4 Apr 2023 17:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/feedback_main.htm          |  2 +-
 src/static/web/css/style.css                  |  7 ++--
 src/theme/dedebiz/widget_article_feedback.htm | 34 ++++++++++---------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/admin/templets/feedback_main.htm b/src/admin/templets/feedback_main.htm
index 996b7b5f..25e0b37a 100644
--- a/src/admin/templets/feedback_main.htm
+++ b/src/admin/templets/feedback_main.htm
@@ -85,7 +85,7 @@
 					ShowMsg("您没选中任何文档");
 					return;
 				};
-				DedeConfirm("您确定要删除这些评论吗").then((v)=>{
+				DedeConfirm("您确定要审核这些评论吗").then((v)=>{
 					location.href = "feedback_main.php?job=check&fid=" + qstr;
 				}).catch((e)=>{
 					console.log(e)
diff --git a/src/static/web/css/style.css b/src/static/web/css/style.css
index 5c82094c..1e8d97c0 100644
--- a/src/static/web/css/style.css
+++ b/src/static/web/css/style.css
@@ -256,15 +256,14 @@ input[type=file] {
 	border:solid 1px #ccc
 }
 .feedbacks .media {
-	border-bottom:solid 1px #ccc;
-	padding-top:10px
+	border-bottom:solid 1px #ccc
 }
 .feedbacks .feedback_replies .media {
 	border-top:solid 1px #ccc;
 	border-bottom:0
 }
 .feedbacks .media-body {
-	padding:0 1rem 1rem 1rem
+	padding:0 1rem 0 1rem
 }
 .feedbacks .media-body small {
 	color:#999
@@ -407,7 +406,7 @@ input[type=file] {
 .cke_bottom,.list-article-body {
 	border-radius:0 0 .5rem .5rem
 }
-#validateimg {
+#validateimg,.btnSend {
 	border-radius:0 .5rem .5rem 0
 }
 .rounded-circle {
diff --git a/src/theme/dedebiz/widget_article_feedback.htm b/src/theme/dedebiz/widget_article_feedback.htm
index 4e13172a..3b0299ca 100644
--- a/src/theme/dedebiz/widget_article_feedback.htm
+++ b/src/theme/dedebiz/widget_article_feedback.htm
@@ -3,18 +3,20 @@
 	<h4>发表评论</h4>
 	<div id="feedback-alert"></div>
 	<div class="content mb-3"><textarea id="iptMsg" name="msg" class="form-control" placeholder="请输入..." required></textarea></div>
-	<div class="post">
+	<div class="post mb-3">
 		<div class="dcmp-userinfo" id="_ajax_feedback">
-			<div class="form-group form-row">
-				<div class="col-md-6">
-					<label for="iptUsername">会员名</label>
-					<input type="text" class="form-control" id="iptUsername">
-				</div>
-				<div class="col-md-6 areaValidate" style="display:none">
-					<label for="iptValidate">验证码</label>
-					<div class="input-group">
-						<input type="text" class="form-control text-uppercase" id="iptValidate">
-						<img src="{dede:global.cfg_cmspath/}/apps/vdimgck.php" id="validateimg" onclick="this.src='{dede:global.cfg_cmspath/}/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
+			<div class="form-group">
+				<div class="row">
+					<div class="col-md-6">
+						<label for="iptUsername">会员名</label>
+						<input type="text" class="form-control" id="iptUsername">
+					</div>
+					<div class="col-md-6 areaValidate" style="display:none">
+						<label for="iptValidate">验证码</label>
+						<div class="input-group">
+							<input type="text" class="form-control text-uppercase" id="iptValidate">
+							<img src="{dede:global.cfg_cmspath/}/apps/vdimgck.php" id="validateimg" onclick="this.src='{dede:global.cfg_cmspath/}/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
+						</div>
 					</div>
 				</div>
 			</div>
@@ -29,7 +31,7 @@
 	</div>
 	<div class="feedbacks">
 		{dede:feedback}
-		<div class="media">
+		<div class="media pt-3">
 			<img class="face" src="[field:face/]" class="mr-2">
 			<div class="media-body">
 				<div class="feedback-content">[field:msg/]</div>
@@ -40,7 +42,7 @@
 						<a href="javascript:LoadReplyFeedbacks([field:id/])">[field:replycount/]条回复</a>
 						<a href="javascript:ReplyFeedback([field:id/])" class="btn btn-success btn-sm">回复</a>
 					</span>
-					<div class="feedback-action"><a href="javascript:GoodFeedback([field:id/], [field:good/])"><span id="feedbackGood[field:id/]">[field:good/]</span><i class="fa fa-thumbs-up ml-1"></i></a></div>
+					<div class="feedback-action"><a href="javascript:GoodFeedback([field:id/], [field:good/])"><span id="feedbackGood[field:id/]">[field:good/]</span><i class="fa fa-thumbs-up ml-2"></i></a></div>
 				</div>
 				<div class="_feedback_reply my-2" for="[field:id/]"></div>
 				<div class="feedback_replies" for="[field:id/]"></div>
@@ -100,7 +102,7 @@
 		let replyPannel = `<div class="form-group my-2">
 			<div class="input-group">
 				<input type="text" class="form-control iptReplyContent">
-				<button type="button" class="btn btn-success btnSend ml-2" onClick='SendReplyFeedback(${fid})'>评论</button>
+				<button type="button" class="btn btn-success btnSend" onClick='SendReplyFeedback(${fid})'>评论</button>
 			</div>
 		</div>`;
 		$.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json", function(result) {
@@ -124,7 +126,7 @@
 			"fid" : fid,
 		}, function (data) {
 			let result = JSON.parse(data);
-			let tpl = `<div class="media">
+			let tpl = `<div class="media py-3">
 				<img class="face" src="~face~">
 				<div class="media-body">
 					<div class="feedback-content">~msg~</div>
@@ -134,7 +136,7 @@
 							<small>~dtimestr~</small>
 						</span>
 						<div class="feedback-action">
-							<a href="javascript:GoodFeedback(~id~, ~good~)"><span id="feedbackGood~id~">~good~</span><i class="fa fa-thumbs-up"></i></a>
+							<a href="javascript:GoodFeedback(~id~, ~good~)"><span id="feedbackGood~id~">~good~</span><i class="fa fa-thumbs-up ml-2"></i></a>
 						</div>
 					</div>
 				</div>