diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index 7d33028d..8913b0d1 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -110,6 +110,7 @@ class NewMerge extends Component { const { author , identifier } =oldProject; url += `/${mergeBranch}...${author && author.login}/${identifier}:${localBranch}.json`; } + this.setState({isSpin: true}); axios.get(url).then(result=>{ if(result){ if (result.data.status === 0) { @@ -128,7 +129,9 @@ class NewMerge extends Component { comparesData:result.data }) } - }).catch(error=>{}) + }).catch(error=>{ + this.setState({isSpin: false}); + }) } }