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){
项目简介 - { editOpration && 编辑 } + { editOpration && !edit && 编辑 } { 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}){
} > - {content} +
{content}
) } 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( 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}

- {item.name} + {item.name} {TagInfo(item.priority,"mr10")}

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 { )} - {/* - - - {(show_token || (issue_type && issue_type === "2")) && ( - - {getFieldDecorator("token", { - rules: [ - { - required: true, - message: "请填写token值", - }, - ], - initialValue: token, - })()} - - )} */}