From cb514315a6b48238ff7bab3082e1838deb396abe Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 12 Jul 2021 18:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=90=88=E5=B9=B6=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=EF=BC=9A=E5=88=87=E6=8D=A2=E7=9B=AE=E6=A0=87=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E6=88=96=E8=80=85=E6=BA=90=E5=88=86=E6=94=AF=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E7=94=A8=E8=B0=83=E7=94=A8check=5Fcan=5Fmerge?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/NewMerge.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 1ba7960ab..3382590ad 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -105,6 +105,18 @@ class NewMerge extends Component {
       }
       axios.get(url).then(result=>{
         if(result){
+          if (result.data.status === 0) {
+            this.setState({
+              isSpin: false,
+              show_message: false,
+            });
+          } else {
+            this.setState({
+              isSpin: false,
+              show_message: true,
+              default_message: result.data.message,
+            });
+          }
           this.setState({
             comparesData:result.data
           })
@@ -143,7 +155,7 @@ class NewMerge extends Component {
           merge:"master"
         })
       }
-      this.ischeckmerge();
+      // this.ischeckmerge();
     }
   }
 
@@ -169,7 +181,7 @@ class NewMerge extends Component {
   selectBrach = (type, value) => {
     const { projectsId , owner } = this.props.match.params;
     this.state[type] = value;
-    this.ischeckmerge();
+    // this.ischeckmerge();
     let { id ,merge , pull } = this.state;
     if(type==="pull"){
       this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
@@ -199,7 +211,6 @@ class NewMerge extends Component {
   };
 
   //判断2分支是否可以合并
-
   ischeckmerge = () => {
     this.setState({ isSpin: true });
     const { projectsId , owner } = this.props.match.params;