diff --git a/public/react/src/modules/courses/Video/VideoIndex.js b/public/react/src/modules/courses/Video/VideoIndex.js index ff1129666..5d14e376c 100644 --- a/public/react/src/modules/courses/Video/VideoIndex.js +++ b/public/react/src/modules/courses/Video/VideoIndex.js @@ -301,11 +301,11 @@ class VideoIndex extends Component{ { videoId ? - this.editDir(videoData && videoData.category_name,videoId)} className={"mr30 font-16"}>目录重命名 + this.editDir(videoData && videoData.category_name,videoId)} className={"ml30 font-16"}>目录重命名 : - 新建目录 + 新建目录 } - this.setLinkeVisible(true)}>增加外链 + this.setLinkeVisible(true)}>增加外链 :"" } { @@ -313,9 +313,9 @@ class VideoIndex extends Component{ { upload ? - this.uploadVideo(false)}>取消 + this.uploadVideo(false)}>取消 : - 上传视频 + 上传视频 } :"" } diff --git a/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js b/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js index e3cddd4d2..61f159ef5 100644 --- a/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js +++ b/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js @@ -27,16 +27,16 @@ function loadLib(callback) { }); }); } -function createUploader(options,setLoading) { +function createUploader(options) { if (window.AliyunUpload && window.AliyunUpload.Vod) { - doCreateUploader(options,setLoading) + doCreateUploader(options) } else { loadLib(() => { - doCreateUploader(options,setLoading) + doCreateUploader(options) }) } } -function doCreateUploader (options,setLoading) { +function doCreateUploader (options) { uploader = new window.AliyunUpload.Vod({ timeout: $('#timeout').val() || 60000, partSize: $('#partSize').val() || 1048576, @@ -82,8 +82,7 @@ function doCreateUploader (options,setLoading) { var uploadAddress = data.UploadAddress var videoId = data.VideoId uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId) - console.log("onUploadstarted","false"); - setLoading && setLoading(false); + } }).catch((error) => { // 删除当前出错的,并执行下一个任务 @@ -181,9 +180,9 @@ function doCreateUploader (options,setLoading) { options.gotUploader(uploader) } } -export function getUploader (_login, options,setLoading) { +export function getUploader (_login, options) { _login && (login = _login) if (!uploader || options.create == true) { - createUploader(options,setLoading) + createUploader(options) } } \ 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 11c4713ef..606ba9f32 100644 --- a/public/react/src/modules/user/usersInfo/video/VideoUploadList.js +++ b/public/react/src/modules/user/usersInfo/video/VideoUploadList.js @@ -168,15 +168,15 @@ function VideoUploadList (props) { }, onUploadEnd: (uploadInfo) => { console.log('onUploadEnd', uploadInfo) - + setLoading(false); }, onUploadSucceed: (uploadInfo) => { console.log('onUploadSucceed', uploadInfo) - + setLoading(false); }, onUploadError: (uploadInfo) => { - + setLoading(false); }, // 可能需要等lib加载完毕才能执行 gotUploader: (_uploader) => { @@ -187,7 +187,7 @@ function VideoUploadList (props) { window.uploader = uploader; } - },setLoading + } // ) ) } else {