diff --git a/lib/tasks/video_transcode.rake b/lib/tasks/video_transcode.rake index 7e461224e..955905632 100644 --- a/lib/tasks/video_transcode.rake +++ b/lib/tasks/video_transcode.rake @@ -6,6 +6,8 @@ namespace :video_transcode do if v.uuid && !v.transcoded && !v.file_url.include?('.mp4') && !AliyunVod::Service.get_meta_code_info(v.uuid).start_with?("h264", "h265") p "--- Start submit video trans code #{v.uuid}" AliyunVod::Service.submit_transcode_job(v.uuid, 'a0277c5c0c7458458e171b0cee6ebf5e') + else + v.update(transcoded: true) end end end diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js index 9ba9eec03..be1d3a33c 100644 --- a/public/react/src/modules/paths/ShixunPathSearch.js +++ b/public/react/src/modules/paths/ShixunPathSearch.js @@ -199,7 +199,7 @@ class ShixunPathSearch extends Component { } return ( -
+
{this.state.updata === undefined ? "" : } diff --git a/public/react/src/modules/paths/ShixunPaths.css b/public/react/src/modules/paths/ShixunPaths.css index 802795556..4136a835e 100644 --- a/public/react/src/modules/paths/ShixunPaths.css +++ b/public/react/src/modules/paths/ShixunPaths.css @@ -1,39 +1,45 @@ -.pathImg{ +.pathImg { background: #4CACFF } -.pathIndexNav{ - box-shadow:0px 4px 8px 0px rgba(0,0,0,0.04); + +.pathIndexNav { + box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.04); } -.pathIndexNav ul li{ + +.pathIndexNav ul li { float: left; margin-right: 10px; } -.pathIndexNav ul li a{ + +.pathIndexNav ul li a { display: block; font-size: 15px; color: #333333; - padding:0px 20px; - border-radius:18px; + padding: 0px 20px; + border-radius: 18px; height: 32px; line-height: 32px; - margin:5px 0px; + margin: 5px 0px; } -.pathIndexNav ul li.active a,.pathIndexNav ul li:hover a{ + +.pathIndexNav ul li.active a, +.pathIndexNav ul li:hover a { background: #DDECF9; color: #4CACFF } + /*.pathImg{*/ - /*width: 100%;*/ - /*height: 300px;*/ - /*background-image: url(../../images/path/path.png);*/ - /*background-color: #000a4f;*/ - /*!* background-size: cover; *!*/ - /*background-position: center;*/ - /*background-repeat: no-repeat;*/ +/*width: 100%;*/ +/*height: 300px;*/ +/*background-image: url(../../images/path/path.png);*/ +/*background-color: #000a4f;*/ +/*!* background-size: cover; *!*/ +/*background-position: center;*/ +/*background-repeat: no-repeat;*/ /*}*/ /* 首页-最新最热 */ -.mainPageArray span{ +.mainPageArray span { font-size: 14px; float: left; background: #EBEBEB; @@ -45,13 +51,14 @@ cursor: pointer; border-radius: 15px; } -.mainPageArray span.active{ + +.mainPageArray span.active { background: #4CACFF; color: #fff; } /* path-card */ -.squareCard{ +.squareCard { position: relative; width: 280px; margin-right: 26px; @@ -59,10 +66,12 @@ float: left; border-radius: 6px; } -.squareCard:nth-child(4n){ + +.squareCard:nth-child(4n) { margin-right: 0px; } -.squareCard .squareImg{ + +.squareCard .squareImg { height: 175px; width: 280px; overflow: hidden; @@ -70,7 +79,8 @@ border-radius: 6px; position: relative; } -.squareCard .squareImg img{ + +.squareCard .squareImg img { transition: all 1s; -webkit-transition: all 1s; -o-transition: all 1s; @@ -78,12 +88,13 @@ position: absolute; top: -17.5px; } -.squareCard .squareImg img:hover{ + +.squareCard .squareImg img:hover { transform: scale(1.05); } /* card info */ -.cardName{ +.cardName { font-size: 16px; font-weight: 600; height: 20px; @@ -91,16 +102,17 @@ margin-bottom: 10px; } -.squareLine:after{ +.squareLine:after { position: absolute; width: 1px; height: 10px; background: #adadad; content: ''; right: -10px; - top:4px; + top: 4px; } -.squareInfo{ + +.squareInfo { color: #777; font-size: 12px; font-weight: 400; @@ -115,6 +127,7 @@ top: 12px; z-index: 1; } + .tag_open .tag_open_name { display: block; width: auto; @@ -130,11 +143,11 @@ -.paragraph:hover .status_li a{ +.paragraph:hover .status_li a { display: block; } -.newedu-filter-btn{ +.newedu-filter-btn { display: block; float: left; padding: 0 9px; @@ -147,7 +160,7 @@ margin-bottom: 9px; } -.edu-filter-btn29BD8B{ +.edu-filter-btn29BD8B { display: block; float: left; padding: 0 9px; @@ -160,115 +173,163 @@ margin-bottom: 9px; } -.lesson-saved-list-item{ - border-bottom: none!important; +.lesson-saved-list-item { + border-bottom: none !important; margin-bottom: 10px; background-color: #fff; } -.click_add{ - border-top: none!important; +.click_add { + border-top: none !important; +} + +.white-panel li { + border: 1px solid #fafafa !important; +} + +.white-panel li.active { + border: 1px solid #4CACFF !important; } -.white-panel li{border:1px solid #fafafa!important;} -.white-panel li.active{border:1px solid #4CACFF!important;} /* 选择实训列表 */ -.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;} +.greybackHead { + height: 40px; + line-height: 40px; + padding: 0px 20px; + box-sizing: border-box; + color: #676767; + background-color: #eaeaea; +} -.mtf3{ - margin-top:-3px; +.mtf3 { + margin-top: -3px; } -.mtf5{ +.mtf5 { margin-top: -5px; } -.color204{ - color:rgba(204,204,204,1); +.color204 { + color: rgba(204, 204, 204, 1); } -.lesson-saved-list-itemdrop{ - height: 93px; - overflow: hidden; +.lesson-saved-list-itemdrop { + height: 93px; + overflow: hidden; } -.lesson-saved-list{ - position: relative; +.lesson-saved-list { + position: relative; } -.itempositionleft{ - position: absolute; +.itempositionleft { + position: absolute; } -.itempositionright{ - position: absolute; +.itempositionright { + position: absolute; } -.ant-input{ - background-color: #fafafa!important; +.ant-input { + background-color: #fafafa !important; } -.ant-input:focus{ - background-color:#ffffff!important; + +.ant-input:focus { + background-color: #ffffff !important; } -.pathNavLine{bottom: -11px;} +.pathNavLine { + bottom: -11px; +} -#shixun_operation:hover{ - color:#fff !important; +#shixun_operation:hover { + color: #fff !important; } -.cursor{ - cursor: pointer; +.cursor { + cursor: pointer; } -.paragraph_nameid:hover{ - color:#4cacff !important; + +.paragraph_nameid:hover { + color: #4cacff !important; } + /* 学习统计 */ -.statisticsNav{height: 100px;} -.statisticsNav ul{margin-top: 35px;} -.statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;} -.statisticsNav ul li a{color: #4D4D4D!important;} -.statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;} -.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;} +.statisticsNav { + height: 100px; +} + +.statisticsNav ul { + margin-top: 35px; +} + +.statisticsNav ul li { + float: left; + font-size: 18px; + color: #4D4D4D; + height: 64px; + line-height: 64px; + margin: 0px 30px; + cursor: pointer; +} +.statisticsNav ul li a { + color: #4D4D4D !important; +} -.next-loading{ - width:100%; - } +.statisticsNav ul li.active { + color: #05101A; + border-bottom: 2px solid #05101A; +} -.paddingleft22{ - text-align: left; - padding-left: 22px; +.statisticsNav ul li.active a { + color: #05101A !important; + text-decoration: none !important; } -.paddingl5{ - padding-left: 5px; + +.next-loading { + width: 100%; } -.paddingl10{ - padding-left: 10px; +.paddingleft22 { + text-align: left; + padding-left: 22px; } -.red{ - color:red; +.paddingl5 { + padding-left: 5px; } -.pl38{ - padding-left: 38px; +.paddingl10 { + padding-left: 10px; } -.ml37{ - margin-left: 37px; + +.red { + color: red; +} + +.pl38 { + padding-left: 38px; +} + +.ml37 { + margin-left: 37px; } .newmustlearn { - padding: 34px 25px; - text-align: center; + padding: 34px 25px; + text-align: center; +} + +.color181818 { + color: #181818; } -.color181818{ - color: #181818; +.colorD5D8D6 { + color: #D5D8D6; } -.colorD5D8D6{ - color:#D5D8D6; +.shixun-path-search-container .search-keyword-container { + padding: 20px 0 0 0; } \ No newline at end of file