From 1e0f522f4a6d4701b07a2d249ee948248fb95d00 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 19 Apr 2021 18:19:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=90=8E=E7=9A=84getImageURL?=
 =?UTF-8?q?=E4=B9=9F=E4=B8=8D=E7=94=A8=E5=9C=A8=E5=89=8D=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?/=20+=20=E4=B8=80=E4=BA=9B=E5=B0=8F=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/UrlTool.js        | 2 +-
 src/forge/Head/Header.js     | 3 +--
 src/forge/Main/Diff.jsx      | 2 +-
 src/forge/Main/list.css      | 3 ---
 src/forge/Merge/MergeItem.js | 7 ++++---
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index 6b3d3564..964c3548 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -15,7 +15,7 @@ export function getImageUrl(path) {
 	if (isDev) {
 		return `${local}/${path}`
 	}
-	return `/${path}`;
+	return `${path}`;
 }
 
 export function getImage(path) {
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 886ab2b7..510f91d3 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -703,8 +703,7 @@ class NewHeader extends Component {
             :
             <div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
               <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>
-                <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image"
-                  src={getImageUrl(`/` + user.image_url)} width="34">
+                <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image" src={getImageUrl(`/${user.image_url}`)} width="34">
                 </img>
               </a>
               <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index b3645351..d8db5f00 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -65,7 +65,7 @@ export default ({ match , history }) => {
           <div className="f-wrap-between" style={{ alignItems: "center" }}>
             <ul className="df">
               <User
-                url={(committer && getImageUrl(`images/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
+                url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
                 name={committer && committer.name}
               />
               {committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index a8143c55..07991f6a 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -437,9 +437,6 @@
   font-size: 16px;
   border-bottom: 1px solid #d9d9d9;
 }
-.branchUl{
-  padding:0px 30px;
-}
 .branchUl li{
   display: flex;
   flex-wrap: wrap;
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index e391ea5f..3b3504da 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import { Link } from "react-router-dom";
-import { Popconfirm, Tag } from "antd";
+import { Tag } from "antd";
+import { AlignCenter } from '../Component/layout';
 import { getImageUrl } from "educoder";
 import "./merge.css";
 
@@ -80,7 +81,7 @@ class MergeItem extends Component {
                       height="24"
                     />
                   </Link>
-                  <span>
+                  <AlignCenter>
                     <Link
                       to={`/users/${item && item.author_login}`}
                       className="show-user-link color-grey-8 ml5"
@@ -124,7 +125,7 @@ class MergeItem extends Component {
                         </Link>
                       </Tag>
                     </span>
-                  </span>
+                  </AlignCenter>
                 </p>
               </div>
               <ul