From 5daada4b9880c4820b8c459ebf702132610291bd Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 8 Apr 2022 16:37:35 +0800 Subject: [PATCH] =?UTF-8?q?issue=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Head/Header.js | 4 ++-- src/forge/Head/img/logo.png | Bin 2692 -> 8426 bytes src/forge/Order/MilepostDetail.js | 22 +++++++++++++++++++--- src/forge/users/Infos.js | 6 +++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index dd0710ecb..f493e6635 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -200,7 +200,7 @@ class NewHeader extends Component { const isdev2= isDev ?'https://testforgeplus.trustie.net':`https://${window.location.hostname}`; let str = ""; if(url.indexOf("http")>-1){ - str = isdev2+match.path; + str = isdev2+match.url; }else{ str = match.path; } @@ -299,7 +299,7 @@ class NewHeader extends Component { { publicNav && - ccf + ccf } diff --git a/src/forge/Head/img/logo.png b/src/forge/Head/img/logo.png index ab71a10e82ebb1ceed327f12c7a8aa8dc91c8f83..121cc04bbf4f3f5e5564c4134ea058fc9ad77c7b 100644 GIT binary patch literal 8426 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 M07*qoM6N<$f>A#T0{{R3 literal 2692 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 y(G{ + const prebannerList = prevProps && prevProps.bannerList; + const bannerList = this.props && this.props.bannerList; + if(prebannerList !== bannerList){ + if(bannerList && bannerList.length>0){ + let i = bannerList.filter(i=>i.menu_name === "issues"); + this.setState({ + issueFlag:i && i.length === 0 ? false :true + }) + } + } } getSelectList = () => { @@ -209,7 +224,7 @@ class MilepostDetail extends Component { render() { - const { issue_chosen, issues, limit, page, search_count, data, isSpin , status_type } = this.state; + const { issue_chosen, issues, limit, page, search_count, data, isSpin , status_type , issueFlag } = this.state; const { projectsId, meilid ,owner} = this.props.match.params; const { current_user , showLoginDialog , projectDetail } = this.props; const menu = ( @@ -245,10 +260,11 @@ class MilepostDetail extends Component { :"" } { - current_user && current_user.login ? + issueFlag ? (current_user && current_user.login ? {this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建疑修 : 创建疑修 + ):"" } diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index 47844f1ee..f3ecbaabd 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -315,9 +315,9 @@ class Infos extends Component {
{ !route_type && menuKey && - 概览 + 活动概览 数据统计 - 项目 + 参与项目 { current_user && user && user.login === current_user.login ? @@ -334,7 +334,7 @@ class Infos extends Component { } - 组织 + 参与组织 { user && user.user_org_count && user.user_org_count > 0 ? ({user.user_org_count}):""}