From 9e456c0ccaecffedc81900bb12ec07dd961e5f00 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 17 Jul 2020 18:09:24 +0800
Subject: [PATCH] =?UTF-8?q?md=E6=8D=A2=E8=A1=8C=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Order/Detail.js     | 1 -
 src/forge/Order/order_form.js | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 17755fda..f47b3114 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -323,7 +323,6 @@ class Detail extends Component {
               <span>{data && data.token ? data.token : "--"}</span>
             </p>
             } */}
-
             <p className="grid-item-left pb15">
               <span className="issue_detail_info">标签:</span>
               <span>
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 230b5cf7..7ac12c2a 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -1,5 +1,6 @@
 import React, { Component } from "react";
 import { Form, Input, Select, Button, DatePicker } from "antd";
+import { Cancel } from '../Component/layout';
 import Upload from "../Upload/Index";
 import UploadImg from "../Images/upload.png";
 import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor";
@@ -414,11 +415,8 @@ class order_form extends Component {
                 <Button
                   type="default"
                   className="ml30"
-                  href={
-                    form_type === "new"
-                      ? `/projects/${projectsId || orderId}/orders` : `/projects/${projectsId}/orders/${orderId}/detail`
-                      
-                  }
+                  onClick={()=>
+                    this.props.history.push(form_type === "new" ? `/projects/${projectsId || orderId}/orders` : `/projects/${projectsId}/orders/${orderId}/detail`)}
                 >
                   <span className="plr10">取消</span>
                 </Button>