Merge branches 'dev_Ysm' and 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js

@@ -65,9 +65,10 @@ function doCreateUploader (options) {
             if (!uploadInfo.videoId) {
                 
                 var createUrl = `${_testHost}/users/${login}/video_auths.json`
+                const _random = '' // Math.random().toString().substring(3, 6)+'-'
                 axios.post(createUrl, {
-                    title: fileName,
-                    file_name: fileName
+                    title: _random+fileName,
+                    file_name: _random+fileName
                 }).then((response) => {
                     // if (response.data.status == )
                     const data = response.data.data

public/react/src/modules/user/usersInfo/video/VideoUploadList.js

@@ -309,6 +309,7 @@ function VideoUploadList (props) {
                 /* item */
                 .videoUploadList .cancelUpload {
                     flex: 0 0 200px;
+                    margin-left: 2px;
                 }
                 .videoUploadList .titleInput {
                     width: 480px;