- 共 {liveData && liveData.total_count} 个视频
+ 共 {liveData && liveData.total_count} 个视频
{
lives.map((item,key)=>{
@@ -38,9 +64,10 @@ class Live extends Component{
}
:
-
-
-
+ ""
+ //
+ //
+ //
}
)
diff --git a/public/react/src/modules/courses/Video/LiveNew.js b/public/react/src/modules/courses/Video/LiveNew.js
index 897dd714a..a295a6fe5 100644
--- a/public/react/src/modules/courses/Video/LiveNew.js
+++ b/public/react/src/modules/courses/Video/LiveNew.js
@@ -137,10 +137,10 @@ class LiveNew extends Component{
)}
-
+ {/*
EduCoder推荐您使用腾讯课堂进行直播
操作指引
-
+ */}
取消
diff --git a/public/react/src/modules/courses/Video/VideoIndex.js b/public/react/src/modules/courses/Video/VideoIndex.js
index 7dbeca7f3..774f35de9 100644
--- a/public/react/src/modules/courses/Video/VideoIndex.js
+++ b/public/react/src/modules/courses/Video/VideoIndex.js
@@ -202,12 +202,18 @@ class VideoIndex extends Component{
(admin || is_teacher || business) &&
{
- upload ?
- this.uploadVideo(false)}>取消
+ type === "video" ?
+
+ {
+ upload ?
+ this.uploadVideo(false)}>取消
+ :
+ 上传视频
+ }
+
:
- 上传视频
+ 直播设置
}
- 直播设置
}
diff --git a/public/react/src/modules/courses/Video/images/WeiBaiTong.png b/public/react/src/modules/courses/Video/images/WeiBaiTong.png
new file mode 100644
index 000000000..db08c9c42
Binary files /dev/null and b/public/react/src/modules/courses/Video/images/WeiBaiTong.png differ
diff --git a/public/react/src/modules/courses/Video/images/bilibili.png b/public/react/src/modules/courses/Video/images/bilibili.png
new file mode 100644
index 000000000..10e189741
Binary files /dev/null and b/public/react/src/modules/courses/Video/images/bilibili.png differ
diff --git a/public/react/src/modules/courses/Video/images/douyu.jpg b/public/react/src/modules/courses/Video/images/douyu.jpg
new file mode 100644
index 000000000..52b8d4962
Binary files /dev/null and b/public/react/src/modules/courses/Video/images/douyu.jpg differ
diff --git a/public/react/src/modules/courses/Video/images/tencent.png b/public/react/src/modules/courses/Video/images/tencent.png
new file mode 100644
index 000000000..738bb3693
Binary files /dev/null and b/public/react/src/modules/courses/Video/images/tencent.png differ
diff --git a/public/react/src/modules/courses/Video/video.css b/public/react/src/modules/courses/Video/video.css
index c91e5477e..b44a33371 100644
--- a/public/react/src/modules/courses/Video/video.css
+++ b/public/react/src/modules/courses/Video/video.css
@@ -138,4 +138,16 @@
.liveModal .ant-col.ant-form-item-label{
height: 30px;
line-height: 30px;
+}
+.platform{
+ background: #fff;
+ display: flex;
+ align-items: center;
+ padding:20px 10px;
+ margin-bottom: 10px;
+}
+.platform > li{
+ margin-right: 80px;
+ display: flex;
+ align-items: center;
}
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/video/VideoUploadList.js b/public/react/src/modules/user/usersInfo/video/VideoUploadList.js
index 6f6286727..60f94e779 100644
--- a/public/react/src/modules/user/usersInfo/video/VideoUploadList.js
+++ b/public/react/src/modules/user/usersInfo/video/VideoUploadList.js
@@ -15,7 +15,7 @@ import uploadHoverIcon from './images/upload_hover.png'
let uploader
const files = []
const MAX_FILE_COUNT = 3
-const MAX_FILE_SIZE = 200
+const MAX_FILE_SIZE = 500
let noUploads = true
function VideoUploadList (props) {
@@ -74,8 +74,8 @@ function VideoUploadList (props) {
clearInput()
return;
}
- if (file.size > 200 * 1024 * 1024) {
- // 超过200m TODO
+ if (file.size >(parseInt(MAX_FILE_SIZE) * 1024 * 1024)) {
+ // 超过500m TODO
clearInput()
showNotification(`视频大小超过${MAX_FILE_SIZE}M`)
return;
@@ -428,7 +428,7 @@ function VideoUploadList (props) {
>继续添加}
-
视频大小:不支持断点续传,单个视频文件最大200M;单次最多支持3个视频文件上传
+
视频大小:不支持断点续传,单个视频文件最大500M;单次最多支持3个视频文件上传
视频规格:avi、flv、f4v、m4v、mov、mp4、rmvb、swf、webm
温馨提示:请勿上传违法视频。平台将为每一个视频分配一个地址,您可以通过引用该地址将视频使用在实训项目等模块