From 5abe75d637810d7ab24df2c3cfda37a6f8a70733 Mon Sep 17 00:00:00 2001 From: caishi Date: Fri, 3 Sep 2021 11:26:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99issue+?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppConfig.js | 2 +- src/forge/Component/ProfileModal/Index.jsx | 3 ++- src/forge/Component/ProfileModal/Index.scss | 3 ++- .../Component/ProfileModal/images/profile.png | Bin 0 -> 7322 bytes src/forge/Head/Header.js | 2 +- src/forge/SecuritySetting/Index.jsx | 8 ++++---- src/forge/UsersList/focus_button.js | 5 +++-- src/forge/UsersList/user_list.js | 9 +++++---- src/forge/users/GeneralView/ConcentrateBox.jsx | 14 ++++++++++++-- .../users/GeneralView/ConcentrateProject.jsx | 12 ++++++++++-- src/forge/users/GeneralView/Index.jsx | 6 +++++- src/forge/users/common_lists.js | 14 ++++++++++++-- 12 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 src/forge/Component/ProfileModal/images/profile.png diff --git a/src/AppConfig.js b/src/AppConfig.js index 5849a85f6..a39d2d4cf 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 0000000000000000000000000000000000000000..6dbed21fcf04a33c21079b5f78266154d42ee233 GIT binary patch literal 7322 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设置 +
  • 设置
    • 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 ? (
    - +
    ) : (