diff --git a/src/components/Upload/Images.vue b/src/components/Upload/Images.vue index 1389ba4..d539b92 100644 --- a/src/components/Upload/Images.vue +++ b/src/components/Upload/Images.vue @@ -97,9 +97,6 @@ fileSize: { default: 200, }, - orderNo: { - default: '', - }, fileType: { default: '', }, @@ -191,7 +188,7 @@ let second: string | number = date.getSeconds(); second = second < 10 ? '0' + second : second; let time = h + '' + minute + '' + second; - let fileName = (props.orderNo ? time + '-' + props.orderNo : time) + '-' + options.file.name; + let fileName = time + '-' + options.file.name; fileName = fileName.replace(/[\+\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\<\>\?]/g, ''); let filePath = props.name + '/' + year + '/' + month + '/' + day + '/' + fileName; loading.value = true; diff --git a/src/components/Upload/file.vue b/src/components/Upload/file.vue index 00b5558..c5a91d0 100644 --- a/src/components/Upload/file.vue +++ b/src/components/Upload/file.vue @@ -94,9 +94,6 @@ fileSize: { default: 200, }, - orderNo: { - default: '', - }, fileType: { default: '', }, @@ -209,17 +206,18 @@ // headers, mime: options.file.type, }); + const fileUrl = configData.oss_domain + res.name; if (props.multiple) { let list = JSON.parse(JSON.stringify(props.fileList)); list.push({ - url: res.res.requestUrls[0], + url: fileUrl, name: options.file.name, - filePath: res.res.requestUrls[0], + filePath: fileUrl, fileName: options.file.name, }); emit('upload', list, props.zIndex); } else { - emit('upload', res.res.requestUrls[0], options.file.name, props.zIndex); + emit('upload', fileUrl, options.file.name, props.zIndex); } } catch (error) { ElNotification({