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.created_at} - -

    -
    - this.editdetail(item.content,item.id)} className="detail_edit_action">编辑 - this.deleteorder(item.id)}> - 删除 - -
    -
    -
    -
    - { - item.content ? - this.commentCtx(item.content) - : -
    - {this.renderJournalList(item.journal_details)} -
    - } - { - item && item.attachments && item.attachments.length > 0 ? - - : - "" - } + { + key > 0&& +
    + } +
    + +
    +
    +

    + {item.user_name} + 评论于 + + {item.created_at} + +

    +
    + this.editdetail(item.content,item.id)} className="detail_edit_action">编辑 + this.deleteorder(item.id)}> + 删除 +
    -
    -
    - -

    - { quillFlag && 请输入评论内容} +

    +
    +
    + { + item.content ? + this.commentCtx(item.content) + : +
    + {this.renderJournalList(item.journal_details)} +
    + } + { + item && item.attachments && item.attachments.length > 0 ? + + : + "" + } +
    +
    +
    + +

    + { quillFlag && 请输入评论内容} +

    +
    + {/*