Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into newyslclassrooms

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

public/react/src/modules/paths/ShixunPathSearch.js

@@ -199,7 +199,7 @@ class ShixunPathSearch extends Component {
     }
 
     return (
-      <div>
+      <div className='shixun-path-search-container'>
         {this.state.updata === undefined ? "" : <UpgradeModals
           {...this.state}
         />}

public/react/src/modules/paths/ShixunPaths.css

@@ -1,13 +1,16 @@
 .pathImg {
   background: #4CACFF
 }
+
 .pathIndexNav {
   box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.04);
 }
+
 .pathIndexNav ul li {
   float: left;
   margin-right: 10px;
 }
+
 .pathIndexNav ul li a {
   display: block;
   font-size: 15px;
@@ -18,10 +21,13 @@
   line-height: 32px;
   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;*/
@@ -45,6 +51,7 @@
   cursor: pointer;
   border-radius: 15px;
 }
+
 .mainPageArray span.active {
   background: #4CACFF;
   color: #fff;
@@ -59,9 +66,11 @@
   float: left;
   border-radius: 6px;
 }
+
 .squareCard:nth-child(4n) {
   margin-right: 0px;
 }
+
 .squareCard .squareImg {
   height: 175px;
   width: 280px;
@@ -70,6 +79,7 @@
   border-radius: 6px;
   position: relative;
 }
+
 .squareCard .squareImg img {
   transition: all 1s;
   -webkit-transition: all 1s;
@@ -78,6 +88,7 @@
   position: absolute;
   top: -17.5px;
 }
+
 .squareCard .squareImg img:hover {
   transform: scale(1.05);
 }
@@ -100,6 +111,7 @@
   right: -10px;
   top: 4px;
 }
+
 .squareInfo {
   color: #777;
   font-size: 12px;
@@ -115,6 +127,7 @@
   top: 12px;
   z-index: 1;
 }
+
 .tag_open .tag_open_name {
   display: block;
   width: auto;
@@ -169,11 +182,24 @@
 .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;
@@ -207,11 +233,14 @@
 .ant-input {
   background-color: #fafafa !important;
 }
+
 .ant-input:focus {
   background-color: #ffffff !important;
 }
 
-.pathNavLine{bottom: -11px;}
+.pathNavLine {
+  bottom: -11px;
+}
 
 #shixun_operation:hover {
   color: #fff !important;
@@ -220,16 +249,43 @@
 .cursor {
   cursor: pointer;
 }
+
 .paragraph_nameid:hover {
   color: #4cacff !important;
 }
+
 /* 学习统计 */
-.statisticsNav{height: 100px;}
+.statisticsNav {
-.statisticsNav ul{margin-top: 35px;}
+  height: 100px;
-.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 {
-.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;}
+  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;
+}
 
 
 .next-loading {
@@ -256,6 +312,7 @@
 .pl38 {
   padding-left: 38px;
 }
+
 .ml37 {
   margin-left: 37px;
 }
@@ -272,3 +329,7 @@
 .colorD5D8D6 {
   color: #D5D8D6;
 }
+
+.shixun-path-search-container .search-keyword-container {
+  padding: 20px 0 0 0;
+}