Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

上线后的getImageURL也不用在前面加/ + 一些小样式修改

This commit is contained in:
caishi 2021-04-19 18:19:21 +08:00
parent 798d919447
commit 1e0f522f4a
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/UrlTool.js
View File

@ -15,7 +15,7 @@ export function getImageUrl(path) {
if (isDev) { if (isDev) {
return `${local}/${path}` return `${local}/${path}`
} }
return `/${path}`; return `${path}`;
} }
export function getImage(path) { export function getImage(path) {

3
src/forge/Head/Header.js
View File

@ -703,8 +703,7 @@ class NewHeader extends Component {
: :
<div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}> <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`}> <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" <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image" src={getImageUrl(`/${user.image_url}`)} width="34">
src={getImageUrl(`/` + user.image_url)} width="34">
</img> </img>
</a> </a>
<ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}> <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>

2
src/forge/Main/Diff.jsx
View File

@ -65,7 +65,7 @@ export default ({ match , history }) => {
<div className="f-wrap-between" style={{ alignItems: "center" }}> <div className="f-wrap-between" style={{ alignItems: "center" }}>
<ul className="df"> <ul className="df">
<User <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} name={committer && committer.name}
/> />
{committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>} {committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}

3
src/forge/Main/list.css
View File

@ -437,9 +437,6 @@
font-size: 16px; font-size: 16px;
border-bottom: 1px solid #d9d9d9; border-bottom: 1px solid #d9d9d9;
} }
.branchUl{
padding:0px 30px;
}
.branchUl li{ .branchUl li{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

7
src/forge/Merge/MergeItem.js
View File

@ -1,6 +1,7 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Link } from "react-router-dom"; 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 { getImageUrl } from "educoder";
import "./merge.css"; import "./merge.css";
@ -80,7 +81,7 @@ class MergeItem extends Component {
height="24" height="24"
/> />
</Link> </Link>
<span> <AlignCenter>
<Link <Link
to={`/users/${item && item.author_login}`} to={`/users/${item && item.author_login}`}
className="show-user-link color-grey-8 ml5" className="show-user-link color-grey-8 ml5"
@ -124,7 +125,7 @@ class MergeItem extends Component {
</Link> </Link>
</Tag> </Tag>
</span> </span>
</span> </AlignCenter>
</p> </p>
</div> </div>
<ul <ul