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 ab71a10e8..121cc04bb 100644 Binary files a/src/forge/Head/img/logo.png and b/src/forge/Head/img/logo.png differ diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index 66322ae18..809051f7b 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -46,7 +46,8 @@ class MilepostDetail extends Component { assigned_to_ids: '负责人', status_ids: "状态", done_ratios: '完成度', - paix: '排序' + paix: '排序', + issueFlag:true } } @@ -54,6 +55,20 @@ class MilepostDetail extends Component { this.getSelectList(); const { page } = this.state; this.getIssueList(page); + // + } + + componentDidUpdate=(prevProps)=>{ + 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}):""}