diff --git a/src/forge/Component/ProfileModal/Index.jsx b/src/forge/Component/ProfileModal/Index.jsx index 8b15f1c72..225b75949 100644 --- a/src/forge/Component/ProfileModal/Index.jsx +++ b/src/forge/Component/ProfileModal/Index.jsx @@ -7,11 +7,15 @@ import './Index.scss'; function ProfileModal({visible,onCancel,history}) { const [ modalVis , setModalVis ] = useState(visible); + const [ addMemberCheck , setAddMemberCheck ] = useState(false); useEffect(()=>{ axios.interceptors.response.use((response) => { - if (response && response.data.status === 411) { + if (response && (response.data.status === 411 || response.data.status === 412)) { setModalVis(true); + if(response.data.status === 412){ + setAddMemberCheck(true); + } } return response; }, (error) => { @@ -41,13 +45,23 @@ function ProfileModal({visible,onCancel,history}) { onCancel={onNo} visible={modalVis} btn={ + addMemberCheck? +
您目前的个人资料不完整,需要补充资料以进行后续操作。是否前往补充个人信息?
+ { + addMemberCheck ? +目标用户个人资料不完整,需提醒目标用户补充资料后以进行后续操作
+ : +您目前的个人资料不完整,需要补充资料以进行后续操作。是否前往补充个人信息?
+ } ) } diff --git a/src/forge/Divert/DivertModal.jsx b/src/forge/Divert/DivertModal.jsx index 40dd68296..acf881175 100644 --- a/src/forge/Divert/DivertModal.jsx +++ b/src/forge/Divert/DivertModal.jsx @@ -41,15 +41,19 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){ // 确认转移 function onOk(){ validateFields((error,values)=>{ - console.log(...values); if(!error){ const url = `/${owner}/${repo}/applied_transfer_projects.json`; Axios.post(url,{ ...values }).then(result=>{ if(result){ - onSuccess(result.data && result.data.owner); + if(result.data.status === 0){ + onSuccess(result.data && result.data.owner); + }else{ + onSuccess(); + } } + }).catch(error=>{}) } }) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index fe2c226da..6087317e3 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -455,7 +455,10 @@ function CoderDepot(props){{desc}
} { diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index d77675c8b..1fcd1b44c 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -2,7 +2,8 @@ import React, { Component } from "react"; import { Link } from 'react-router-dom'; import { Dropdown, Menu, Icon, Pagination, Spin } from 'antd'; import './order.css'; -import { FlexAJ } from '../Component/layout' +import { FlexAJ } from '../Component/layout'; +import CheckProfile from '../Component/ProfileModal/Profile'; import NoneData from '../Nodata'; import OrderItem from './OrderItem'; @@ -239,7 +240,7 @@ class MilepostDetail extends Component {-
) diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx index 57239d38f..467f45a5c 100644 --- a/src/forge/Team/RightBox.jsx +++ b/src/forge/Team/RightBox.jsx @@ -1,5 +1,4 @@ import React , { useEffect , useState } from 'react'; -import { Button } from 'antd'; import styled from 'styled-components'; import Box from './Box'; import axios from 'axios'; @@ -7,6 +6,8 @@ import { getImageUrl } from 'educoder'; import { Link } from 'react-router-dom'; import Nodata from '../Nodata'; +import CheckProfile from '../Component/ProfileModal/Profile'; + const Span = styled.span`{ color:#888; font-size:12px; @@ -36,7 +37,7 @@ const Img = styled.img`{ height:45px; margin-right:12px; }` -function RightBox({ OIdentifier , history , admin }) { +function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,completeProfile }) { const [ memberData, setMemberData ] = useState(undefined); const [ groupData, setGroupData ] = useState(undefined); @@ -87,7 +88,15 @@ function RightBox({ OIdentifier , history , admin }) {
{
checkIfLogin() &&
-