diff --git a/src/AppConfig.js b/src/AppConfig.js index 825a2a3be..01e04672f 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -25,7 +25,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' : window.location.search.indexOf('debug=s') !== -1 ? 'student' : - window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin' + window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student' } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/src/forge/Component/ProfileModal/Index.jsx b/src/forge/Component/ProfileModal/Index.jsx index 86c6f178e..7cead761b 100644 --- a/src/forge/Component/ProfileModal/Index.jsx +++ b/src/forge/Component/ProfileModal/Index.jsx @@ -3,6 +3,7 @@ import Modals from '../PublicModal/Index'; import { Button } from 'antd'; import axios from 'axios'; +import ProfileImg from './images/profile.png'; import './Index.scss'; function ProfileModal({visible,onCancel,history}) { @@ -57,7 +58,7 @@ function ProfileModal({visible,onCancel,history}) { } >
- + { addMemberCheck ?

目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作

diff --git a/src/forge/Component/ProfileModal/Index.scss b/src/forge/Component/ProfileModal/Index.scss index c9ed0cd36..cf13121ed 100644 --- a/src/forge/Component/ProfileModal/Index.scss +++ b/src/forge/Component/ProfileModal/Index.scss @@ -3,8 +3,9 @@ align-items: center; justify-content: center; margin:10px auto 0px; - i{ + img{ margin-right: 13px; + width: 44px; } p{ line-height: 29px; diff --git a/src/forge/Component/ProfileModal/images/profile.png b/src/forge/Component/ProfileModal/images/profile.png new file mode 100644 index 000000000..6dbed21fc Binary files /dev/null and b/src/forge/Component/ProfileModal/images/profile.png differ diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 447d17f5e..b05b8d846 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -269,7 +269,7 @@ class NewHeader extends Component { ) }) } -
  • 设置
    • +
  • 设置
    • this.educoderloginysl()}>退出 ) diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx index d965be7e0..d9d4e49c2 100644 --- a/src/forge/SecuritySetting/Index.jsx +++ b/src/forge/SecuritySetting/Index.jsx @@ -39,14 +39,14 @@ function Index(props){ {current_user && current_user.username}
    - + diff --git a/src/forge/UsersList/focus_button.js b/src/forge/UsersList/focus_button.js index 3a04207a2..4fb62cba3 100644 --- a/src/forge/UsersList/focus_button.js +++ b/src/forge/UsersList/focus_button.js @@ -3,7 +3,7 @@ import axios from "axios"; import { Button } from "antd"; import "./list.css"; -function FocusButton({is_watch , fontClass, starText, is_block , id , successFunc}){ +function FocusButton({is_watch , fontClass, starText, is_block , id , successFunc,notReset}){ const [ isSpin , setIsSpin ] = useState(false); const [ watchFlag , setWatchFlag ] = useState(is_watch); // 关注和取消关注 @@ -19,7 +19,8 @@ function FocusButton({is_watch , fontClass, starText, is_block , id , successFun }).then((result) => { if (result && result.data.status === 0) { successFunc && successFunc(); - if(!flag){ + console.log(notReset); + if(notReset){ setWatchFlag(!watchFlag); } } diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js index 8894ff8b3..a0d25d6b9 100644 --- a/src/forge/UsersList/user_list.js +++ b/src/forge/UsersList/user_list.js @@ -6,7 +6,8 @@ import { Button } from "antd"; import "./list.css"; class UserList extends Component { - renderList = (users, userClass, current_user, type_title , successFunc) => { + renderList = (users, userClass, current_user, type_title , successFunc , notReset) => { + console.log("user:",notReset) if (users && users.length > 0) { return users.map((item, key) => { return ( @@ -43,7 +44,7 @@ class UserList extends Component { current_user && current_user.login === item.login ? : - + } @@ -53,9 +54,9 @@ class UserList extends Component { } } render() { - const { users, userClass, current_user , type_title , successFunc } = this.props; + const { users, userClass, current_user , type_title , successFunc , notReset } = this.props; return ( - this.renderList(users, userClass, current_user, type_title , successFunc) + this.renderList(users, userClass, current_user, type_title , successFunc , notReset) ); } } diff --git a/src/forge/users/GeneralView/ConcentrateBox.jsx b/src/forge/users/GeneralView/ConcentrateBox.jsx index 3ee941947..785739842 100644 --- a/src/forge/users/GeneralView/ConcentrateBox.jsx +++ b/src/forge/users/GeneralView/ConcentrateBox.jsx @@ -2,10 +2,11 @@ import React, { useEffect, useState } from 'react'; import { Modal , Checkbox , Spin , Input } from 'antd'; import Axios from 'axios'; import { Link } from 'react-router-dom'; +import CheckProfile from '../../Component/ProfileModal/Profile'; const { Search } = Input; const limit = 20; -function ConcentrateBox({ visible , onCancel , onSure , username , choosed }) { +function ConcentrateBox({ visible , onCancel , onSure , username , choosed , history , showCompeleteDialog , completeProfile }) { const [ page , setPage ]= useState(1); const [ total , setTotal ]= useState(0); const [ pageSize , setPageSize ] = useState(false); @@ -164,7 +165,16 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed }) { { total > limit && page < pageSize &&
    setPage(page+1)}>查看更多
    } - { (list && list.length === 0) && (copyList && copyList.length === 0) &&
    您还没有公开的{search && `“${search}”`}项目，先去新建项目
    } + { + (list && list.length === 0) && (copyList && copyList.length === 0) && +
    您还没有公开的{search && `“${search}”`}项目，先去 + {history.push(`/projects/deposit/new`)}} + className="color-blue">新建项目 +
    + } ) diff --git a/src/forge/users/GeneralView/ConcentrateProject.jsx b/src/forge/users/GeneralView/ConcentrateProject.jsx index 96b3d55ae..48875221b 100644 --- a/src/forge/users/GeneralView/ConcentrateProject.jsx +++ b/src/forge/users/GeneralView/ConcentrateProject.jsx @@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'; import axios from 'axios'; import Box from './ConcentrateBox'; -function ConcentrateProject({userLogin,current}) { +function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfile}) { const [ list , setList ] = useState(undefined); const [ visible , setVisible ] = useState(false); const [ value , setValue ] = useState([]); @@ -45,7 +45,15 @@ function ConcentrateProject({userLogin,current}) { } return( - setVisible(false)} onSure={onSure} username={userLogin} choosed={value}/> + setVisible(false)} + onSure={onSure} + username={userLogin} + choosed={value} + completeProfile={completeProfile} + showCompeleteDialog={showCompeleteDialog} + /> { list && list.length>0 &&
    diff --git a/src/forge/users/GeneralView/Index.jsx b/src/forge/users/GeneralView/Index.jsx index ded435827..24efe37c5 100644 --- a/src/forge/users/GeneralView/Index.jsx +++ b/src/forge/users/GeneralView/Index.jsx @@ -99,7 +99,11 @@ function Index(props) { return(
    - +

    近期活动统计

    diff --git a/src/forge/users/common_lists.js b/src/forge/users/common_lists.js index aa1ab813d..c9d78075c 100644 --- a/src/forge/users/common_lists.js +++ b/src/forge/users/common_lists.js @@ -91,7 +91,10 @@ class CommonList extends Component {
    -

    {userType === "watch_users" ? `${title_type}关注的` : `关注${title_type}的`}

    +

    + + {userType === "watch_users" ? `${title_type}关注的` : `关注${title_type}的`} +

    0 ? (
    - +
    ) : (