From b4bf41894d39ecdc295466441192c3e2f1a94e27 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 11 Sep 2024 10:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/CreateMerge.js |  4 +-
 src/forge/users/Index.jsx      | 92 +++++++++++++++++-----------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index aadebd24c..d5cebe528 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -275,8 +275,8 @@ class CreateMerge extends Component {
     let _url = `/${mergeOwner}/${projectId}/compare/`;
     // type为pull时，pullBranch取value，否则取原有值
     // type为pull时，mergeBranch取原有值，否则取value
-    let _pullBranch = type === 'pull' ? value : pullBranch;
-    let _mergeBranch = type === 'pull' ? mergeBranch : value;
+    let _pullBranch = type === 'pull' ? value : returnbar(pullBranch);
+    let _mergeBranch = type === 'pull' ? returnbar(mergeBranch): value;
     if (pullOwner === mergeOwner) {
       // 如果仓库相同, compare/目标分支...源分支
       _url += `${turnbar(_mergeBranch)}...${turnbar(_pullBranch)}`;
diff --git a/src/forge/users/Index.jsx b/src/forge/users/Index.jsx
index 1bb848ce2..4afcc2573 100644
--- a/src/forge/users/Index.jsx
+++ b/src/forge/users/Index.jsx
@@ -24,52 +24,52 @@ class DetailTop extends Component {
     this.state = {}
   }
 
-  getProject = (num) => {
-    const { projectsId, owner } = this.props.match.params;
-    const url = `http://172.20.32.201:4000/${owner}/${projectsId}/simple.json`;
-    axios.get(url).then((result) => {
-      if (result && result.data) {
-        this.setState({
-          project: result.data,
-          open_devops: result.data.open_devops,
-          platform: result.data.platform && result.data.platform !== 'educoder'
-        })
-        if (result.data.type !== 0 && result.data.mirror_status === 1) {
-          console.log("--------start channel --------");
-          // 是镜像项目，且未完成迁移
-          this.canvasChannel();
-          if (num) {
-            this.setState({
-              secondSync: true,
-              firstSync: false
-            })
-          } else {
-            this.setState({
-              firstSync: true,
-              secondSync: false
-            })
-          }
-          this.setState({
-            mirror_status:1
-          })
-        } else if (result.data.mirror_status === 2) {
-          this.setState({
-            mirror_status:2,
-            firstSync: false
-          })
-          this.deleteProjectBack();
-        } else {
-          this.setState({
-            firstSync: false,
-            secondSync: false,
-            mirror_status:0
-          })
-          this.getBanner();
-          this.getDetail();
-        }
-      }
-    })
-  }
+  // getProject = (num) => {
+  //   const { projectsId, owner } = this.props.match.params;
+  //   const url = `/${owner}/${projectsId}/simple.json`;
+  //   axios.get(url).then((result) => {
+  //     if (result && result.data) {
+  //       this.setState({
+  //         project: result.data,
+  //         open_devops: result.data.open_devops,
+  //         platform: result.data.platform && result.data.platform !== 'educoder'
+  //       })
+  //       if (result.data.type !== 0 && result.data.mirror_status === 1) {
+  //         console.log("--------start channel --------");
+  //         // 是镜像项目，且未完成迁移
+  //         this.canvasChannel();
+  //         if (num) {
+  //           this.setState({
+  //             secondSync: true,
+  //             firstSync: false
+  //           })
+  //         } else {
+  //           this.setState({
+  //             firstSync: true,
+  //             secondSync: false
+  //           })
+  //         }
+  //         this.setState({
+  //           mirror_status:1
+  //         })
+  //       } else if (result.data.mirror_status === 2) {
+  //         this.setState({
+  //           mirror_status:2,
+  //           firstSync: false
+  //         })
+  //         this.deleteProjectBack();
+  //       } else {
+  //         this.setState({
+  //           firstSync: false,
+  //           secondSync: false,
+  //           mirror_status:0
+  //         })
+  //         this.getBanner();
+  //         this.getDetail();
+  //       }
+  //     }
+  //   })
+  // }
 
   render() {
     // 个人中心新增的二级目录都需在此添加一次。将项目放组织和个人名下后，此处根据二级目录作判断，