diff --git a/app/controllers/discusses_controller.rb b/app/controllers/discusses_controller.rb index 6a270f619..4af27b919 100644 --- a/app/controllers/discusses_controller.rb +++ b/app/controllers/discusses_controller.rb @@ -1,7 +1,7 @@ class DiscussesController < ApplicationController LIMIT = 10 before_action :find_container, only: [:index, :hidden] - before_action :find_discuss, except: [:create, :index, :new_message, :reward_code, :forum_discusses] + before_action :find_discuss, except: [:create, :index, :new_message, :reward_code, :forum_discusses, :plus] def index page = params[:page].to_i diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 1da26fd22..d5697d87f 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -25,6 +25,8 @@ class JournalsForMessage < ApplicationRecord # "is_comprehensive_evaluation", # 1 教师评论、2 匿评、3 留言 # "hidden", 隐藏 + after_create :send_tiding + # course_identity 课堂用户身份 def contents_show course_identity @@ -47,4 +49,29 @@ class JournalsForMessage < ApplicationRecord JournalsForMessage.includes(:user).where(m_parent_id: self.id).page(page).per(limit).reorder("created_on asc") end + + def send_tiding + # 回复和@同一个人时：只发@的消息（因@的消息先创建） + case self.jour_type + # 用户留言当做私信处理 不发消息 + when "Principal" +=begin + user_id = self.m_parent_id.present? ? JournalsForMessage.find(self.m_parent_id).user_id : self.jour_id + if user_id != self.user_id && !self.tidings.where(:user_id => user_id, :trigger_user_id => self.user_id, :tiding_type => "Mentioned").first.present? + self.tidings << Tiding.new(:trigger_user_id => self.user_id, :user_id => user_id, :parent_container_id => self.jour_id, :parent_container_type => self.jour_type, :belong_container_id => self.jour_id, :belong_container_type => "User", :viewed => 0, :tiding_type => self.m_parent_id.present? ? "Comment" : "Journal") + end +=end + when "HomeworkCommon", "GraduationTopic" + user_id = self.m_parent_id.present? ? JournalsForMessage.find(self.m_parent_id).user_id : (self.jour_type == "HomeworkCommon" ? self.jour.user_id : self.jour.tea_id) + if user_id != self.user_id && !self.tidings.where(:user_id => user_id, :trigger_user_id => self.user_id, :tiding_type => "Mentioned").first.present? + self.tidings << Tiding.new(:trigger_user_id => self.user_id, :user_id => user_id, :parent_container_id => self.jour_id, :parent_container_type => self.jour_type, :belong_container_id => self.jour.course_id, :belong_container_type => "Course", :viewed => 0, :tiding_type => "Comment") + end + when "StudentWorksScore" + course_id = self.jour.try(:student_work).try(:homework_common).try(:course_id) + user_id = self.m_parent_id.present? ? JournalsForMessage.find(self.m_parent_id).user_id : self.jour.user_id + if user_id != self.user_id && !self.tidings.where(:user_id => user_id, :trigger_user_id => self.user_id, :tiding_type => "Mentioned").first.present? + self.tidings << Tiding.new(:trigger_user_id => self.user_id, :user_id => user_id, :parent_container_id => self.jour_id, :parent_container_type => self.jour_type, :belong_container_id => course_id, :belong_container_type => "Course", :viewed => 0, :tiding_type => "Comment") + end + end + end end diff --git a/app/views/memos/_memo.json.jbuilder b/app/views/memos/_memo.json.jbuilder index a33de2492..f0ac5cd3d 100644 --- a/app/views/memos/_memo.json.jbuilder +++ b/app/views/memos/_memo.json.jbuilder @@ -9,6 +9,6 @@ json.memo do json.tag memo.tag_repertoires.map(&:name) json.time memo.created_at json.replies_count memo.all_replies_count - json.user_praise memo.praise_treads.user_liker(@user.try(:id)).count > 1 ? true : false + json.user_praise memo.praise_treads.user_liker(@user.try(:id)).count > 0 ? true : false json.memo_praise_count memo.praise_treads.liker.count end diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index f37f1a1db..fc4719013 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -203,7 +203,7 @@ class CoursesNew extends Component { // debugger if (response.data.status === 0) { // this.goback() - this.props.history.push(first_category_url); + window.location.href=first_category_url; } }).catch((error) => { console.log(error) @@ -247,7 +247,7 @@ class CoursesNew extends Component { ).then((response) => { if (response.status === 200) { // this.goback - this.props.history.push(response.data.first_category_url); + window.location.href=response.data.first_category_url; } }).catch((error) => { console.log(error) diff --git a/public/react/src/modules/message/css/messagemy.css b/public/react/src/modules/message/css/messagemy.css index 9f6736ec3..05d6c3511 100644 --- a/public/react/src/modules/message/css/messagemy.css +++ b/public/react/src/modules/message/css/messagemy.css @@ -20,6 +20,10 @@ .ant-modal-header{ border-radius: 0px !important; } +.ridinglist-subs{ + border-bottom: 1px solid #F5F5F5; + padding: 25px 0px; +} .search-new{ width: 100% !important; margin-bottom: 0px !important; diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index ad966f7c9..76057f38a 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -656,7 +656,7 @@ class MessagChat extends Component{

