diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index b33fb1ed..d8d787ea 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -242,24 +242,25 @@ class Detail extends Component{ const { project_id } = this.state; const url = `/projects/${project_id}/forks.json`; axios.post(url).then(result=>{ - if (result) { - if (result.data.status === 0) { + if (result && result.data.status === 0) { + // if (result.data.status === 0) { this.props.history.push(`/projects/${result.data.id}/coders`); this.props.showNotification(result.data.message); - } + // } this.setState({ isSpin:false }) - } else { - if(result.data.status !== 401){ - this.props.showNotification(result.data.message); - }else{ - this.setState({ - isSpin:false - }) - this.props.showNotification(`服务器开小差了`); - } } + // else { + // if(result.data.status !== 401){ + // this.props.showNotification(result.data.message); + // }else{ + // this.setState({ + // isSpin:false + // }) + // this.props.showNotification(`服务器开小差了`); + // } + // } }).catch(error=>{ this.setState({ isSpin:false diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index aa236065..2d3d1194 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -366,82 +366,85 @@ class Detail extends Component{ journalsdata.issue_journals.map((item,key)=>{ return(
- {item.user_name}
- 评论于
-
+ {item.user_name}
+ 评论于
+
- { quillFlag && 请输入评论内容} +
+ { quillFlag && 请输入评论内容} +
+- { quillFlag && 请输入评论内容} + wrapStyle={{ + height: '220px', + opacity:1, + }} + autoFocus={true} + style={{ height: '150px' }} + placeholder="添加评论..." + options={options} + value={quillValue} + onContentChange={this.onContentChange} + // showUploadImage={this.handleShowImage} + /> +
+ { quillFlag && 请输入评论内容} +
++ 评论 + { + data && data.user_permission ? + this.closedetail(data && data.issue_status === "关闭" ? 2 : 5)}>{data && data.issue_status === "关闭" ? "重新开启" : "关闭"} + : + "" + }
- 评论 - { - data && data.user_permission ? - this.closedetail(data && data.issue_status === "关闭" ? 2 : 5)}>{data && data.issue_status === "关闭" ? "重新开启" : "关闭"} - : - "" - } -
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css index 78b1b22b..fe31c278 100644 --- a/src/forge/Order/order.css +++ b/src/forge/Order/order.css @@ -453,6 +453,21 @@ .inputcount{ width: 40%; } +.loginDiv{ + border: 1px solid #f7c977; + background: rgb(255, 204, 113,0.3); + text-align: center; + padding:8px 0px; + border-radius: 4px; + width: 100%; + color: #999; + margin-top: 15px; +} +.loginDiv a{ + text-decoration: underline; + color: #4CACFF; + margin-right: 3px; +} .tagdiv{ padding: 15px;