diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js index d050116f..c6de9638 100644 --- a/src/forge/Merge/merge_form.js +++ b/src/forge/Merge/merge_form.js @@ -167,8 +167,8 @@ class MergeForm extends Component { this.setState({ isSpin: false, }); - const { pull_request_id } = result.data; - this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_id}`); + const { pull_request_number } = result.data; + this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_number}`); const { getDetail } = this.props; getDetail && getDetail(); } else { diff --git a/src/forge/users/Statistics/Index.jsx b/src/forge/users/Statistics/Index.jsx index aca25eb1..91118a67 100644 --- a/src/forge/users/Statistics/Index.jsx +++ b/src/forge/users/Statistics/Index.jsx @@ -9,6 +9,7 @@ import Pie from '../Echart/Pie'; import Cloud from '../Echart/Cloud'; import Radar from '../Echart/Radar'; import Round from '../Echart/Round'; +import Nodata from '../../Nodata'; import { DatePicker } from 'antd'; import moment from 'moment'; @@ -120,7 +121,7 @@ function Index(props) { } }).then(result=>{ if(result && result.data){ - setCloudData(result.data); + setCloudData({categories:[]}); } }).catch(error=>{}) } @@ -148,7 +149,7 @@ function Index(props) { } { - percentData && + percentData && percentData.length >0 &&
{ @@ -200,7 +201,12 @@ function Index(props) {

展示你擅长、关注、感兴趣的专业范围,通过你参与项目、收藏项目、关注项目、复刻项目等数据来统计。

- + { + cloudData && cloudData.length >0? + + : + + }