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

Merge branch 'JKDevelop' of http://106.75.45.236:3000/durian/forgeplus-react into JKDevelop

This commit is contained in:
unknown 2022-02-25 13:54:53 +08:00
parent 9d68d9ce09 320e619206
commit 923b183ff1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/UrlTool.js
View File

@ -16,7 +16,7 @@ export function getImageUrl(path) {
if (isDev) {
return `${local}/${path}`
}
!path.startsWith('/') && (path = '/'.concat(path));
path && !path.startsWith('/') && (path = '/'.concat(path));
return `${path}`;
}

6
src/military/task/components/itemListTask/index.jsx
View File

@ -42,9 +42,9 @@ export default (props) => {
</div>
<div className="list-other">
<span className="user-box mr30" onClick={() => { goUser(item.user.login) }}>
<img alt="" className="head-log-small" src={getImageUrl(item.user.logo)} />
<span>{item.user.nickname || item.user.login}</span>
<span className="user-box mr30" onClick={() => { goUser(item.user && item.user.login) }}>
<img alt="" className="head-log-small" src={getImageUrl(item.user && item.user.logo)} />
<span>{(item.user && item.user.nickname) || (item.user && item.user.login)}</span>
</span>
<span className="font-14 mr30"><i className="iconfont icon-dianjiliang mr3 font-12" />{item.visits || 0}</span>
<span className="font-14 mr30"><Icon type="user" /><span className="color-orange">{item.papersCount || 0}</span>人参与</span>