From 33e870fd97ac3887651bda875efb08e8b6007849 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, 15 Jul 2019 18:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/coursesDetail/CoursesLeftNav.js | 21 +- .../courses/coursesHome/coursesHomeCard.js | 3 +- .../courses/coursesPublic/ShixunModal.js | 28 +- .../modules/page/layers/TaskResultLayer.css | 270 +++++++++--------- .../PathDetail/DetailCardsEditAndEdit.js | 2 +- public/react/src/modules/tpm/NewFooter.js | 11 +- public/react/src/modules/tpm/beian.png | Bin 0 -> 19256 bytes 7 files changed, 179 insertions(+), 156 deletions(-) create mode 100755 public/react/src/modules/tpm/beian.png diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index 7698dfa90..9d50426e8 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -553,19 +553,28 @@ class Coursesleftnav extends Component{ // notification.open({ // message: "删除成功", // }); - window.location.href = url; + + // this.props.history.replace(url); + window.location.href = url; } - deletenavchilds=(url)=>{ + deletenavchilds=(url,mainurl)=>{ + axios.delete(url).then((result)=>{ if(result.data.status===0){ - this.updatadeleteSecondary(result.data.right_url) + + if(mainurl===undefined){ + this.updatadeleteSecondary(result.data.right_url) + }else{ + this.updatadeleteSecondary(mainurl) + } + } }).catch((error)=>{ console.log(error) }) } - deleteSecondary=(e,type,id)=>{ + deleteSecondary=(e,type,id,mainurl)=>{ e.stopPropagation();//阻止冒泡 if(type===1){ let url="/course_second_categories/"+id+".json" @@ -593,7 +602,7 @@ class Coursesleftnav extends Component{ ModalsType:true, Modalstopval:"该目录下的内容将被移动到父目录,", ModalsBottomval:"是否确认删除?", - ModalSave:()=>this.deletenavchilds(url), + ModalSave:()=>this.deletenavchilds(url,mainurl), }) } @@ -726,7 +735,7 @@ class Coursesleftnav extends Component{ {item.type==="course_group"?
this.deleteSecondary(e,2,iem.category_id)}>删除
:""} {/*讨论区*/} {item.type==="board"?
this.Navmodalnames(e,7,"editSecondname",iem.category_id,iem.category_name)}>重命名
:""} - {item.type==="board"?
this.deleteSecondary(e,3,iem.category_id)}>删除
:""} + {item.type==="board"?
this.deleteSecondary(e,3,iem.category_id,item.category_url)}>删除
:""} ) } diff --git a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js b/public/react/src/modules/courses/coursesHome/coursesHomeCard.js index c0a1a93f0..6869b6b71 100644 --- a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js +++ b/public/react/src/modules/courses/coursesHome/coursesHomeCard.js @@ -40,7 +40,8 @@ class coursesHomeCard extends Component{ className="mt80 mb25"/>

非成员不能访问

- + {/**/} + {/*target="_blank"*/} { item.is_public===1&&item.id===1309? diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js index d01c8d986..a9eddaa87 100644 --- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js +++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js @@ -211,15 +211,15 @@ class ShixunModal extends Component{ this.changeTag("all")} className={ type==="all" ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部 - { - shixunmodallist && shixunmodallist.tags.map((item,key)=>{ - return( -
  • - this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name} -
    • - ) - }) - } + {/*{*/} + {/*shixunmodallist && shixunmodallist.tags.map((item,key)=>{*/} + {/*return(*/} + {/*
  • */} + {/*this.changeTag(item.tag_id)} className={ parseInt(type) === parseInt(item.tag_id) ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>{item.tag_name}*/} + {/*
    • */} + {/*)*/} + {/*})*/} + {/*}*/}
    @@ -251,9 +251,9 @@ class ShixunModal extends Component{ } @@ -292,9 +292,9 @@ class ShixunModal extends Component{ {item.shixun_name} -
  • {item.school_users}
    • +
  • {item.school}
  • {item.myshixuns_count}
    • -
  • {item.preference}
    • +
  • {item.level}
  • 详情
    •  diff --git a/public/react/src/modules/page/layers/TaskResultLayer.css b/public/react/src/modules/page/layers/TaskResultLayer.css index 0dd118470..c9912b710 100644 --- a/public/react/src/modules/page/layers/TaskResultLayer.css +++ b/public/react/src/modules/page/layers/TaskResultLayer.css @@ -1,134 +1,138 @@ -.taskResultLayer { - color: #666666; - z-index: 99999999999999; - width: 100%; - height: 100%; - position: fixed; - background:rgba(0,0,0,0.8); - top: 0px; - overflow: hidden; -} - .taskResultLayer .closeIcon{ - position: absolute; - right: 100px; - top: 46px; - font-size: 28px; - z-index: 999999; - color: rgb(255,255,255,0.7); - cursor: pointer; - } - .taskResultLayer .closeIcon:hover { - color: #4CACFF; - } - .taskResultLayer .expGold { - color: #b27919 ; - } - .taskResultLayer .rateLabel { - color: #fff ; - font-size: 14px; - } - .taskResultLayer .rc-rate-star { - font-size: 24px; - color: rgb(192, 192, 192); - } - .taskResultLayer .rc-rate-star:nth-child(5) { - margin-right: 0px; - } - -/* ImageLayer ----------------- Start */ -.passContent{ - justify-content: center; - align-items: center; - display: -webkit-flex; - height: 100%; - text-align: center; -} -.passImg{ - max-width: 86%; - max-height: 100%; -} -/* ImageLayer ----------------- End */ - -.passTaskContent{ - width: 652px; - height:100%; - margin:0px auto; - margin-top: 4%; -} -.passTaskImg{ - position: absolute; - z-index: 2; - user-select: none; -} - -.winpPerson{ - position: absolute; - width: 100%; - z-index: 3; - color: #D1A448; - text-align: center; - margin-top:304px; - font-size: 18px; -} -.winPanel{ - position: absolute; - width: 308px; - z-index: 5; - height: 356px; - border-radius: 10px; - margin:0px auto; - top:435px; - left: 50%; - margin-left: -154px; - text-align: center; -} -.inline{ - display: inline-block; - width: auto; - line-height: 26px; - font-size: 16px; -} -.inline.exp { - margin-left: 18px; -} - .inline img{ - margin-right: 8px; - } -.goldring{ - margin-right: 8px; - width: 17px; - height: 17px; - border-radius: 50%; - background-color: #FFD633; - display: block; - float: left; - margin-top: 5px; -} -.passNext{ - width:120px; - height:30px; - line-height:30px; - border-radius: 2px; - display: block; - background-color:#CCC; - color:#fff!important; - margin: 0px auto; -} -.passed{ - width:120px; - height:30px; - line-height:30px; - border-radius: 2px; - display: block; - color:#fff!important; - margin: 0px auto; - margin-top: 12px; - background-color: #CCCCCC; -} -.passed.stared { - background-color:#4CACFF; - opacity: 0.8; -} -.passed.stared:hover { - opacity: 1; +.taskResultLayer { + color: #666666; + z-index: 99999999999999; + width: 100%; + height: 100%; + position: fixed; + background:rgba(0,0,0,0.8); + top: 0px; + overflow: hidden; +} + .taskResultLayer .closeIcon{ + position: absolute; + right: 100px; + top: 46px; + font-size: 28px; + z-index: 999999; + color: rgb(255,255,255,0.7); + cursor: pointer; + } + .taskResultLayer .closeIcon:hover { + color: #4CACFF; + } + .taskResultLayer .expGold { + color: #b27919 ; + } + .taskResultLayer .rateLabel { + color: #fff ; + font-size: 14px; + } + .taskResultLayer .rc-rate-star { + font-size: 24px; + color: rgb(192, 192, 192); + } + .taskResultLayer .rc-rate-star:nth-child(5) { + margin-right: 0px; + } + +/* ImageLayer ----------------- Start */ +.passContent{ + justify-content: center; + align-items: center; + display: -webkit-flex; + height: 100%; + text-align: center; +} +.passImg{ + max-width: 86%; + max-height: 100%; +} +/* ImageLayer ----------------- End */ + +.passTaskContent{ + width: 652px; + height:100%; + margin:0px auto; + margin-top: 4%; +} +.passTaskImg{ + position: absolute; + z-index: 2; + user-select: none; +} + +.winpPerson{ + position: absolute; + width: 100%; + z-index: 3; + color: #D1A448; + text-align: center; + margin-top:304px; + font-size: 18px; +} +.winPanel{ + position: absolute; + width: 308px; + z-index: 5; + height: 356px; + border-radius: 10px; + margin:0px auto; + top:435px; + left: 50%; + margin-left: -154px; + text-align: center; +} +.inline{ + display: inline-block; + width: auto; + line-height: 26px; + font-size: 16px; +} +.inline.exp { + margin-left: 18px; +} + /*.inline img{*/ + /*margin-right: 8px;*/ + /*}*/ +.goldring{ + margin-right: 8px; + width: 17px; + height: 17px; + border-radius: 50%; + background-color: #FFD633; + display: block; + float: left; + margin-top: 5px; +} +.passNext{ + width:120px; + height:30px; + line-height:30px; + border-radius: 2px; + display: block; + background-color:#CCC; + color:#fff!important; + margin: 0px auto; +} +.passed{ + width:120px; + height:30px; + line-height:30px; + border-radius: 2px; + display: block; + color:#fff!important; + margin: 0px auto; + margin-top: 12px; + background-color: #CCCCCC; +} +.passed.stared { + background-color:#4CACFF; + opacity: 0.8; +} +.passed.stared:hover { + opacity: 1; +} + +.vertical4{ + vertical-align: -4px; } \ No newline at end of file diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js index f822b0de1..1bf137016 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js @@ -476,7 +476,7 @@ class DetailCardsEditAndEdit extends Component{ footer={null} width="840px" destroyOnClose={true} - >Z + >
    diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js index 9c984b8cd..12cede329 100644 --- a/public/react/src/modules/tpm/NewFooter.js +++ b/public/react/src/modules/tpm/NewFooter.js @@ -37,7 +37,16 @@ class NewFooter extends Component {
    -

    © 2019 EduCoder湘ICP备17009477号Trustie   &   IntelliDE inside.

    +

    + © 2019 EduCoder + 湘ICP备17009477号 + + 湘公网安备43019002000962号 + + Trustie   &   IntelliDE inside. 版权所有 湖南智擎科技有限公司 +

    diff --git a/public/react/src/modules/tpm/beian.png b/public/react/src/modules/tpm/beian.png new file mode 100755 index 0000000000000000000000000000000000000000..9f763946dd6606addeab24e40e2369124d53a048 GIT binary patch literal 19256 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 literal 0 HcmV?d00001