From 8645eb8e1be796c0e514f42ac2d0fb8368f9cd0f Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 23 Oct 2020 10:34:03 +0800
Subject: [PATCH] merge

---
 src/forge/Order/Detail.js | 74 ---------------------------------------
 1 file changed, 74 deletions(-)

diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 5389615d3..c22013a33 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -299,7 +299,6 @@ class Detail extends Component {
                   )}
               </div>
             </div>
-<<<<<<< HEAD
 
             <Comments
               order_id={orderId}
@@ -359,79 +358,6 @@ class Detail extends Component {
                 <span className="issue_detail_info">结束日期:</span>
                 <span>{data && data.due_date ? data.due_date : "--"}</span>
               </p>
-=======
-          </div>
-
-          <Comments
-            order_id={orderId}
-            showNotification={this.props.showNotification}
-            {...this.props}
-          />
-        </div>
-        <div className="list-left list-left-padding">
-          <div className="list-right-item-padding background-f boder-4">
-            <p className="grid-item-left pb15">
-              <span className="issue_detail_info">分支:</span>
-              <span>{data && data.branch_name ? data.branch_name : "--"}</span>
-            </p>
-            <p className="grid-item-left pb15">
-              <span className="issue_detail_info">是否上链:</span>
-              <span>{data && data.issue_type==="2" ? '是' : "否"}</span>
-            </p>
-            {
-              data && data.issue_type==="2" && 
-              <p  className="grid-item-left pb15">
-              <span className="issue_detail_info">token值:</span>
-              <span>{data && data.token ? data.token : "--"}</span>
-            </p>
-            }
-            <p className="grid-item-left pb15">
-              <span className="issue_detail_info">标签:</span>
-              <span>
-                {data && data.issue_tags ? (
-                  <span className="grid-item">
-                    <span
-                      className="tagColor"
-                      style={{ background: data.issue_tags[0].color }}
-                    ></span>
-                    {data.issue_tags[0].name}
-                  </span>
-                ) : (
-                  "--"
-                )}
-              </span>
-            </p>
-            <p className="grid-item-left pb15">
-              <span className="issue_detail_info">里程碑:</span>
-              <span className="title_overflow">
-                {data && data.version ? data.version : "--"}
-              </span>
-            </p>
-            <p className="grid-item-left pb15">
-              <span className="issue_detail_info">状态:</span>
-              <span>
-                {data && data.issue_status ? data.issue_status : "--"}
-              </span>
-            </p>
-            <p className="grid-item-left pb15">
-              <span className="issue_detail_info">分类:</span>
-              <span>{data && data.tracker ? data.tracker : "--"}</span>
-            </p>
-            <p className="grid-item-left pb15">
-              <span className="issue_detail_info">负责人:</span>
-              <span>
-                {data && data.assign_user_name ? data.assign_user_name : "--"}
-              </span>
-            </p>
-            <p className="grid-item-left pb15">
-              <span className="issue_detail_info">开始日期:</span>
-              <span>{data && data.start_date ? data.start_date : "--"}</span>
-            </p>
-            <p className="grid-item-left pb15">
-              <span className="issue_detail_info">结束日期:</span>
-              <span>{data && data.due_date ? data.due_date : "--"}</span>
-            </p>
->>>>>>> f1a60781842ca7e33708fbad16036d58ce84e5bc
 
               <p className="grid-item-left pb15">
                 <span className="issue_detail_info">完成度:</span>