From dcfcca5799a8cd15125b5a7dd08e486b50f0fd5e Mon Sep 17 00:00:00 2001 From: starlee Date: Thu, 18 Nov 2021 09:00:59 +0800 Subject: [PATCH] examine whether logged before claim --- src/forge/Order/Detail.js | 2 +- src/forge/claims/claims.js | 31 ++++++++++++++++++------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 3be8cc2b..93f60d5f 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -317,7 +317,7 @@ class Detail extends Component {
- + {/*

hello in h1

*/}
diff --git a/src/forge/claims/claims.js b/src/forge/claims/claims.js index 97991270..4ec3c406 100644 --- a/src/forge/claims/claims.js +++ b/src/forge/claims/claims.js @@ -17,7 +17,7 @@ class claims extends React.Component { } getClaimers = ()=>{ const {issue_id} = this.state; - axios.get(`/issues/${issue_id}/claims`) + axios.get(`/issues/${issue_id}/claims.json`) .then((result) => { if(result){ console.log(result.data), @@ -32,19 +32,24 @@ class claims extends React.Component { } claimFun = (flag) => { - const {issue_id} = this.state; - axios({ - method: flag==1? 'delete' : 'post', - url: `/issues/${issue_id}/claims` - }).then(result => { - this.setState({ - claimerdata: result.data.claimers, - currentUserClaimed: result.data.currentUserclaimed + if (this.props.checkIfLogin() === false) { + this.props.showLoginDialog(); + return; + } else { + const {issue_id} = this.state; + axios({ + method: flag==1? 'delete' : 'post', + url: `/issues/${issue_id}/claims.json` + }).then(result => { + this.setState({ + claimerdata: result.data.claimers, + currentUserClaimed: result.data.currentUserclaimed + }); + }) + .catch(error => { + console.log(error); }); - }) - .catch(error => { - console.log(error); - }); + } } componentDidMount = () => {