From eb8cae5fb309be981509d03b2f69ebd7bba001cb Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 27 Oct 2020 14:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/About/Index.jsx                 |  2 +-
 src/forge/Component/Modal.jsx             |  2 +-
 src/forge/Component/PasswordAuthority.jsx |  4 ++--
 src/forge/Order/OrderItem.js              |  6 ++----
 src/forge/Order/order_form.js             | 22 ----------------------
 5 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/forge/About/Index.jsx b/src/forge/About/Index.jsx
index cc7e67adf..964c4e0a2 100644
--- a/src/forge/About/Index.jsx
+++ b/src/forge/About/Index.jsx
@@ -71,7 +71,7 @@ function Index(props){
       <div className="aboutContent">
         <AlignCenterBetween style={{padding:"14px 0px"}}>
           <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目简介</span>
-          { editOpration && <a onClick={editContent} className="color-blue">编辑</a> }
+          { editOpration && !edit && <a onClick={editContent} className="color-blue">编辑</a> }
         </AlignCenterBetween>
         {
           edit ? 
diff --git a/src/forge/Component/Modal.jsx b/src/forge/Component/Modal.jsx
index 5f1f664ec..aac589116 100644
--- a/src/forge/Component/Modal.jsx
+++ b/src/forge/Component/Modal.jsx
@@ -17,7 +17,7 @@ function Modals({visible,title,content,onOk,onCancel}){
         </div>
       }
     >
-      {content}
+      <div style={{fontSize:"16px"}}>{content}</div>
     </Modal>
   )
 }
diff --git a/src/forge/Component/PasswordAuthority.jsx b/src/forge/Component/PasswordAuthority.jsx
index 9d7fff444..9951f32e0 100644
--- a/src/forge/Component/PasswordAuthority.jsx
+++ b/src/forge/Component/PasswordAuthority.jsx
@@ -24,11 +24,11 @@ function PasswordAuthority({ authorityValBox , successFunc , cancelFunc }){
     axios.get(url,{
       params:{password:authorityVal}
     }).then(result=>{
+      setIsSpin(false);
       if(result){
-        setIsSpin(false);
         successFunc(result.data.step);
       }
-    }).catch(error=>{});
+    }).catch(error=>{setIsSpin(false);});
   }
   return(
     <Modal visible={authorityValBox} centered={true} title="授权" onCancel={cancelAuthority} onOk={okAuthority}>
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index f0f04be26..150b95d2a 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -1,9 +1,7 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Popconfirm, Tag } from 'antd'
+import { Popconfirm } from 'antd'
 import { TagInfo } from '../Utils/TagColor';
-
-
 class OrderItem extends Component {
   constructor(props) {
     super(props);
@@ -54,7 +52,7 @@ class OrderItem extends Component {
         {current_user && current_user.login && checkbox}
         <div className="flex-1">
           <p className="mb10 df" style={{alignItems:"center"}}>
-            <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"300px"}}>{item.name}</Link>
+            <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
             {TagInfo(item.priority,"mr10")}
           </p>
           <p className="color-grey-6 font-12">
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 2e79b3193..339a8c3cb 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -493,28 +493,6 @@ class order_form extends Component {
                     </Select>
                   )}
                 </Form.Item>
-                {/* <Form.Item label="是否上链">
-                  <Switch
-                    checkedChildren="是"
-                    unCheckedChildren="否"
-                    defaultChecked={false}
-                    checked={issue_type && issue_type === "2"}
-                    onChange={this.change_issue_type}
-                  />
-                </Form.Item>
-                {(show_token || (issue_type && issue_type === "2")) && (
-                  <Form.Item label="token">
-                    {getFieldDecorator("token", {
-                      rules: [
-                        {
-                          required: true,
-                          message: "请填写token值",
-                        },
-                      ],
-                      initialValue: token,
-                    })(<Input placeholder="请填写token值" />)}
-                  </Form.Item>
-                )} */}
               </div>
             </div>
           </Form>