From a42a670146c9f589c90a087b4db850f40e37027c Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 19 Apr 2021 17:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8Furl--=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=9A=E8=BF=94=E5=9B=9E=E6=89=80=E6=9C=89=E5=B8=A6images?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=80=BC=EF=BC=8C=E6=89=80=E4=BB=A5?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=B8=8D=E7=94=A8=E5=8A=A0=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Activity/ActivityItem.js | 2 +- src/forge/Component/AddMember.jsx | 2 +- src/forge/Component/Cards.jsx | 2 +- src/forge/Component/Contributors.jsx | 2 +- src/forge/Component/MemberCards.jsx | 2 +- src/forge/Component/SearchUser.jsx | 2 +- src/forge/Head/Header.js | 2 +- src/forge/Main/CoderDepot.jsx | 2 +- src/forge/Main/CoderRootCommit.js | 4 ++-- src/forge/Main/sub/Contribute.jsx | 2 +- src/forge/Merge/Commits.jsx | 2 +- src/forge/Merge/MergeItem.js | 2 +- src/forge/Merge/MergeSubmit.js | 2 +- src/forge/Order/Detail.js | 2 +- src/forge/Settings/CollaboratorMember.jsx | 2 +- src/forge/Team/Group/GroupDetailProject.jsx | 2 +- src/forge/Team/Group/Setting/GroupMemberSetting.jsx | 2 +- src/forge/Team/RightBox.jsx | 2 +- src/forge/Team/Setting/TeamSettingCommon.jsx | 2 +- src/forge/Team/Setting/TeamSettingMember.jsx | 2 +- src/forge/Team/TeamGroupItems.jsx | 2 +- src/forge/UsersList/fork_users.js | 2 +- src/forge/UsersList/user_list.js | 2 +- src/forge/comments/children_comments.js | 2 +- src/forge/comments/children_journals.js | 2 +- src/forge/comments/comments.js | 6 +++--- src/forge/users/Infos.js | 2 +- src/forge/users/Team-item.jsx | 2 +- 28 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js index 1baa2ce9..b726a4af 100644 --- a/src/forge/Activity/ActivityItem.js +++ b/src/forge/Activity/ActivityItem.js @@ -33,7 +33,7 @@ class ActivityItem extends Component { }