-

+

diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index c44685361..bbbb7caa3 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -116,94 +116,94 @@ class MessagSub extends Component{ if(item.tiding_type==="Apply"){ if(item.auth_type===1){ //系统管理页面 - return window.location.href="/managements/identity_authentication"; + return window.open("/managements/identity_authentication"); } if(item.auth_type===2){ //系统管理页面 - return window.location.href="/managements/professional_authentication"; + return window.open("/managements/professional_authentication") } } if(item.tiding_type ==="System"){ // 账号管理页-认证信息 - return window.location.href="/account/certification"; + return window.open("/account/certification") } case "CancelUserAuthentication" : // 账号管理页-认证信息 - return window.location.href="/account/certification"; + return window.open("/account/certification") case "CancelUserProCertification" : // 账号管理页-认证信息 - return window.location.href="/account/certification"; + return window.open("/account/certification") case "ApplyAddDepartment" : if(item.tiding_type==="Apply"){ //部门审批 - return window.location.href="/managements/depart"; + return window.open("/managements/depart") } if(item.tiding_type==="System"){ // 账号管理页/account/profile - return window.location.href="/account/profile"; + return window.open("/account/profile") } case "ApplyAddSchools" : if(item.tiding_type==="Apply"){ // 单位审批 - return window.location.href=" /managements/unit"; + return window.open(" /managements/unit") } if(item.tiding_type==="System"){ // 账号管理页 - return window.location.href="/account/profile"; + return window.open("/account/profile") } case "ApplyAction" : switch (item.parent_container_type) { case "ApplyShixun" : if(item.tiding_type==="Apply"){ - return window.location.href="/managements/shixun_authorization"; + return window.open("/managements/shixun_authorization") } if(item.tiding_type==="System"){ // 实训详情页 :identifier = identifier - return window.location.href=`/shixuns/${item.identifier}/challenges`; + return window.open(`/shixuns/${item.identifier}/challenges`) } case "ApplySubject" : if(item.tiding_type==="Apply"){ // 实训课程发布 - return window.location.href="/managements/subject_authorization"; + return window.open("/managements/subject_authorization") } if(item.tiding_type==="System"){ - // 实践课程详情页 :identifier = identifier + // 实践课程详情页 :parent_container_id = parent_container_id - return window.location.href=`/paths/${item.identifier}`; + return window.open(`/paths/${item.parent_container_id}`) } case "TrialAuthorization" : if(item.tiding_type==="Apply"){ // 试用授权页面 - return window.location.href="/managements/trial_authorization"; + return window.open("/managements/trial_authorization") } if(item.tiding_type==="System"){ // 账号管理页 - return window.location.href="/account/profile"; + return window.open("/account/profile") } } case 'JoinCourse' : // 课堂详情页 :id = - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'StudentJoinCourse': // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'DealCourse': // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'TeacherJoinCourse': // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'Course' : // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'ArchiveCourse' : // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case "Shixun" : - return window.location.href=`/shixuns/${item.identifier}/challenges`; + return window.open(`/shixuns/${item.identifier}/challenges`) case "Subject" : // 实践课程详情页 :id = container_id - return window.location.href=`/paths/${item.identifier}`; + return window.open(`/paths/${item.container_id}`) case "JournalsForMessage" : switch (item.parent_container_type) { case "Principal" : @@ -214,235 +214,235 @@ class MessagSub extends Component{ //学生作业页 homework = parent_container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } - return ''; case "GraduationTopic" : // 毕业目标页 parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case "StudentWorksScore" : //学生作业页 if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } } case "Memo" : // 交流问答页 :id = parent_container_id - return window.location.href="/forums/categories/all?order=newest"; + return window.open(`/forums/${item.parent_container_id}`) case "Watcher" : // 用户个人中心页 :id = item.trigger_user.login - return window.location.href=`/users/${item.trigger_user.login}/courses`; + return window.open(`/users/${item.trigger_user.login}/courses`) case "PraiseTread" : // 这块太复杂 不好处理 return ''; case "Grade" : //个人中心页 :id = item.trigger_user.login - return window.location.href=`/users/${item.trigger_user.login}/courses`; + // return window.open(`/users/${item.trigger_user.login}/courses`; + return ""; case "JoinProject" : //项目详情-申请加入项目审核页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case 'ReporterJoinProject': //项目详情页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case 'DealProject': //项目详情页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case 'ManagerJoinProject': //项目详情页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case "Poll": switch (item.parent_container_type) { case "CommitPoll" : // 课堂id belong_container_id //课堂-学生已提交问卷列表 :id = container_id - return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`; + return window.open(` /courses/${item.belong_container_id}/polls/${item.container_id}`) default : // 课堂-问卷列表 :id = container_id - return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`; + return window.open(` /courses/${item.belong_container_id}/polls/${item.container_id}`) } case "Exercise" : switch (item.parent_container_type) { case "CommitExercise": // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id - return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`; + return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`) case "ExerciseScore": // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id - return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`; + return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`) default : // 课堂-试卷列表详情 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/exercises/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/exercises/${item.container_id}`) } case 'StudentGraduationTopic' : //课堂-毕业选题详情 :id = parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case 'DealStudentTopicSelect' : //课堂-毕业选题详情 :id = parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case 'GraduationTask' : //课堂-毕业任务页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`) case "GraduationWork" : //课堂-毕业xx页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`) case "GraduationWorkScore" : // 课堂-毕业xx页 :id = parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`; + return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`) case "HomeworkCommon" : switch (item.parent_container_type) { case "AnonymousCommentFail" : // 课堂-作业列表 homework = container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "HomeworkPublish" : if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "AnonymousAppeal" : if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } default : // 课堂-作业列表 homework = container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } } case "StudentWork" : //课堂-作业 :id = container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}/list?tab=0`) } case "StudentWorksScore" : //课堂-作业 :id = parent_container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "StudentWorksScoresAppeal" : if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "ChallengeWorkScore" : return ''; case "SendMessage" : // /managements/mirror_repository - return window.location.href=`/managements/mirror_repository`; + return window.open(`/managements/mirror_repository`) case "Journal" : //项目Issue页 :id = parent_container_id - return window.location.href=`/projects/${item.parent_container_id}/issues?remote=true`; + return window.open(`/projects/${item.parent_container_id}/issues?remote=true`) case "Issue" : //项目Issue页 :id = container_id - return window.location.href=`/projects/${item.container_id}/issues?remote=true`; + return window.open(`/projects/${item.container_id}/issues?remote=true`) case "PullRequest" : // 项目pull request页 :id = parent_container_id - return window.location.href=`/projects/${item.parent_container_id}/pull_requests`; + return window.open(`/projects/${item.parent_container_id}/pull_requests`) case "Department" : //账号管理页 - return window.location.href=`/account/profile`; + return window.open(`/account/profile`) case "Library" : if (item.tiding_type === 'Apply') { // /managements/library_applies - return window.location.href=`/managements/library_applies`; + return window.open(`/managements/library_applies`) } if(item.tiding_type === 'System'){ //教学案例详情 :id = container_id - return window.location.href=`/moop_cases/${item.container_id}`; + return window.open(`/moop_cases/${item.container_id}`) } case "ProjectPackage" : if(item.tiding_type==="Destroyed_end"){ return ; }else { - // if (item.tiding_type === 'Apply') { - // ///managements/project_package_applies - // return window.location.href=`/managements/project_package_applies`; - // } + if (item.tiding_type === 'Apply') { + ///managements/project_package_applies + return window.open(`/managements/project_package_applies`) + } // if(item.tiding_type === 'System'){ //众包详情 :id = container_id - return window.location.href=`/crowdsourcing/${item.container_id}`; + return window.open(`/crowdsourcing/${item.container_id}`) // } } default : - return window.location.href="/"; + return window.open("/") } } @@ -485,10 +485,30 @@ class MessagSub extends Component{

暂无数据哦~

:data.map((item,key)=>{ - console.log(data) + // console.log(data) + // ridinglist-subs + var boolps=true; + if(item.container_type==="PraiseTread"||item.container_type==="Grade"||item.container_type==="ChallengeWorkScore"){ + boolps=false; + } + if(item.container_type==="JournalsForMessage"){ + if(item.parent_container_type==="Principal"){ + boolps=false; + } + } + // if(item.container_type==="HomeworkCommon"){ + // if(item.parent_container_type==="AnonymousAppeal"){ + // boolps=false; + // } + // } + if(item.container_type==="ProjectPackage"){ + if(item.tiding_type==="Destroyed_end"){ + boolps=false; + } + } return(
-
this.gettourl(item)}> +
this.gettourl(item)}> this.myCome(item)} src={getImageUrl("images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>

@@ -512,7 +532,7 @@ class MessagSub extends Component{ ` } -

+

diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 4ff3a73cc..b41ba41a5 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -179,7 +179,7 @@ class MessagePrivate extends Component{ [{item.message_count}{"条"}] {moment(item.send_time).fromNow()}

- +
{item.unread === true ?:""} diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 1f7851303..ac498b4ee 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -297,8 +297,8 @@ class PackageIndexNEITaskDetails extends Component { onMouseOver={this.setover} onMouseOut={this.setout} > - {overtype===false? 头像联系TA: - 头像 头像联系TA: + 头像联系TA}
}
@@ -411,7 +411,7 @@ class PackageIndexNEITaskDetails extends Component { {item.status==="bidding_won"?:""}

{item.name}

- {this.props.current_user&&this.props.current_user.login!=item.login? + {this.props.current_user&&this.props.current_user.login!=item.login? 头像联系TA :""}