diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 96d06442e..1944f0a7b 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -1,6 +1,6 @@
import React,{ Component } from "react";
import CoursesListType from '../coursesPublic/CoursesListType';
-import { WordsBtn, getTaskUrlById } from 'educoder';
+import { WordsBtn, getTaskUrlById , ConditionToolTip } from 'educoder';
import {Tooltip,message,Modal} from 'antd';
import {Link} from 'react-router-dom';
import axios from 'axios';
@@ -358,9 +358,14 @@ class ShixunhomeWorkItem extends Component{
{discussMessage.status_time}
}
{
- discussMessage.upper_category_name && {discussMessage.upper_category_name}
+ discussMessage && discussMessage.upper_category_name &&
+ 22 }>
+ { {discussMessage.upper_category_name}}
+
}
+
+
{/* { discussMessage.replies_count != 0 && {discussMessage.replies_count} 回复 }
{ discussMessage.praise_num != 0 && {discussMessage.praise_num} 点赞 }
diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index bc401d4d7..0f6abc61b 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -120,11 +120,12 @@ class InfosCourse extends Component{
this.changeStatus("end")}>已结束
}
-
+
共参与{totalCount}个{category?category=="manage"?"发布":"学习":"课堂"}
时间最新
+ {/* 289 */}
{
page == 1 && is_current && !category &&
this.props.current_user && this.props.current_user.user_identity != "学生" ?
: ""
@@ -135,7 +136,7 @@ class InfosCourse extends Component{
{
data && data.courses && data.courses.map((item,key)=>{
return(
-
this.turnToCourses(`${item.first_category_url}`,item.can_visited)} style={{"cursor": "pointer"}}>
+
this.turnToCourses(`${item.first_category_url}`,item.can_visited)} style={{"cursor": "pointer",height:"289px"}}>
{
item.is_public == 1 &&
diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js
index 554d8380f..67809b6ef 100644
--- a/public/react/src/modules/user/usersInfo/InfosPath.js
+++ b/public/react/src/modules/user/usersInfo/InfosPath.js
@@ -147,6 +147,7 @@ class InfosPath extends Component{
时间最新
+ {/* 295 */}
{
page == 1 && is_current && !category &&
this.props.current_user && this.props.current_user.user_identity != "学生" ?
:""
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index 5aea5117b..030af5fb6 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -120,6 +120,7 @@ class InfosProject extends Component{
时间最新
+ {/* 289 */}
{
page == 1 && is_current && this.props.current_user && !category && this.props.current_user.user_identity != "学生" ?
:""
@@ -130,7 +131,7 @@ class InfosProject extends Component{
{
data && data.projects && data.projects.map((item,key)=>{
return(
-
this.turnToCourses(`/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer"}}>
+
this.turnToCourses(`/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer","height":"289px"}}>
{
item.is_public==1 &&
diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js
index 4799626a9..61a9ce8cb 100644
--- a/public/react/src/modules/user/usersInfo/InfosShixun.js
+++ b/public/react/src/modules/user/usersInfo/InfosShixun.js
@@ -153,6 +153,7 @@ class InfosShixun extends Component{
+ {/* 298 */}
{
page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ?
:""
@@ -163,7 +164,7 @@ class InfosShixun extends Component{
{
data && data.shixuns && data.shixuns.map((item,key)=>{
return(
-
this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}>
+
this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}>
{
item.tag &&
{item.tag}}/)
}
diff --git a/public/react/src/modules/user/usersInfo/publicCreatNew.js b/public/react/src/modules/user/usersInfo/publicCreatNew.js
index 0b5cee7d2..25dd4a030 100644
--- a/public/react/src/modules/user/usersInfo/publicCreatNew.js
+++ b/public/react/src/modules/user/usersInfo/publicCreatNew.js
@@ -17,7 +17,7 @@ class publicCreateNew extends Component{
render() {
let {href,name,index}=this.props;
return (
-