- + {item.user_name} {item.created_at && 创建于{item.created_at}} diff --git a/src/forge/Component/AddMember.jsx b/src/forge/Component/AddMember.jsx index a4188229..0548e52d 100644 --- a/src/forge/Component/AddMember.jsx +++ b/src/forge/Component/AddMember.jsx @@ -42,7 +42,7 @@ function AddMember({getID,login}){ className="user_img radius" width="28" height="28" - src={getImageUrl(`images/${item && item.image_url}`)} + src={getImageUrl(`/${item && item.image_url}`)} alt="" /> diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx index 1c9706c3..498b375c 100644 --- a/src/forge/Component/Cards.jsx +++ b/src/forge/Component/Cards.jsx @@ -6,7 +6,7 @@ import './Component.scss'; function Cards({img , title, desc , rightBtn , src}){ return(

- {img &&
} + {img &&
}

{title} diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx index 7848f9fc..d64e0d42 100644 --- a/src/forge/Component/Contributors.jsx +++ b/src/forge/Component/Contributors.jsx @@ -15,7 +15,7 @@ function Contributors({contributors,owner,projectsId}){ contributors && contributors.total_count > 0 ? contributors.list.map((item,key)=>{ return( - + ) }) :"" diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx index c0bd12c1..393ddbb1 100644 --- a/src/forge/Component/MemberCards.jsx +++ b/src/forge/Component/MemberCards.jsx @@ -45,7 +45,7 @@ const Div = styled.div`{ export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => { return (

- +
{name} diff --git a/src/forge/Component/SearchUser.jsx b/src/forge/Component/SearchUser.jsx index 43b45e85..0203d24f 100644 --- a/src/forge/Component/SearchUser.jsx +++ b/src/forge/Component/SearchUser.jsx @@ -44,7 +44,7 @@ export default ({ getUser })=>{ className="user_img radius" width="28" height="28" - src={getImageUrl(`images/${item && item.image_url}`)} + src={getImageUrl(`/${item && item.image_url}`)} alt="" /> diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 05f763ed..2f319241 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -704,7 +704,7 @@ class NewHeader extends Component {
+ src={getImageUrl(`/` + user.image_url)} width="34">
    diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 7d10e3e5..15032641 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -315,7 +315,7 @@ function CoderDepot(props){ { lastCommit &&
    - +

    {lastCommit && lastCommit.message}

    { hideBtn && changeHide(hide)}> } diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js index bb4f5ba5..5c509ecd 100644 --- a/src/forge/Main/CoderRootCommit.js +++ b/src/forge/Main/CoderRootCommit.js @@ -140,11 +140,11 @@ class CoderRootCommit extends Component{ { item.id ? - {item.image_url?:""} + {item.image_url?:""} : - {item.image_url?:""} + {item.image_url?:""} } diff --git a/src/forge/Main/sub/Contribute.jsx b/src/forge/Main/sub/Contribute.jsx index c6bd3998..a41cb3ed 100644 --- a/src/forge/Main/sub/Contribute.jsx +++ b/src/forge/Main/sub/Contribute.jsx @@ -50,7 +50,7 @@ function Contribute(props){ list.map((item,key)=>{ return( - +
    {item.name}

    提交{item.contributions}次

    diff --git a/src/forge/Merge/Commits.jsx b/src/forge/Merge/Commits.jsx index a7d12073..37c254cc 100644 --- a/src/forge/Merge/Commits.jsx +++ b/src/forge/Merge/Commits.jsx @@ -22,7 +22,7 @@ function Commits({ commits , projectsId , owner }){ 浏览代码 - :提交于{item.time_from_now} + :提交于{item.time_from_now}
    diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index dd5f4f45..e391ea5f 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -74,7 +74,7 @@ class MergeItem extends Component { > ( - + diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 87405919..277f5d4a 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -212,7 +212,7 @@ class Detail extends Component { > { projects.map((item, key) => { return (
    - + {item.project.name}
    ) diff --git a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx index c23ca14e..847dd6ef 100644 --- a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx +++ b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx @@ -76,7 +76,7 @@ export default ((props) => { width: "7%", render: (value, item) => { return ( - + ) } }, diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx index 06731712..0603a454 100644 --- a/src/forge/Team/RightBox.jsx +++ b/src/forge/Team/RightBox.jsx @@ -72,7 +72,7 @@ function RightBox({ OIdentifier , history , admin }) { memberData.organization_users.map((item,key)=>{ return(
    - +
    {item.user && item.user.name} 加入时间:{item.created_at} diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 1c44a150..1a48c7f7 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -169,7 +169,7 @@ export default Form.create()( )}

    选择头像:

    - +
    diff --git a/src/forge/Team/Setting/TeamSettingMember.jsx b/src/forge/Team/Setting/TeamSettingMember.jsx index 4871def6..34f0e28e 100644 --- a/src/forge/Team/Setting/TeamSettingMember.jsx +++ b/src/forge/Team/Setting/TeamSettingMember.jsx @@ -64,7 +64,7 @@ export default (({organizeDetail})=>{ width:"5%", render:(value)=>{ return( - value && + value && ) } }, diff --git a/src/forge/Team/TeamGroupItems.jsx b/src/forge/Team/TeamGroupItems.jsx index fd66f1eb..b3b4a371 100644 --- a/src/forge/Team/TeamGroupItems.jsx +++ b/src/forge/Team/TeamGroupItems.jsx @@ -86,7 +86,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){ { item.users && item.users.map((i,k)=>{ return( - k < count ? + k < count ? : k === count ? diff --git a/src/forge/UsersList/fork_users.js b/src/forge/UsersList/fork_users.js index cd771947..aaaa9b62 100644 --- a/src/forge/UsersList/fork_users.js +++ b/src/forge/UsersList/fork_users.js @@ -88,7 +88,7 @@ class ForkUsers extends Component { > diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js index 4c1aeda5..592e9806 100644 --- a/src/forge/UsersList/user_list.js +++ b/src/forge/UsersList/user_list.js @@ -18,7 +18,7 @@ class UserList extends Component { > diff --git a/src/forge/comments/children_comments.js b/src/forge/comments/children_comments.js index 65cf7784..8a8ccbc8 100644 --- a/src/forge/comments/children_comments.js +++ b/src/forge/comments/children_comments.js @@ -118,7 +118,7 @@ class children_comments extends Component { > {user && user.user_identity && (
    diff --git a/src/forge/users/Team-item.jsx b/src/forge/users/Team-item.jsx index d457ee26..f3dbc47c 100644 --- a/src/forge/users/Team-item.jsx +++ b/src/forge/users/Team-item.jsx @@ -4,7 +4,7 @@ import { getImageUrl } from 'educoder'; function TeamItem({item,history}){ return(
    {history.push(`/organize/${item.name}`)}} style={{cursor:"pointer"}}> -
    +
    {item.name}