diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index 692cfc330..1a2ba1723 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -4,6 +4,9 @@ import axios from 'axios'; import { Input ,Icon,Button,Pagination} from 'antd'; import moment from 'moment'; import '../packageconcnet.css'; +import AccountProfile from"../../user/AccountProfile"; +import LoginDialog from '../../login/LoginDialog'; + const { Search } = Input; let categorylist=[ @@ -45,7 +48,9 @@ class PackageConcent extends Component { sort_direction:"desc", page:1, per_page:20, - categories:[] + categories:[], + isRender:false, + AccountProfiletype:false } } //desc’, ‘desc’, ‘asc’ @@ -134,12 +139,66 @@ class PackageConcent extends Component { this.setdatas(category,keyword,value,sort_directionvalue,page) } + + onReleaseRequirements=(url)=>{ + + let{current_user} =this.props; + if(current_user===undefined){ + this.setState({ + isRender:true + }) + return + } + if(current_user&¤t_user.login===""){ + this.setState({ + isRender:true + }) + return; + } + + if(current_user&¤t_user.profile_completed===false){ + this.setState({ + AccountProfiletype:true + }) + return; + } + if(url !== undefined || url!==""){ + window.location.href = url; + } + + } + + // 登录 + Modifyloginvalue=()=>{ + this.setState({ + isRender:false, + }) + } + + hideAccountProfile=()=>{ + this.setState({ + AccountProfiletype:false + }) + } + render() { - let {data,page,category,sort_by,sort_direction,project_packages}=this.state; + let {data,page,category,sort_by,sort_direction,project_packages, + isRender,AccountProfiletype + }=this.state; return (
- + {isRender===true?this.Modifyloginvalue()} + {...this.state} + {...this.props} + />:""} + + {AccountProfiletype===true?this.hideAccountProfile()} + {...this.state} + {...this.props} + />:""}
@@ -158,7 +217,7 @@ class PackageConcent extends Component { enterButton={ 搜索} onSearch={ (value)=>this.setdatafuns(value)} />

@@ -224,7 +283,7 @@ class PackageConcent extends Component {