From dd62dd1704ca7d82ca9d66a342574386d96be3d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Wed, 29 Sep 2021 09:03:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PRloading=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/NewMerge.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 7d33028d3..8913b0d1c 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});
+      })
     }
   }