From bf3dcdabc7ba30740604b9f93804a08c1dfe1322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 13 Aug 2019 10:47:43 +0800 Subject: [PATCH 1/9] b --- .../src/modules/courses/ListPageIndex.js | 37 +++++++++++-------- .../src/modules/courses/new/CoursesNew.js | 12 ++++-- .../modules/courses/shixunHomework/Guide.js | 3 +- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index 8c87c8731..39eeaf115 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/public/react/src/modules/courses/ListPageIndex.js @@ -68,7 +68,7 @@ class ListPageIndex extends Component{ constructor(props) { super(props); this.state={ - yslGuideone:null, + yslGuideone:undefined, } } @@ -88,7 +88,11 @@ class ListPageIndex extends Component{ // navttype:newselectnavid // }) // } - setwindowlocal=(bool)=>{ + componentWillUnmount(){ + window.localStorage.setItem('yslGuideone', false); + + } + setwindowlocal=(bool)=>{ window.localStorage.setItem('yslGuideone', bool); this.setState({ yslGuideone:bool, @@ -96,26 +100,27 @@ class ListPageIndex extends Component{ } render() { let {yslGuideone} =this.state; - // console.log("98"); - // console.log(yslGuideone); + console.log("98"); + console.log(yslGuideone); + console.log(this.props.isAdmin()); + var yslGuideones = window.localStorage.getItem('yslGuideone'); return (
{/*头部banner*/} - {/*{yslGuideone===null||yslGuideone===undefined||yslGuideone===false?*/} - {/* (*/} - {/* this.props.isAdmin()===true?*/} - {/* this.setwindowlocal(b)}*/} - {/* >*/} - {/* */} - {/* :""*/} - {/* )*/} - {/* :""*/} - {/*}*/} - + {yslGuideones!==undefined? + ( + yslGuideones===true? + this.setwindowlocal(b)} + > + + :"" + ) + :"" + }
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index 86789b8a2..beb3c74a9 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -76,7 +76,7 @@ class CoursesNew extends Component { Realnamecertification: data.authentication, Professionalcertification:data.professional_certification, }) - + this.handleSearchschool(data.school); }).catch((error) => { console.log(error); }) @@ -93,7 +93,9 @@ class CoursesNew extends Component { }); this.setState({ school:user_school, - }) + }); + this.handleSearchschool(user_school); + } @@ -204,6 +206,7 @@ class CoursesNew extends Component { if (response.data.status === 0) { // this.goback() window.location.href=first_category_url; + window.localStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error) @@ -248,6 +251,7 @@ class CoursesNew extends Component { if (response.status === 200) { // this.goback window.location.href=response.data.first_category_url; + window.localStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error) @@ -403,7 +407,9 @@ class CoursesNew extends Component { const optionschool = this.state.searchlistscholl&&this.state.searchlistscholl.map(z => ); // console.log(this.props.current_user.user_school) // form合并了 - + console.log(this.state); + console.log(this.props); + console.log(this.props.current_user); return ( diff --git a/public/react/src/modules/courses/shixunHomework/Guide.js b/public/react/src/modules/courses/shixunHomework/Guide.js index d501b2ab5..d93961518 100644 --- a/public/react/src/modules/courses/shixunHomework/Guide.js +++ b/public/react/src/modules/courses/shixunHomework/Guide.js @@ -21,6 +21,7 @@ class Guide extends Component { } componentDidMount() { + console.log("GuideGuideGuideGuide加载了") // 1366x768 // var mywidthone=7; @@ -59,7 +60,7 @@ class Guide extends Component { page:i, }) if(i===7){ - this.props.setwindowlocal(true); + this.props.setwindowlocal(false); } } render() { From 10a889388edc31395fd5c5d289d3db962d3d25b5 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 13 Aug 2019 11:05:24 +0800 Subject: [PATCH 2/9] console --- public/react/src/common/UrlTool.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js index f224526e6..1a910f224 100644 --- a/public/react/src/common/UrlTool.js +++ b/public/react/src/common/UrlTool.js @@ -13,7 +13,7 @@ export function getImageUrl(path) { export function setImagesUrl(path){ const local = 'http://47.96.87.25:48080' let firstStr=path.substr(0,1); - console.log(firstStr); + // console.log(firstStr); if(firstStr=="/"){ return isDev?`${local}${path}`:`${path}`; }else{ From e8a06972566b723db26d8c361121bdb09b660a8d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 13 Aug 2019 11:07:37 +0800 Subject: [PATCH 3/9] error --- public/react/src/App.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/react/src/App.js b/public/react/src/App.js index e71ce4a9a..8004e05f8 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -274,6 +274,11 @@ class App extends Component { // }, (error) => { // //TODO 这里如果样式变了会出现css不加载的情况 // }); + + window.addEventListener('error', (event) => { + const msg = `${event.type}: ${event.message}`; + console.log(msg) + }); } //修改登录方法 Modifyloginvalue=()=>{ From 746cfef99323d17d03eef50e1ad412a23c53e143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 13 Aug 2019 11:44:09 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/ListPageIndex.js | 37 ++++++++++++------- .../src/modules/courses/new/CoursesNew.js | 9 +++-- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index 39eeaf115..9c1923452 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/public/react/src/modules/courses/ListPageIndex.js @@ -69,16 +69,20 @@ class ListPageIndex extends Component{ super(props); this.state={ yslGuideone:undefined, + mysearch:undefined, } } componentDidMount(){ - var yslGuideone = window.localStorage.getItem('yslGuideone'); + var yslGuideone = window.sessionStorage.getItem('yslGuideone'); console.log("77"); console.log(yslGuideone); + var mysearchs= this.props.location.search===""?undefined:this.props.location.search===undefined?undefined:this.props.location.search==="?exhibition=true"?true:undefined; this.setState({ yslGuideone:yslGuideone, + mysearch:mysearchs, }) + } // // getleftNavid=(navid,newselectnavid)=>{ @@ -89,37 +93,42 @@ class ListPageIndex extends Component{ // }) // } componentWillUnmount(){ - window.localStorage.setItem('yslGuideone', false); - + window.sessionStorage.setItem('yslGuideone', false); } setwindowlocal=(bool)=>{ - window.localStorage.setItem('yslGuideone', bool); + window.sessionStorage.setItem('yslGuideone', bool); this.setState({ yslGuideone:bool, - }) + mysearch:undefined, + }); + var currenturl = this.props.location.pathname; + var newUrl = (currenturl.split("?"))[0]; + window.history.pushState('','',newUrl); } render() { - let {yslGuideone} =this.state; - console.log("98"); - console.log(yslGuideone); - console.log(this.props.isAdmin()); - var yslGuideones = window.localStorage.getItem('yslGuideone'); + let {yslGuideone,mysearch} =this.state; + // console.log("98"); + // console.log(yslGuideone); + // console.log(this.props.isAdmin()); + // // var yslGuideones = window.sessionStorage.getItem('yslGuideone'); + // console.log(this.props); + // console.log(this.props.location.search); return (
{/*头部banner*/} - {yslGuideones!==undefined? + {mysearch!==undefined? ( - yslGuideones===true? + mysearch===true? this.setwindowlocal(b)} > :"" - ) - :"" + ) + :"" }
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index beb3c74a9..7dcc9bce7 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -205,8 +205,9 @@ class CoursesNew extends Component { // debugger if (response.data.status === 0) { // this.goback() - window.location.href=first_category_url; - window.localStorage.setItem('yslGuideone', true); + + window.location.href=first_category_url+"?exhibition=true"; + window.sessionStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error) @@ -250,8 +251,8 @@ class CoursesNew extends Component { ).then((response) => { if (response.status === 200) { // this.goback - window.location.href=response.data.first_category_url; - window.localStorage.setItem('yslGuideone', true); + window.location.href=response.data.first_category_url+"?exhibition=true"; + window.sessionStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error) From 3ccb0a5e266fe8904f61e1887718077b0f784bb2 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 13 Aug 2019 12:22:42 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 75d515186..223871968 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -598,7 +598,7 @@ class CoursesController < ApplicationController normal_status(0, "操作成功") rescue => e uid_logger_error(e.message) - tip_exception("操作失败") + tip_exception(e.message) raise ActiveRecord::Rollback end end From 134abb76df2461fab6b5d41cde257d140da24d6d Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 13 Aug 2019 12:32:42 +0800 Subject: [PATCH 6/9] =?UTF-8?q?session=E7=BC=93=E5=AD=98=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/initializers/session_store.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index b8d29a52c..06ba35f6e 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -4,5 +4,5 @@ # Rails.application.config.session_store :active_record_store # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cache_store, :expire_after => 10.hours, key: '_educoder_session', domain: :all +Rails.application.config.session_store :cache_store, :expire_after => 24.hours, key: '_educoder_session', domain: :all From eda31f182babfa890469fac0f64a7cdeac5abd24 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 13 Aug 2019 12:38:12 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 223871968..dac9c0c3a 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -577,14 +577,18 @@ class CoursesController < ApplicationController end new_teacher.save! + uid_logger_error("###############new_member_id" + new_teacher.id.to_s) + + new_member = @course.teachers.where(user_id: applier_user.id).take # 课堂管理员才有分配权限，且课堂分班数大于0 if @user_course_identity < Course::PROFESSOR && @course.course_groups_count > 0 && params[:group_id] && params[:group_id].size > 0 # 分班全选则是不限，不需要做处理 unless @course.course_groups.where(id: params[:group_id]).size == @course.course_groups_count @course.course_groups.where(id: params[:group_id]).each do |group| - unless TeacherCourseGroup.where(course_id: @course.id, user_id: applier_user.id, course_group_id: group.id, course_member_id: new_teacher.id).exists? - TeacherCourseGroup.create(course_id: @course.id, user_id: applier_user.id, course_member_id: new_teacher.id, course_group_id: group.id) + uid_logger_error("###############course_group_id" + group.id.to_s) + unless TeacherCourseGroup.where(course_id: @course.id, user_id: applier_user.id, course_group_id: group.id, course_member_id: new_member.id).exists? + TeacherCourseGroup.create(course_id: @course.id, user_id: applier_user.id, course_member_id: new_member.id, course_group_id: group.id) end end end From ca819e490c5ceb76965227814408597b5291227d Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 13 Aug 2019 12:40:56 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/course_message.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/course_message.rb b/app/models/course_message.rb index 016479425..1bce11131 100644 --- a/app/models/course_message.rb +++ b/app/models/course_message.rb @@ -29,7 +29,7 @@ class CourseMessage < ApplicationRecord # 发送申请处理结果消息 Tiding.create!( user_id: course_message_id, trigger_user: 1, container_id: course_id, container_type: 'DealCourse', - belong_container: course, extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status + belong_container_id: course.id, belong_container_type: "Course", extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status ) # 将申请消息置为已处理 Tiding.where(trigger_user_id: user_id, container_id: course_id, container_type: 'JoinCourse', status: 0).update_all(status: 1) From 536d6ea7f7856ef68e45e4f793472cac263407b4 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 13 Aug 2019 12:44:08 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 10 +++------- app/models/course_message.rb | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index dac9c0c3a..75d515186 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -577,18 +577,14 @@ class CoursesController < ApplicationController end new_teacher.save! - uid_logger_error("###############new_member_id" + new_teacher.id.to_s) - - new_member = @course.teachers.where(user_id: applier_user.id).take # 课堂管理员才有分配权限，且课堂分班数大于0 if @user_course_identity < Course::PROFESSOR && @course.course_groups_count > 0 && params[:group_id] && params[:group_id].size > 0 # 分班全选则是不限，不需要做处理 unless @course.course_groups.where(id: params[:group_id]).size == @course.course_groups_count @course.course_groups.where(id: params[:group_id]).each do |group| - uid_logger_error("###############course_group_id" + group.id.to_s) - unless TeacherCourseGroup.where(course_id: @course.id, user_id: applier_user.id, course_group_id: group.id, course_member_id: new_member.id).exists? - TeacherCourseGroup.create(course_id: @course.id, user_id: applier_user.id, course_member_id: new_member.id, course_group_id: group.id) + unless TeacherCourseGroup.where(course_id: @course.id, user_id: applier_user.id, course_group_id: group.id, course_member_id: new_teacher.id).exists? + TeacherCourseGroup.create(course_id: @course.id, user_id: applier_user.id, course_member_id: new_teacher.id, course_group_id: group.id) end end end @@ -602,7 +598,7 @@ class CoursesController < ApplicationController normal_status(0, "操作成功") rescue => e uid_logger_error(e.message) - tip_exception(e.message) + tip_exception("操作失败") raise ActiveRecord::Rollback end end diff --git a/app/models/course_message.rb b/app/models/course_message.rb index 1bce11131..674e92169 100644 --- a/app/models/course_message.rb +++ b/app/models/course_message.rb @@ -28,8 +28,8 @@ class CourseMessage < ApplicationRecord def send_deal_tiding deal_status # 发送申请处理结果消息 Tiding.create!( - user_id: course_message_id, trigger_user: 1, container_id: course_id, container_type: 'DealCourse', - belong_container_id: course.id, belong_container_type: "Course", extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status + user_id: course_message_id, trigger_user_id: 1, container_id: course_id, container_type: 'DealCourse', + belong_container: course, extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status ) # 将申请消息置为已处理 Tiding.where(trigger_user_id: user_id, container_id: course_id, container_type: 'JoinCourse', status: 0).update_all(status: 1)