From 78f26b1eb53d39a6e467726a538c3c05f1d99e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 19 Aug 2019 17:44:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E5=93=81=E8=AF=BE=E7=A8=8B=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 2 +- .../modules/courses/coursesHome/CoursesHomeCard.js | 9 ++++++++- .../modules/courses/coursesHome/css/CoursesHome.css | 12 ++++++++---- public/react/src/modules/home/shixunsHome.js | 13 ++++++++++++- public/react/src/modules/tpm/shixuns/ShixunCard.js | 11 +++++++++++ public/stylesheets/educoder/edu-all.css | 2 +- 6 files changed, 41 insertions(+), 8 deletions(-) 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{ </div> :"" } + + { + item.excellent === false ? "" : + <div className="tag-orange"> + <span className="tag-name">开放课程</span> + </div> + } + {item.is_end===true?<p className="fr squareIconSpan mt10 biaoqiancours"> - <i className="iconfont icon-biaoqian fl memberscount"></i> <div className={"coursesover"}>已结束</div> </p>:""} <div className="substance"> 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 { <Link to={"/shixuns"} className="moreitem">更多<i className="fa fa-angle-right ml5"></i></Link> <div className="square-list clearfix" style={{width:'102%'}}> + <style> + { + ` + .taglistleft{ + position: absolute; + left: 10px; + bottom: 125px; + } + ` + } + </style> {homedatalist===undefined?"":homedatalist.shixuns.map((item,key)=>{ return( <div className="square-Item" key={key} id={item.id} style={{width:'286px'}}> - <div className="tag-green"> + <div className="tag-green taglistleft"> <span className="tag-name"> {item.tag_name}</span> {/*<img style={{display:item.tag_name===null?"none":'block'}} src={require(`./tag2.png`)}/>*/} </div> 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( <div className="square-Item" key={key} id={item.id}> + <style> + { + ` + .tag-green { + position: absolute; + left: 10px; + bottom: 125px; + } + ` + } + </style> { item.tag_name === null ? "": <div className="tag-green"> 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");*/