diff --git a/public/react/src/common/components/Cropper.js b/public/react/src/common/components/Cropper.js index 7e8a5792e..632950434 100644 --- a/public/react/src/common/components/Cropper.js +++ b/public/react/src/common/components/Cropper.js @@ -81,8 +81,8 @@ class Cropper extends Component { $.ajaxSetup({ cache: true }); - const isDev = isDev() - let _path = isDev ? 'public' : 'build' + const _isDev = isDev() + let _path = _isDev ? 'public' : 'build' $('head').append($('') .attr('href', `${_url_origin}/react/${_path}/js/cropper/cropper.min.css`)); diff --git a/public/react/src/index.css b/public/react/src/index.css index 5b7639ce3..6249aa94a 100644 --- a/public/react/src/index.css +++ b/public/react/src/index.css @@ -33,7 +33,4 @@ body { } .anticon anticon-paper-clip{ color: #29bd8b !important; -} -.notificationmystyle{ - z-index: 99999999; } \ No newline at end of file diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index 70944fab8..2c5108f8d 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -38,7 +38,7 @@ function buildColumns(that) { key: 'index', render: (content, item, index) => { return item.isApply == true ? '' : {(that.state.page - 1) * 20 + index + 1 - - (that.application_list ? that.application_list.length : 0)}  + - (that.state.application_list ? that.state.application_list.length : 0)}  } } // ,{ @@ -66,7 +66,7 @@ function buildColumns(that) { }] that.state.course_groups && that.state.course_groups.length && columns.push({ title: 管理权限, - // width: 230, + width: 260, key: 'course_groups', dataIndex: 'course_groups', // onClick={() => that.joinCourseGroup(item.id)} @@ -137,7 +137,7 @@ function buildColumns(that) { if (hasGraduationModule) { columns.push({ title: '答辩组', - width: 74, + // width: 90, key: 'graduation_group', dataIndex: 'graduation_group', render: text => ( diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index f09256230..58c868677 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1351,12 +1351,9 @@ class Listofworks extends Component { axios.get(url).then((response) => { if(response !== undefined){ if(response.data.status&&response.data.status===-1){ - console.log("1352"); - console.log(response); }else if(response.data.status&&response.data.status===-2){ - console.log("1356"); - console.log(response); + }else { if(type === 1){ Internshipreportsy(url,struy,".zip",'application/zip'); diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js index 562d77adf..1a3d19e86 100644 --- a/public/react/src/modules/user/Interestpage.js +++ b/public/react/src/modules/user/Interestpage.js @@ -24,7 +24,7 @@ class InterestpageComponent extends Component { constructor(props) { super(props) this.state = { - gouxuans: 0, + gouxuans: "", gouxuans2:0, gouxuans3:[{id:1,name:"前端开发",bool:false,url:qdkf},{id:2,name:"后端开发",bool:false,url:hdkf},{id:3,name:"移动开发",bool:false,url:ydkf},{id:4,name:"数据库",bool:false,url:sjk},{id:5,name:"云计算和大数据",bool:false,url:ysj},{id:6,name:"运维与测试",bool:false,url:yunwei},{id:7,name:"人工智能",bool:false,url:rgzn},{id:8,name:"其他",bool:false,url:qita}], namezh:this.props.namezh, @@ -33,17 +33,17 @@ class InterestpageComponent extends Component { } Clickteacher=(e)=>{ console.log(e); - if(e === 1){ + if(e === "teacher"){ this.setState({ - gouxuans:1, + gouxuans:"teacher", }) - }else if(e === 2){ + }else if(e ==="student"){ this.setState({ - gouxuans:2, + gouxuans:"student", }) - }else if(e === 3){ + }else if(e === "professional"){ this.setState({ - gouxuans:3, + gouxuans:"professional", }) } } @@ -68,6 +68,33 @@ class InterestpageComponent extends Component { } + //兴趣页面点击 + Interestcompletionpage(){ + if(this.state.gouxuans.length === 0){ + this.props.showNotification("请选择您的职业"); + return + } + var ints=[]; + for (var i =0;i { + if (response !== undefined) { + this.Jumptotheinterestpage(); + } + + + }).catch((error) => { + console.log(error); + + }) + } //跳转然后登入 Jumptotheinterestpage=()=>{ @@ -94,7 +121,7 @@ class InterestpageComponent extends Component { }).catch((error) => { - + console.log(error); }) } render() { @@ -111,15 +138,15 @@ class InterestpageComponent extends Component {
请选择你的职业
-
this.Clickteacher(1)}>{gouxuans ===1? :}老师
+
this.Clickteacher("teacher")}>{gouxuans ==="teacher"? :}老师
-
this.Clickteacher(2)}>{gouxuans===2? :}学生
+
this.Clickteacher("student")}>{gouxuans==="student"? :}学生
-
this.Clickteacher(3)}>{gouxuans===3?:}专业人士
+
this.Clickteacher("professional")}>{gouxuans==="professional"?:}专业人士
@@ -138,7 +165,7 @@ class InterestpageComponent extends Component { ) })} - + diff --git a/public/react/src/modules/user/account/ChangeHeaderPicModal.js b/public/react/src/modules/user/account/ChangeHeaderPicModal.js index 89f21838e..08b4e9d18 100644 --- a/public/react/src/modules/user/account/ChangeHeaderPicModal.js +++ b/public/react/src/modules/user/account/ChangeHeaderPicModal.js @@ -59,7 +59,7 @@ class ChangeHeaderPicModal extends Component{ if (visible) { setTimeout(() => { this.init() - }, 300) + }, 500) } }