From ce950ea45c8522ca534c048f6baae54074ad951d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 20 Aug 2020 18:07:37 +0800
Subject: [PATCH] url

---
 src/forge/Merge/MergeItem.js      | 2 +-
 src/forge/Merge/merge.js          | 2 +-
 src/forge/Order/MilepostDetail.js | 2 +-
 src/forge/Order/order.css         | 6 +++---
 src/forge/Order/order.js          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 0a005374..2585b9d4 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -98,7 +98,7 @@ class MergeItem extends Component {
                     <span className="ml15">
                       <Tag className="pr-branch-tag">
                         <Link
-                          to={`/projects/${owner}/${ item.is_original ? item.fork_project_id : projectsId }?branch=${item.pull_request_head}`}
+                          to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }?branch=${item.pull_request_head}`}
                           className="maxW200px hide-1 ver-middle"
                         >
                           {item.is_original
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 9ae71994..0eeb07f6 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -407,7 +407,7 @@ class merge extends Component {
         </div>
 
         {data && data.search_count && data.search_count > 0 ? (
-          <div style={{minHeight:"400px"}}>
+          <div style={{minHeight:"470px"}}>
             <Spin spinning={isSpin}>
               <OrderItem
                 issues={issues}
diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js
index 9f4b61af..62b8fd7b 100644
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@@ -282,7 +282,7 @@ class MilepostDetail extends Component {
             </div>
             {
               search_count > limit?
-              <div className="mt30 mb50 edu-txt-center">
+              <div className="mt30 mb10 edu-txt-center">
                 <Pagination simple current={page} total={search_count} pageSize={limit} onChange={this.ChangePage}></Pagination>
               </div>:""
             }
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 5db5aaf0..1d225f43 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -211,6 +211,9 @@
   padding: 6px 30px;
   cursor: pointer;
 }
+.setItemStyle{
+  min-height:440px;
+}
 .setItemStyle .issueItem{
   padding:16px 0px;
 }
@@ -221,9 +224,6 @@
   border-bottom: 1px solid #eee;
   padding: 16px 20px;
 }
-.issueItem:last-child{
-  border-bottom: none;
-}
 .issueNo {
   padding: 0px 5px;
   border-radius: 4px;
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 7e2715f2..51a94f3e 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -826,7 +826,7 @@ class order extends Component {
             )}
           {
             search_count > select_params.limit ?
-            <div className="mt30 mb50 edu-txt-center">
+            <div className="mt30 mb10 edu-txt-center">
               <Pagination
                 simple
                 defaultCurrent={select_params.page}