From d9a3511eccee59ecf58426a61a6fc08615a5b430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 31 Oct 2019 09:47:53 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CompetitionContentspdfpeopledata.js | 4 +-
.../mycompetotionchild.css | 74 +++++++++++++++++++
2 files changed, 76 insertions(+), 2 deletions(-)
create mode 100644 public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/mycompetotionchild.css
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
index 45a5ab939..69ab5413b 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
@@ -22,9 +22,9 @@ class CompetitionContentspdfpeopledata extends Component{
return (
)
}
}
-export default CompetitionContentspdfpeopledata;
\ No newline at end of file
+export default CompetitionContentspdfpeopledata;
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/mycompetotionchild.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/mycompetotionchild.css
new file mode 100644
index 000000000..7f9652f44
--- /dev/null
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/mycompetotionchild.css
@@ -0,0 +1,74 @@
+/*垂直布局
+
+ 一
+ 二
+ 三
+*/
+.flexdirectionjust{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+}
+
+
+.directstwebkitflex{
+ display: flex;
+ display: -webkit-flex;
+ flex-direction: column;
+ align-items: center;
+}
+
+.diredisplayitflex{
+ display: flex;
+ display: -webkit-flex;
+ align-items: center;
+}
+/*垂直布局*/
+/*靠左侧
+一 二 三 四 五 六 七 八
+*/
+.flexdirection{
+ display: flex;
+ flex-direction:row;
+}
+
+.flexdirections{
+ display: flex;
+ flex-direction:initial;
+}
+/*靠左侧
+*/
+
+
+
+ /*靠右侧八 七 六 五 四 三 二 一*/
+ .flexdirectionss{
+ display: flex;
+ flex-direction:row-reverse;
+ }
+
+
+/*垂直布局
+一
+二
+三
+四
+*/
+.flexdidirectionss{
+ display: flex;
+ flex-direction:column;
+}
+
+/*垂直布局
+四
+三
+二
+一
+*/
+ .flexdidireverses{
+ display: flex;
+ flex-direction:column-reverse;
+ }
+
+
From 6c987ce6f9193e197710d0dc77de3b9b21338cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 31 Oct 2019 10:25:34 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=AF=81=E4=B9=A6?=
=?UTF-8?q?=E4=B8=8B=E8=BD=BDstart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CompetitionContentspdfdownload.css | 12 ++++++++
.../CompetitionContentspdfdownload.js | 30 ++++++++++++++++---
2 files changed, 38 insertions(+), 4 deletions(-)
create mode 100644 public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.css
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.css
new file mode 100644
index 000000000..eb41e7c05
--- /dev/null
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.css
@@ -0,0 +1,12 @@
+.pdfdownload{
+ max-width: 791px;
+ height: 40px;
+ background: rgba(249,249,249,1);
+ line-height: 40px;
+ padding-left: 15px;
+}
+
+.pdfpicture{
+ font-size:16px;
+ color:rgba(0,0,0,1);
+}
\ No newline at end of file
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js
index fc461bcb2..cf0482ff9 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js
@@ -1,7 +1,8 @@
import React, { Component } from 'react';
-import {Button,Layout} from 'antd';
+import {Button,Layout,Row, Col,Divider} from 'antd';
import axios from 'axios';
import {getImageUrl} from 'educoder';
+import './CompetitionContentspdfdownload.css';
// import NoneData from "../../../courses/shixunHomework/shixunHomework";
@@ -22,11 +23,32 @@ class CompetitionContentspdfdownload extends Component{
console.log(this.props)
return (
+
)
}
}
From 8d71763adc92bb208cbc6fa05ad93508f7c88303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 31 Oct 2019 16:23:00 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CompetitionContentspdfpeopledata.js | 101 +++++++++++++++-
.../mycompetotionchild.css | 109 ++++++++++++++++++
2 files changed, 204 insertions(+), 6 deletions(-)
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
index 69ab5413b..9b5f13050 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
@@ -1,8 +1,8 @@
import React, { Component } from 'react';
-import {Button,Layout} from 'antd';
+import {Button,Layout,Input} from 'antd';
import axios from 'axios';
import {getImageUrl} from 'educoder';
-// import NoneData from "../../../courses/shixunHomework/shixunHomework";
+import mycompetotionchild from './mycompetotionchild.css';
class CompetitionContentspdfpeopledata extends Component{
constructor(props) {
@@ -14,15 +14,104 @@ class CompetitionContentspdfpeopledata extends Component{
componentDidMount(){
window.document.title = '竞赛';
- console.log(this.props.match.params.identifier)
}
render() {
- console.log(this.props)
return (
-
- 345345
+
+
+
*实名信息
+
通过实名认证后才能获得证书
+
立即认证
+
+
+
姓名：
+
胡志勇
已认证
待审核！
撤销认证
+
+
+
+
+
+
*职业信息
+
通过职业认证后才能获得证书
+
立即认证
+
+
+
+
+
+
+
+
+
+
+
Email：
+
163@163.com
+
更换
+
+
+
+
签/领/开户行及银行卡号
+
为保障奖金的及时发放，请队长如实填写你名下的银行卡信息
+
+
+
+
+
+
+
+
+
+
+
+
)
}
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/mycompetotionchild.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/mycompetotionchild.css
index 7f9652f44..bf73dc59d 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/mycompetotionchild.css
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/mycompetotionchild.css
@@ -71,4 +71,113 @@
flex-direction:column-reverse;
}
+.fontcolorsysl{
+ color:#FF0000
+}
+.fontcolorsyslhei{
+ color:#000000
+}
+.fontcolorsyslhui{
+ color:#888888
+}
+.fontcolorsyslhui1{
+ color:#666666;
+}
+.fontcolorsysllan{
+ color:#4CACFF
+}
+.fontcolorsysljin{
+ color:#DD7600
+}
+
+.w200{
+ width: 200px;
+}
+.w64{
+ width: 64px;
+}
+
+.w60{
+ width: 60px;
+}
+.w98{
+ width: 98px;
+}
+
+.myysllineheight{
+ line-height: 40px;
+}
+.myyslminwidth{
+ min-width: 60px;
+}
+.myyslminwidth276{
+ width: 276px;
+}
+
+.buttongo{
+ background: #E7E7E7;
+ border: 1px solid #E7E7E7;
+ width: 60px;
+ height: 30px;
+ border-radius: 4px;
+ color: #999999;
+ font-size: 16px;
+}
+
+.buttongo2{
+ background: #4CACFF;
+ border: 1px solid #4CACFF;
+ width: 60px;
+ height: 30px;
+ border-radius: 4px;
+ color: #FFFFFF;
+ font-size: 16px;
+}
+
+.fontwenzi{
+ text-align: center;
+ line-height: 30px;
+}
+
+.mt17{
+ margin-top: 17px;
+}
+.mt36{
+ margin-top: 36px;
+}
+.mt23{
+ margin-top: 23px;
+}
+.mt19{
+ margin-top: 19px;
+}
+.mt23{
+ margin-top: 23px;
+}
+.mt34{
+ margin-top: 34px;
+}
+.ml11{
+ margin-left: 11px;
+}
+.ml38{
+ margin-left: 38px;
+}
+.ml7{
+ margin-left: 7px;
+}
+
+.colorgreenlight{
+ color:#6EC76E
+}
+
+.colorgreenorg{
+ color: #FF7300;
+}
+
+.borcolors{
+ border: 1px solid #4CACFF;
+
+ text-align: center;
+}
From 5418fb7ae1fc05768d01f0abeddfcdce2f552cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 1 Nov 2019 10:26:52 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/competition/RegistrationSearch.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/competition/RegistrationSearch.js b/public/react/src/modules/competition/RegistrationSearch.js
index 02d4fa861..a1f0b9ac3 100644
--- a/public/react/src/modules/competition/RegistrationSearch.js
+++ b/public/react/src/modules/competition/RegistrationSearch.js
@@ -54,11 +54,11 @@ class RegistrationSearch extends React.Component {
/>
战队总数：
Date: Fri, 1 Nov 2019 11:19:27 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Competitioncommon/CompetitionCommon.js | 42 ++++++++++++++-----
1 file changed, 31 insertions(+), 11 deletions(-)
mode change 100644 => 100755 public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
old mode 100644
new mode 100755
index d5461b627..e92dd66cc
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -3,9 +3,11 @@ import { Breadcrumb,Layout,Table, Divider, Tag,Badge,Row, Col,Button, Menu, Icon
import { Link } from 'react-router-dom';
import axios from 'axios';
import {markdownToHTML,getImageUrl} from 'educoder';
-import CompetitionContents from './CompetitionContents';
-import CompetitionContentsChart from './CompetitionContentsChart';
-import CompetitionContentsMd from './CompetitionContentsMd';
+import CompetitionContents from './CompetitionCommonChild/CompetitionContents';
+import CompetitionContentsChart from './CompetitionCommonChild/CompetitionContentsChart';
+import CompetitionContentsMd from './CompetitionCommonChild/CompetitionContentsMd';
+import CompetitionContentspdf from './CompetitionCommonChild/CompetitionContentspdf';
+import NoneData from "../../courses/shixunHomework/shixunHomework";
import './CompetitionCommon.css';
@@ -252,6 +254,13 @@ class CompetitionCommon extends Component{
}
+ isdownloadpdf=()=>{
+
+ this.setState({
+ isdownloadpdftype:true
+ })
+
+ }
render() {
let {data,thiskeys,Competitionedittype}=this.state;
@@ -264,11 +273,10 @@ class CompetitionCommon extends Component{
-
+
{data.competition_status==="nearly_published"?
- data && data.permission.editable === true ? "" :
- 即将发布 敬请期待
: ""}
+ data&&data.permission.editable===true?"":即将发布 敬请期待
:""}
![]({data.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):data.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):data.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""})
@@ -334,7 +342,7 @@ class CompetitionCommon extends Component{
:data.enroll_end===true?:
data.competition_status==="progressing"?
-
- 在线竞赛
- {data&&data.name}
-
-
-
-
-
- {data.competition_status==="nearly_published"?
- data && data.permission.editable === true ? "" :
- 即将发布 敬请期待
: ""}
-
-
- :data.avatar_url===null?getImageUrl(`images/educoder/competitions/mainbanner.jpg`):getImageUrl(data.avatar_url)}/)
-
-
+
+ 在线竞赛
+ {data&&data.name}
+
+
+
+
+
+ {data.competition_status==="nearly_published"?
+ data&&data.permission.editable===true?"":即将发布 敬请期待
:""}
+
+
+
+
+
- 15?"competitionbannerdiv mt30":"competitionbannerdiv mt30"}>{data&&data.name}
+ 15?"competitionbannerdiv mt30":"competitionbannerdiv mt30"}>{data&&data.name}
-
- 竞赛时间：{data&&data.start_time}～{data&&data.end_time}
- {/**/}
+
+ 竞赛时间：{data&&data.start_time}～{data&&data.end_time}
+ {/**/}
+
+
+
+
+
+ 奖金
+
+
+ 浏览数
+
+ 报名数
+
+
-
-
-
- 奖金
-
-
- 浏览数
-
-
- 报名数
-
-
-
-
-
- ¥{data&&data.bonus}
-
-
- {data.competition_status==="nearly_published"?"--":data&&data.visits_count}
-
-
- this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}
-
-
+
+
+ ¥{data&&data.bonus}
+
+
+ {data.competition_status==="nearly_published"?"--":data&&data.visits_count}
+
+ this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}
+
+
+
- {data.competition_status==="ended"?::}
-
- {data.competition_status==="ended"?
- :data.enroll_end===true?:
- data.competition_status==="progressing"?
-
+
+
+
+
+
+
+
+
+
+ {this.state.isdownloadpdftype===true?"":
+ {this.state.module_type==="chart"?Competitionedittype===false?this.Competitionedit()}
+ Competitioncallback={(e)=>this.Competitioncallback(e)}
+ />:"":Competitionedittype===false?this.Competitionedit()}
+ {...this.props}
+ {...this.state}
+ />:""}
+ {/**/}
+ {Competitionedittype===true?this.hideCompetitionedit()}
+ getlistdata={(keys,listkey)=>this.getlistdata(keys,listkey)}
+ Competitioncallback={(e)=>this.Competitioncallback(e)}
+ {...this.props}
+ {...this.state}
+ />:""}
+ }
+
+ {this.state.isdownloadpdftype===true?
+
+ :""}
+
@@ -373,14 +367,14 @@ class CompetitionCommon extends Component{
})}
-
+ {/*
*/}
- {this.state.isdownloadpdftype===true?"":
+ {module_type==="certificate"?"":
{this.state.module_type==="chart"?Competitionedittype===false?:""}
}
- {this.state.isdownloadpdftype===true?
+ {module_type==="certificate"?
{
+ if(response.status===200){
+ this.setState({
+ data:response.data,
+ })
+
+ console.log(response.data)
+ }
+ }).catch((error) => {
+ console.log(error)
+ })
}
render() {
console.log(this.props)
-
+ let {data}=this.state;
return (
@@ -33,7 +45,7 @@ class CompetitionContentspdfdownload extends Component{
- 个人证书: 暂未生成 原因:还未认证个人信息,立即认证
+ {data&&data.personal_certifications.length===0?个人证书:暂未生成 原因:还未认证个人信息，立即查看:""}
From b3f43afa432bdd8dd3bfad2cc0cd7edbca8360bf Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 1 Nov 2019 16:48:30 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E8=AE=A4=E8=AF=81?=
=?UTF-8?q?=E5=92=8C=E8=81=8C=E4=B8=9A=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/user/account/AccountBasicEdit.js | 235 ++----
.../user/account/AccountBasicEditItem.js | 199 +++++
.../user/modal/RealNameCertificationModal.js | 763 +++++++++++++-----
3 files changed, 825 insertions(+), 372 deletions(-)
create mode 100644 public/react/src/modules/user/account/AccountBasicEditItem.js
diff --git a/public/react/src/modules/user/account/AccountBasicEdit.js b/public/react/src/modules/user/account/AccountBasicEdit.js
index 1f87454a5..033f433b0 100644
--- a/public/react/src/modules/user/account/AccountBasicEdit.js
+++ b/public/react/src/modules/user/account/AccountBasicEdit.js
@@ -4,6 +4,7 @@ import { SnackbarHOC, getImageUrl, City, ConditionToolTip } from 'educoder';
import { Form, Button, Input, Radio, Select, Tooltip, Icon, AutoComplete } from 'antd'
import ApplyForAddOrgModal from '../modal/ApplyForAddOrgModal'
import ApplyForAddChildOrgModal from '../modal/ApplyForAddChildOrgModal'
+import AccountBasicEditItem from './AccountBasicEditItem';
import axios from 'axios'
import { identityMap } from './AccountBasic'
const RadioGroup = Radio.Group;
@@ -282,7 +283,9 @@ class AccountBasic extends Component {
getDepartments=(e,flag)=>{
let arr=this.state.schoolList.filter(function(item){
- return item.name == e;
+ if(item.name.indexOf(e) > -1){
+ return item.name;
+ }
});
if (!arr[0]) {
if (!e) {
@@ -354,20 +357,7 @@ class AccountBasic extends Component {
})
}
- // 切换职称
- changeJob=(e)=>{
-
- this.setState({
- identity:e
- })
- let {basicInfo}=this.props;
- if(basicInfo){
- this.props.form.setFieldsValue({
- job1:basicInfo && basicInfo.identity=="teacher" ? basicInfo.technical_title:"教授",
- job2:basicInfo && basicInfo.identity=="professional" ? basicInfo.technical_title:"企业管理者",
- })
- }
- }
+
addOrgSuccess = (name) => {
// const schoolList = this.state.schoolList.slice(0)
@@ -407,6 +397,19 @@ class AccountBasic extends Component {
}
callback(`请输入真实姓名，最大限制${MAX_NAME_LENGTH}个字符`);
}
+ // 切换职称
+ changeJob=(e)=>{
+ this.setState({
+ identity:e
+ })
+ let {basicInfo}=this.props;
+ if(basicInfo){
+ this.props.form.setFieldsValue({
+ job1:basicInfo && basicInfo.identity=="teacher" ? basicInfo.technical_title:"教授",
+ job2:basicInfo && basicInfo.identity=="professional" ? basicInfo.technical_title:"企业管理者",
+ })
+ }
+ }
render() {
let{
@@ -422,10 +425,17 @@ class AccountBasic extends Component {
}=this.state;
const { getFieldDecorator } = this.props.form;
let{ basicInfo }=this.props
-
- // 已职业认证的账户不能修改职业，学校/单位，院系/部门，产品还未确定，先默认为false--可以更改
- // basicInfo && basicInfo.professional_certification == "certified"
- const professionalFlag = false;
+ let common = {
+ changeJob:this.changeJob,
+ filterList:this.filterList,
+ changeList:this.changeList,
+ searchDepartment:this.searchDepartment,
+ changeDepartment:this.changeDepartment,
+ showApplyForAddOrgModal:this.showApplyForAddOrgModal,
+ showApplyForAddChildOrgModal:this.showApplyForAddChildOrgModal
+ }
+ // 已职业认证的账户不能修改职业，学校/单位，院系/部门（true为disable）
+ const professionalFlag = basicInfo && basicInfo.professional_certification == "certified" ;
// form合并了
const propsWithoutForm = Object.assign({}, this.props)
@@ -599,177 +609,22 @@ class AccountBasic extends Component {
)}
-
-
- {getFieldDecorator('job', {
- rules: [{
- initialValue:"teacher",
- required: true,
- message: '请先选择职业',
- }],
- })(
-
- )}
-
- {
- identity && identity=="student" &&
-
- {getFieldDecorator('student_No', {
- rules: [{
- required: true,
- message: '请先输入学号',
- }],
- })(
-
- )}
-
- }
- {
- identity && identity=="teacher" &&
-
- {getFieldDecorator('job1', {
- rules: [{
- initialValue:"教授",
- required: true,
- message: '请先选择职称',
- }],
- })(
-
- )}
-
- }
- {
- identity && identity=="professional" &&
-
- {getFieldDecorator('job2', {
- rules: [{
- initialValue:"企业管理者",
- required: true,
- message: '请先选择职称',
- }],
- })(
-
- )}
-
- }
-
-
-
- {getFieldDecorator('org', {
- rules: [{
- // initialValue: this.state.cityDefaultValue,
- // type: 'array',
- required: true,
- message: '请先选择学校/单位',
-
- // 做不了，输入时和submit时都会执行这里
- // validator: (rule, value, callback) => {
- // if (this.this_school_id) {
- // callback();
- // return;
- // }
- // callback('请先选择学校/单位');
- // }
-
- }],
- })(
-
- {
- filterSchoolList && filterSchoolList.map((item,key)=>{
- return()
- })
- }
-
- )}
-
-
- {!filterSchoolList || (filterSchoolList && filterSchoolList.length==0 )&& school &&
-
-
- 未找到包含“{school}”的高校，
- 申请新增
-
-
- }
-
- {getFieldDecorator('org2', {
- rules: [{
- // initialValue: this.state.cityDefaultValue,
- // type: 'array',
- required: true,
- message: '请先选择院系/部门',
- // validator: (rule, value, callback) => {
- // if (this.this_department_id) {
- // callback();
- // return;
- // }
- // callback('请先选择院系/部门');
- // }
- }],
- })(
-
- {
- filterDepartments && filterDepartments.map((item,key)=>{
- return(
-
- )
- })
- }
-
- )}
-
-
- {
- filterDepartments != undefined && ( (filterDepartments && filterDepartments.length==0 )
- || (departmentsName == '' && !this.state.department_id
- && (!departments || departments.length == 0) )) &&
-
-
- {departmentsName ? `未找到包含“${departmentsName}”的院系/部门` : '未找到院系'}，
- 申请新增
-
-
- }
-
-
+
{/* htmlType="submit" */}
{/*
*/}
diff --git a/public/react/src/modules/user/account/AccountBasicEditItem.js b/public/react/src/modules/user/account/AccountBasicEditItem.js
new file mode 100644
index 000000000..28988ebf3
--- /dev/null
+++ b/public/react/src/modules/user/account/AccountBasicEditItem.js
@@ -0,0 +1,199 @@
+import React, { Component } from 'react';
+
+import { SnackbarHOC, getImageUrl, City, ConditionToolTip } from 'educoder';
+import { Form, Button, Input, Radio, Select, Tooltip, Icon, AutoComplete } from 'antd'
+const RadioGroup = Radio.Group;
+const Option = Select.Option;
+class AccpimtBasicEditItem extends Component {
+ constructor(props){
+ super(props);
+ }
+
+ render(){
+ let {
+ professionalFlag ,
+ getFieldDecorator ,
+ identity ,
+ filterSchoolList ,
+ filterDepartments,
+ departmentsName,
+ school,
+ departments,
+ department_id
+ } = this.props
+ return(
+
+
+
+ {getFieldDecorator('job', {
+ rules: [{
+ initialValue:"teacher",
+ required: true,
+ message: '请先选择职业',
+ }],
+ })(
+
+ )}
+
+ {
+ identity && identity=="student" &&
+
+ {getFieldDecorator('student_No', {
+ rules: [{
+ required: true,
+ message: '请先输入学号',
+ }],
+ })(
+
+ )}
+
+ }
+ {
+ identity && identity=="teacher" &&
+
+ {getFieldDecorator('job1', {
+ rules: [{
+ initialValue:"教授",
+ required: true,
+ message: '请先选择职称',
+ }],
+ })(
+
+ )}
+
+ }
+ {
+ identity && identity=="professional" &&
+
+ {getFieldDecorator('job2', {
+ rules: [{
+ initialValue:"企业管理者",
+ required: true,
+ message: '请先选择职称',
+ }],
+ })(
+
+ )}
+
+ }
+
+
+ {getFieldDecorator('org', {
+ rules: [{
+ // initialValue: this.state.cityDefaultValue,
+ // type: 'array',
+ required: true,
+ message: '请先选择学校/单位',
+
+ // 做不了，输入时和submit时都会执行这里
+ // validator: (rule, value, callback) => {
+ // if (this.this_school_id) {
+ // callback();
+ // return;
+ // }
+ // callback('请先选择学校/单位');
+ // }
+
+ }],
+ })(
+
+ {
+ filterSchoolList && filterSchoolList.map((item,key)=>{
+ return()
+ })
+ }
+
+ )}
+
+
+ {!filterSchoolList || (filterSchoolList && filterSchoolList.length==0 )&& school &&
+
+
+ 未找到包含“{school}”的高校，
+ 申请新增
+
+
+ }
+
+
+ {getFieldDecorator('org2', {
+ rules: [{
+ // initialValue: this.state.cityDefaultValue,
+ // type: 'array',
+ required: true,
+ message: '请先选择院系/部门',
+ // validator: (rule, value, callback) => {
+ // if (this.this_department_id) {
+ // callback();
+ // return;
+ // }
+ // callback('请先选择院系/部门');
+ // }
+ }],
+ })(
+
+ {
+ filterDepartments && filterDepartments.map((item,key)=>{
+ return(
+
+ )
+ })
+ }
+
+ )}
+
+
+ {
+ filterDepartments != undefined && ( (filterDepartments && filterDepartments.length==0 )
+ || (departmentsName == '' && ! department_id
+ && (!departments || departments.length == 0) )) &&
+
+
+ {departmentsName ? `未找到包含“${departmentsName}”的院系/部门` : '未找到院系'}，
+ 申请新增
+
+
+ }
+
+ )
+ }
+}
+export default AccpimtBasicEditItem;
\ No newline at end of file
diff --git a/public/react/src/modules/user/modal/RealNameCertificationModal.js b/public/react/src/modules/user/modal/RealNameCertificationModal.js
index 9af082fea..8076b0649 100644
--- a/public/react/src/modules/user/modal/RealNameCertificationModal.js
+++ b/public/react/src/modules/user/modal/RealNameCertificationModal.js
@@ -1,15 +1,19 @@
import React, { Component } from "react";
-import { message, Icon, Input, Form, Upload} from "antd";
+import { message, Icon, Input, Form, Upload,Radio ,Tooltip} from "antd";
import axios from 'axios'
import ModalWrapper from "../../courses/common/ModalWrapper"
-import { City, getUploadActionUrl, getImageUrl, ImageLayer2, getUploadActionUrlOfAuth } from 'educoder'
+import { City, getUploadActionUrl, getImageUrl, ImageLayer2, getUploadActionUrlOfAuth ,ConditionToolTip } from 'educoder'
import '../account/common.css'
+import AccountBasicEditItem from '../account/AccountBasicEditItem'
+import ApplyForAddOrgModal from './ApplyForAddOrgModal'
+import ApplyForAddChildOrgModal from './ApplyForAddChildOrgModal'
import authImg from '../../../images/account/auth.png'
import jobImg from '../../../images/account/job.png'
-const { TextArea } = Input;
+const RadioGroup = Radio.Group;
const Dragger = Upload.Dragger;
+const MAX_NAME_LENGTH = 10
function getBase64(img, callback) {
const reader = new FileReader();
reader.addEventListener('load', () => callback(reader.result));
@@ -26,16 +30,230 @@ function beforeUpload(file) {
}
return isJPG && isLt2M;
}
+export function getHiddenName(name) {
+ if (!name) return ''
+ let len=parseInt(name.length)-1;
+ let str="";
+ for(var i = 0; i < len; i++){ str += "*"; }
+ const newName = name.substr(0,1)+str;
+ return newName
+}
class RealNameCertificationModal extends Component{
constructor(props){
super(props);
this.state={
+ identity:"teacher",
+ departmentsName:undefined,
+ filterSchoolList:undefined,
+ filterDepartments :undefined,
+ school:undefined,
+ school_id:undefined,
+ department_id:undefined,
+ schoolList:undefined,
+ departments:undefined,
+ showRealName:true,
}
}
componentDidMount() {
-
+ if(this.props.basicInfo){
+ this.setValue(this.props.basicInfo);
+ this.getSchoolList(this.props.basicInfo);
+ }
+ }
+
+ setValue=(basicInfo)=>{
+ if(basicInfo){
+ this.props.form.setFieldsValue({
+ nickname:basicInfo.nickname,
+ name:!basicInfo.show_realname ? this.hideRealName(basicInfo.name) : basicInfo.name,
+ sex:String(basicInfo.gender),
+ job:basicInfo.identity,
+ org:basicInfo.school_name,
+
+ // city:[basicInfo.location,basicInfo.location_city]
+ })
+ setTimeout(() => {
+ // 等显示后再set
+ this.props.form.setFieldsValue({
+ job:basicInfo.identity,
+ student_No:basicInfo.student_id,
+ org2:basicInfo.department_name,
+ job1:basicInfo && basicInfo.identity=="teacher" ? basicInfo.technical_title:"教授",
+ job2:basicInfo && basicInfo.identity=="professional" ? basicInfo.technical_title:"企业管理者",
+ })
+ }, 100)
+ //if(basicInfo.nickname){
+ this.setState({
+ forDisable: true,
+ nameLength:basicInfo.nickname?basicInfo.nickname.length:0,
+ showRealName:basicInfo.show_realname,
+ realName: basicInfo.name,
+ identity:basicInfo.identity,
+ school_id:basicInfo.school_id,
+ department_id:basicInfo.department_id
+ })
+ //}
+ }
+ }
+
+ getSchoolList=(basicInfo, selectedName)=>{
+ let url=`/schools/for_option.json`;
+ axios.get(url).then((result)=>{
+ if(result){
+ this.setState({
+ schoolList:result.data.schools
+ })
+ if (selectedName) {
+ let school_id
+ result.data.schools.reverse().some( item => {
+ if (item.name == selectedName) {
+ school_id = item.id
+ return true;
+ }
+ })
+ this.props.form.setFieldsValue({
+ org: selectedName
+ })
+ this.setState({
+ school_id,
+ school: selectedName
+ }, () => {
+ this.filterList(selectedName)
+ })
+ } else if(basicInfo && basicInfo.school_name){
+ this.setState({
+ school:basicInfo.school_name,
+ filterSchoolList:this.state.schoolList.filter(function(item){
+ return item.name.indexOf(basicInfo.school_name)>-1;
+ })
+ })
+ this.getDepartments(basicInfo.school_name,false);
+ }
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ // 将名字隐藏起来
+ hideRealName=(name)=>{
+ this.setState({ realName: name })
+ const newName = getHiddenName(name)
+
+ this.props.form.setFieldsValue({
+ name: newName
+ })
+ return newName
+ }
+
+ getDepartments=(e,flag)=>{
+ let arr=this.state.schoolList.filter(function(item){
+ if(item.name.indexOf(e) > -1){
+ return item.name;
+ }
+ });
+ if (!arr[0]) {
+ if (!e) {
+ this.setState({
+ filterSchoolList: []
+ })
+ }
+ // 没找到学校，清空部门
+ this.setState({
+ departments: [],
+ filterDepartments: [],
+ departmentsName: '',
+ school_id: '',
+ department_id: '',
+ })
+ this.this_school_id = ''
+ this.props.form.setFieldsValue({
+ org2: ''
+ })
+ return;
+ }
+ this.props.form.setFieldsValue({
+ org: arr[0].name
+ })
+ this.filterList(e)
+ // 保存选择的学校id
+ this.this_school_id = arr[0].id
+ this.setState({
+ school_id: arr[0].id,
+ school:e,
+ })
+ this._getDepartments(arr[0].id, flag)
+ }
+ _getDepartments = (schoolId, flag, selectedName) => {
+ let url=`/schools/${schoolId || this.state.school_id}/departments/for_option.json`;
+ axios.get(url).then((result)=>{
+ if(result){
+ this.setState({
+ departments:result.data.departments,
+ filterDepartments:result.data.departments
+ })
+ if (selectedName) {
+ let department_id
+ result.data.departments.reverse().some( item => {
+ if (item.name == selectedName) {
+ department_id = item.id
+ return true;
+ }
+ })
+ this.props.form.setFieldsValue({
+ org2: selectedName
+ })
+ this.setState({
+ department_id,
+ // school: selectedName
+ })
+ } else if(result.data.departments && result.data.departments.length>0 && flag==true){
+ // 切换学校后，部门默认选择第一个
+ this.props.form.setFieldsValue({
+ org2:result.data.departments[0].name
+ })
+ this.setState({
+ department_id: result.data.departments[0].id
+ })
+ }else if(result.data.departments && result.data.departments.length == 0 && flag==true){
+ this.props.form.setFieldsValue({
+ org2:''
+ })
+ }
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ filterList =(e)=>{
+ const inputVal = e.trim()
+ let arr=[];
+ if(inputVal){
+ arr= this.state.schoolList.filter(function(item){
+ return item.name.indexOf(inputVal)>-1;
+ });
+ this.props.form.setFieldsValue({
+ org: inputVal
+ })
+ this.setState({
+ school: inputVal,
+ filterSchoolList: arr
+ })
+ } else {
+ this.setState({
+ school: '',
+ })
+ }
+ // else{
+ // let {school}=this.state;
+ // arr= this.state.schoolList.filter(function(item){
+ // return item.name.indexOf(school)>-1;
+ // });
+ // }
}
+
setVisible = (visible) => {
this.refs.modalWrapper.setVisible(visible)
}
@@ -53,6 +271,7 @@ class RealNameCertificationModal extends Component{
let url = `/users/accounts/${current_user && current_user.login}/authentication_apply.json`
axios.post((url),{
name:basicInfo.name,
+ gender:parseInt(values.sex),
id_number:values.credentials
}).then((result)=>{
if(result){
@@ -65,12 +284,13 @@ class RealNameCertificationModal extends Component{
})
}else{
// 职业认证
+ // console.log(values.job == "student" ? values.student_No : values.job == "teacher" ? values.job1 : values.job2);
let url = `/users/accounts/${current_user && current_user.login}/professional_auth_apply.json`
axios.post((url),{
- school_id:basicInfo && basicInfo.school_id,
- department_id:basicInfo && basicInfo.department_id,
- identity:basicInfo && basicInfo.identity,
- extra:basicInfo && basicInfo.identity == "student" ? basicInfo.student_id:basicInfo.technical_title
+ school_id:this.state.school_id,
+ department_id:this.state.department_id,
+ identity:this.state.identity,
+ extra: values.job == "student" ? values.student_No : values.job == "teacher" ? values.job1 : values.job2
}).then((result)=>{
if(result){
this.props.showNotification("申请已提交，请等待审核!");
@@ -119,13 +339,99 @@ class RealNameCertificationModal extends Component{
}));
}
}
+ // 切换职称
+ changeJob=(e)=>{
+ this.setState({
+ identity:e
+ })
+ let {basicInfo}=this.props;
+ if(basicInfo){
+ this.props.form.setFieldsValue({
+ job1:basicInfo && basicInfo.identity=="teacher" ? basicInfo.technical_title:"教授",
+ job2:basicInfo && basicInfo.identity=="professional" ? basicInfo.technical_title:"企业管理者",
+ })
+ }
+ }
+ // 选择学校(获取对应学校的学院、部门)
+ changeList=(e)=>{
+ this.getDepartments(e.trim(),true);
+ }
+
+ showApplyForAddOrgModal = () => {
+ this.applyForAddOrgForm.setVisible(true)
+ }
+ showApplyForAddChildOrgModal = () => {
+ let{school,schoolList}=this.state;
+ let arr=schoolList.filter(function(item){
+ return item.name == school;
+ });
+ if(arr.length > 0){
+ this.applyForAddChildOrgForm.setVisible(true)
+ }else{
+ this.props.showNotification("请先选择正确的单位或者学校！");
+ }
+ }
+ addOrgSuccess = (name) => {
+ // const schoolList = this.state.schoolList.slice(0)
+ // schoolList.push({ id: schoolList.length + 2000, name: name})
+ // this.setState({ schoolList })
+
+ this.getSchoolList(this.props.basicInfo, name);
+ this.props.form.setFieldsValue({
+ org: name
+ })
+ }
+
+ addChildOrgSuccess = (deptName) => {
+
+ this._getDepartments(this.state.school_id, false, deptName);
+
+ }
+
+ // 隐藏或显示真实姓名
+ showOrHide=(flag)=>{
+ const name = this.props.form.getFieldsValue().name || this.props.basicInfo.name
+ this.setState({
+ showRealName:flag==true?false:true
+ })
+ if(flag==true){ // 隐藏真实姓名
+ this.hideRealName(name);
+ }else{ // 显示
+ this.props.form.setFieldsValue({
+ name: this.state.realName
+ })
+ }
+ }
render(){
- const { course_lists, checkBoxValues, searchValue, loading, imageUrl, imageUrl2 } = this.state
+ const { course_lists, checkBoxValues, searchValue, loading, imageUrl, imageUrl2,
+ identity,
+ departmentsName ,
+ filterSchoolList ,
+ filterDepartments ,
+ school,
+ department_id,
+ departments,
+ school_id,
+
+ showRealName
+ } = this.state
const { moduleName } = this.props
const { getFieldDecorator } = this.props.form;
let {certification}=this.props;
// /api/users/accounts/${this.props.current_user.login}/auth_attachment.json
+
+ // 已职业认证的账户不能修改职业，学校/单位，院系/部门（true为disable）
+ const professionalFlag = basicInfo && basicInfo.professional_certification == "certified" ;
+
+ let{ basicInfo }=this.props
+ let common={
+ changeJob:this.changeJob,
+ filterList:this.filterList,
+ changeList:this.changeList,
+ showApplyForAddOrgModal:this.showApplyForAddOrgModal,
+ showApplyForAddChildOrgModal:this.showApplyForAddChildOrgModal
+ }
const uploadProps2 = {
name: 'image',
data:{type:certification == 1 ? "real_name" : "professional"},
@@ -136,190 +442,283 @@ class RealNameCertificationModal extends Component{
className: 'idPic-uploader',
onChange: this.handleChange2,
};
+
+ // form合并了
+ const propsWithoutForm = Object.assign({}, this.props)
+ delete propsWithoutForm.form
return(
-
实名认证:
- 职业认证
- }
- {...this.props }
- onOk={this.onOk}
- okText="保存"
- className="applyForModal certificationModal courseNormalForm"
- bottomRender={
- certification && certification == 1?
-
-
认证须知：
-
- 1.你需要准备有效的身份证正面（人像面）的证件照照片，请确保证件照片清晰可见，严禁PS；
-
- 2.我们将在你提交认证信息后的24小时（不包含节假日）内完成审核，审核结果将会以系统消息的形式发送给你；
-
- 3.实名认证审核完成后，无法删除，请谨慎填写；
-
- 4.实名认证审核完成后，系统将自动发放500个金币作为奖励；
-
- 5.我们会确保你所提供的信息均处于严格的保密状态，不会泄露；
-
- 6.如存在恶意乱填写姓名，证件号，及上传与实名认证证件无关图片者，一经发现将冻结EduCoder账号。
-
-
-
认证须知：
-
- 1.根据职业上传相应的证件照：教师（教师证），专业人士（员工证）、学生（学生证），请确保证件照内容完整并且清晰可见，严禁PS；
-
- 2.我们将在你提交职业证信息后的24小时（不包含节假日）内完成审核，审核结果将会以系统消息的形式发送给你；
-
- 3.职业认证审核完成后，无法删除，请谨慎填写；职业变更请选择重新认证；
-
- 4.职业认证审核完成后，系统将自动发放500个金币作为奖励；
-
- 5.我们会确保你所提供的信息均处于严格的保密状态，不会泄露；
-
- 6.如存在恶意乱填写姓名，学号，及上传与职业证件无关图片者，一经发现将冻结EduCoder账号。
-
-