|
@@ -332,31 +332,17 @@
|
|
|
upload_ext(sourceType) {
|
|
|
console.log("----upload");
|
|
|
var _self = this;
|
|
|
- uni.chooseImage({
|
|
|
- count: 5,
|
|
|
- sizeType: ['compressed'],
|
|
|
+ uni.chooseMedia({
|
|
|
+ count: 9 - this.img_list.length,
|
|
|
+ mediaType: ['image', 'video'],
|
|
|
sourceType: [sourceType],
|
|
|
+ maxDuration: 60,
|
|
|
success: function(res) {
|
|
|
console.log('res:', res)
|
|
|
if (res.tempFiles && res.tempFiles.length > 0) {
|
|
|
- // 根据文件扩展名判断文件类型
|
|
|
- const getFileType = (filePath) => {
|
|
|
- const ext = filePath.split('.').pop().toLowerCase();
|
|
|
- const videoExts = ['mp4', 'avi', 'mov', 'wmv', 'flv', 'mkv', 'webm', '3gp',
|
|
|
- 'rm', 'rmvb'
|
|
|
- ];
|
|
|
- const imageExts = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg'];
|
|
|
-
|
|
|
- if (videoExts.includes(ext)) {
|
|
|
- return 'video';
|
|
|
- } else if (imageExts.includes(ext)) {
|
|
|
- return 'image';
|
|
|
- }
|
|
|
- return 'unknown';
|
|
|
- };
|
|
|
-
|
|
|
- // 判断是否有视频
|
|
|
- let videoFiles = res.tempFiles.filter(file => getFileType(file.path) === 'video');
|
|
|
+ // 根据文件类型判断
|
|
|
+ let videoFiles = res.tempFiles.filter(file => file.fileType === 'video');
|
|
|
+ let imageFiles = res.tempFiles.filter(file => file.fileType === 'image');
|
|
|
|
|
|
if (videoFiles.length > 0) {
|
|
|
// 如果多选视频,只处理第一个并提示
|
|
@@ -373,17 +359,16 @@
|
|
|
icon: 'none'
|
|
|
});
|
|
|
}
|
|
|
- _self.upload2('list', videoFiles[0].path, 'video',
|
|
|
+ _self.upload2('list', videoFiles[0].tempFilePath, 'video',
|
|
|
'/Xweb/upload_video?skey=');
|
|
|
console.log(videoFiles, 'videoFiles');
|
|
|
}
|
|
|
|
|
|
- let imageFiles = res.tempFiles.filter(file => getFileType(file.path) === 'image');
|
|
|
console.log(imageFiles, 'imageFiles');
|
|
|
if (imageFiles.length > 0) {
|
|
|
// 多图全部上传
|
|
|
imageFiles.forEach(img => {
|
|
|
- _self.upload2('list', img.path, 'image',
|
|
|
+ _self.upload2('list', img.tempFilePath, 'image',
|
|
|
'/Xweb/upload_img?skey=');
|
|
|
});
|
|
|
}
|
|
@@ -431,13 +416,9 @@
|
|
|
// });
|
|
|
// }
|
|
|
},
|
|
|
-
|
|
|
- error: function(e) {
|
|
|
-
|
|
|
+ fail: function(e) {
|
|
|
console.log(e);
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
});
|
|
|
|
|
|
|