From 85bd0ffb62d0dc253c5845173aa35ade683b09d1 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 8 May 2021 16:53:16 +0800
Subject: [PATCH] merge develop

---
 src/forge/Component/Releases.jsx | 5 ++++-
 src/forge/Order/order.js         | 2 +-
 src/forge/Version/version.js     | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
index b3b0a774..67c3b47a 100644
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@@ -23,7 +23,10 @@ function Releases({owner,projectsId,releaseVersions}){
             <AlignTop className="mt10">
               <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
               <div>
-                <p className="font-16 color-grey-6"><Link to={`/projects/${owner}/${projectsId}/releases/8/update`}>{item.name}</Link></p>
+                <p className="font-16 color-grey-6">
+                  <Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link>
+                  <span className="font-12 laterest ml5">最新</span>
+                </p>
                 <p className="color-grey-9 font-13">{item.created_at}</p>
               </div>
             </AlignTop>
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 8875aa85..81c1e511 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -834,7 +834,7 @@ class order extends Component {
             )}
           {
             search_count > select_params.limit ?
-            <div className="mt30 mb10 edu-txt-center">
+            <div className="mt30 mb30 edu-txt-center">
               <Pagination
                 simple
                 defaultCurrent={select_params.page}
diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js
index 14c3d6e3..99223e1d 100644
--- a/src/forge/Version/version.js
+++ b/src/forge/Version/version.js
@@ -103,8 +103,8 @@ class version extends Component {
     const { data , releases , isSpin } = this.state
 
     return (
-      <div className="main" style={{paddingTop:"0px"}}>
-        <div className="topWrapper">
+      <div className="main" style={{padding:"0px"}}>
+        <div className="topWrapper" style={{padding:"15px 20px"}}>
           <span className="font-18 color-grey-3">版本发布</span>
           {
             data && data.user_permission ?
@@ -113,7 +113,7 @@ class version extends Component {
           }
         </div>
         <div className="releasesVersion">
-          <Spin spinning={isSpin}><div style={{minHeight:"300px"}}>{this.renderList(releases)}</div></Spin>
+          <Spin spinning={isSpin}><div>{this.renderList(releases)}</div></Spin>
         </div>
       </div>
     )