From 49c74b4f7379bc9aa5429d93e8067146154242a7 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Mon, 3 Feb 2020 10:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/forge/Order/Detail.js | 38 ++++++++++++++++++++++----
 public/react/src/forge/Order/order.css | 14 ++++++++++
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/public/react/src/forge/Order/Detail.js b/public/react/src/forge/Order/Detail.js
index bab0dd09c..08bc91cac 100644
--- a/public/react/src/forge/Order/Detail.js
+++ b/public/react/src/forge/Order/Detail.js
@@ -22,7 +22,9 @@ class Detail extends Component{
     const url = `/projects/${projectsId}/issues/${orderId}.json`;
     axios.get(url).then((result)=>{
       if(result){
-
+        this.setState({
+          data:result.data
+        })
       }
     }).catch((error)=>{
       console.log(error);
@@ -31,7 +33,7 @@ class Detail extends Component{
 
   render(){
     const { projectsId } = this.props.match.params;
-
+    const { data } = this.state;
     return(
       <div className="main">
         <div className="topWrapper">
@@ -41,13 +43,39 @@ class Detail extends Component{
         <div>
           <div className="detailContent">
             <p>
-              <span className="font-16">科技生活</span>
+              <span className="font-16">{ data && data.subject }</span>
               <a onClick={this.editOrder} className="color-blue fr">编辑</a>
             </p>
-            <p className="mt10">
-
+            <p className="mt15">{ data && data.description }</p>
+            <p className="mt10 color-grey-c">
+              由 { data && data.author_name} 于 { data && data.created_at }创建{ data && data.journals_count && data.journals_count > 0 ?` · ${data.journals_count} 条评论`:""}
             </p>
           </div>
+          <div className="f-wrap-between mt20" style={{alignItems:"flex-start"}}>
+            <div className="list-right df"></div>
+            <div className="list-left DetailRight">
+              <p>
+                <span className="span_title">当前状态</span>
+                <span>已解决</span>
+              </p>
+              <p>
+                <span className="span_title">优先级</span>
+                <span>高</span>
+              </p>
+              <p>
+                <span className="span_title">指派给</span>
+                <span>蔡世</span>
+              </p>
+              <p>
+                <span className="span_title">里程碑</span>
+                <span>20200131前上线</span>
+              </p>
+              <p>
+                <span className="span_title">里程碑</span>
+                <span>20200131前上线</span>
+              </p>
+            </div>
+          </div>
         </div>
       </div>
     )
diff --git a/public/react/src/forge/Order/order.css b/public/react/src/forge/Order/order.css
index 9326f5a7c..2df5848e7 100644
--- a/public/react/src/forge/Order/order.css
+++ b/public/react/src/forge/Order/order.css
@@ -178,6 +178,20 @@
   padding:15px 0px;
   border-bottom: 1px solid #f4f4f4;
 }
+.DetailRight{
+  padding: 10px 15px; 
+  border:1px solid #f4f4f4;
+  border-radius: 4px;
+}
+.DetailRight > p{
+  height: 30px;
+  line-height:30px;
+}
+.DetailRight > p >span:nth-child(1){
+  min-width: 90px;
+  margin-right: 15px;
+  text-align: right;
+}
 
 @media screen and (max-width: 700px){
   .topWrapper_select li{