From eb02a088d9b80feee2c56b9cf260716cb17bb5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 7 Apr 2023 10:00:28 +0800
Subject: [PATCH] =?UTF-8?q?issue=E6=B7=BB=E5=8A=A0=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E6=94=B9=E5=88=B0issue=E5=88=97=E8=A1=A8=E4=B8=8B=E6=96=B9?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B6=E9=83=A8=E5=A2=9E=E5=8A=A0=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E2=80=9C=E6=B7=BB=E5=8A=A0=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E2=80=9D=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Issues/Component/comments/list.jsx  | 30 ++++++++++---------
 src/forge/Issues/Component/comments/list.scss |  7 +++++
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/forge/Issues/Component/comments/list.jsx b/src/forge/Issues/Component/comments/list.jsx
index b62902c45..518b3529e 100644
--- a/src/forge/Issues/Component/comments/list.jsx
+++ b/src/forge/Issues/Component/comments/list.jsx
@@ -117,20 +117,8 @@ function IssueCommentList(props){
           <Radio value={'all'} className='typeActionRadio font-14'>全部</Radio>
         </Radio.Group>
       </div>
-      {/* 添加评论 */}
-      {category !== 'operate' && <div className="pt5 pb30">
-        {login ? showEdit === 1 ? <EditComment {...props} cancelMd={cancelMd}/> : <div className="addComments">
-          <img src={getImageUrl(image_url)} alt="" />
-          <div style={{flex:1}}>
-            <CheckProfile {...props} sureFunc={()=>{setShowEdit(1)}}>
-              <Input className='addCommentBox' placeholder="添加评论"/>
-            </CheckProfile>
-          </div>
-        </div> : <div className='unLoginComment font-15 pl20'>
-          {/* 未登录用户 */}
-          <a className='mr5 loginBtn' onClick={()=>{showLoginDialog()}}>登录</a>并参与评论与回复
-        </div>}
-      </div>}
+      {/* 评论快速入口-仅有评论时展示 */}
+      {journalsCount > 0 && <div className='pt5 pb30'><div className='gotoComment'>点击<a className='ml5' href='#addComments'>添加评论</a></div></div>}
       {/* 评论/操作日志 展示列表 */}
       <Spin spinning={spin}>
         <div className={`issueCommentsBox ${category === 'comment' && !spin && 'justComment'}`}>
@@ -232,6 +220,20 @@ function IssueCommentList(props){
       {totalCount>limit && <div className='mt20 paginationIssueComment mb20'>
         <Pagination simple current={page} pageSize={limit} total={totalCount} onChange={(page)=>setPage(page)}/>
       </div>}
+      {/* 添加评论 */}
+      {category !== 'operate' && <div className="pb30" style={{marginTop: journalsCount ? '-5px' : '30px'}}>
+        {login ? showEdit === 1 ? <EditComment {...props} cancelMd={cancelMd}/> : <div className="addComments" id='addComments'>
+          <img src={getImageUrl(image_url)} alt="" />
+          <div style={{flex:1}}>
+            <CheckProfile {...props} sureFunc={()=>{setShowEdit(1)}}>
+              <Input className='addCommentBox' placeholder="添加评论"/>
+            </CheckProfile>
+          </div>
+        </div> : <div className='unLoginComment font-15 pl20'>
+          {/* 未登录用户 */}
+          <a className='mr5 loginBtn' onClick={()=>{showLoginDialog()}}>登录</a>并参与评论与回复
+        </div>}
+      </div>}
       {/* 无数据 新建第一条评论时暂无数据隐藏 用户未登录隐藏*/}
       {journals && !journals.length && showEdit !== 1 && login && <Nodata _html="暂无数据"/>}
     </div>
diff --git a/src/forge/Issues/Component/comments/list.scss b/src/forge/Issues/Component/comments/list.scss
index 5ab7622e5..550d559c8 100644
--- a/src/forge/Issues/Component/comments/list.scss
+++ b/src/forge/Issues/Component/comments/list.scss
@@ -192,4 +192,11 @@
 }
 .paginationIssueComment{
   text-align: center;
+}
+.gotoComment{
+  background-color:rgba(241, 243, 252, 0.55);
+  border-radius:4px;
+  color: rgba(172, 176, 191, 1);
+  padding: 8px 20px;
+  &>a{color: rgba(70, 106, 255, 1);}
 }
\ No newline at end of file