diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index abcc3a6da..90cad3e68 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -114,7 +114,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} /*块状列表上面的绿色标签*/ .tag-green{ position: absolute; - left: 15px; + left: 10px; bottom: 95px;} .tag-green .tag-name{display: block;width: auto; /*background-image: url("/images/educoder/tag1.png");*/ diff --git a/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js b/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js index cd671cbe4..b291dcb62 100644 --- a/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js +++ b/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js @@ -61,8 +61,15 @@ class CoursesHomeCard extends Component{ :"" } + + { + item.excellent === false ? "" : +
+ 开放课程 +
+ } + {item.is_end===true?

-

已结束

:""}
diff --git a/public/react/src/modules/courses/coursesHome/css/CoursesHome.css b/public/react/src/modules/courses/coursesHome/css/CoursesHome.css index af431da99..a373e0612 100644 --- a/public/react/src/modules/courses/coursesHome/css/CoursesHome.css +++ b/public/react/src/modules/courses/coursesHome/css/CoursesHome.css @@ -24,12 +24,16 @@ a{ } .biaoqiancours{ overflow: hidden; - position: relative; + position: absolute; + right: 0px; + bottom: 56px; } .coursesover{ - position: absolute; color: #fff; - left: 17px; background: #dfdfdf; - width: 200px; + width: 64px; + text-align: right; + padding-right: 10px; + border-top-left-radius: 15px; + border-bottom-left-radius: 15px; } \ No newline at end of file diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js index 0a18492cd..d562d7aee 100644 --- a/public/react/src/modules/home/shixunsHome.js +++ b/public/react/src/modules/home/shixunsHome.js @@ -295,11 +295,22 @@ class ShixunsHome extends Component { 更多
+ {homedatalist===undefined?"":homedatalist.shixuns.map((item,key)=>{ return(
-
+
{item.tag_name} {/**/}
diff --git a/public/react/src/modules/tpm/shixuns/ShixunCard.js b/public/react/src/modules/tpm/shixuns/ShixunCard.js index 2bb6a670a..3a0935e66 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunCard.js +++ b/public/react/src/modules/tpm/shixuns/ShixunCard.js @@ -84,6 +84,17 @@ class ShixunCard extends Component { { middleshixundata===undefined?" ":middleshixundata.map((item,key)=>{ return(
+ { item.tag_name === null ? "":
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index a07102d67..599120cbd 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -116,7 +116,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} /*块状列表上面的绿色标签*/ .tag-green{ position: absolute; - left: 15px; + left: 10px; bottom: 95px;} .tag-green .tag-name{display: block;width: auto; /*background-image: url("/images/educoder/tag1.png");*/