|
@@ -647,26 +647,27 @@ export default {
|
|
|
this.$toast('上传图片大小不能超过 5MB')
|
|
|
return false
|
|
|
}
|
|
|
- return new Promise((resolve) => {
|
|
|
- fileUtil.getOrientation(file).then((orient) => {
|
|
|
- if (orient && orient != "" && orient != 1) {
|
|
|
- let reader = new FileReader()
|
|
|
- let img = new Image()
|
|
|
- reader.onload = (e) => {
|
|
|
- img.src = e.target.result
|
|
|
- img.onload = function () {
|
|
|
- const data = fileUtil.rotateImage(img, img.width, img.height, orient)
|
|
|
- const newFile = fileUtil.dataURLtoFile(data, file.name)
|
|
|
- resolve(newFile)
|
|
|
- }
|
|
|
- }
|
|
|
- reader.readAsDataURL(file)
|
|
|
- } else {
|
|
|
- resolve(file)
|
|
|
- }
|
|
|
- })
|
|
|
- })
|
|
|
- // return true
|
|
|
+ // return new Promise((resolve) => {
|
|
|
+ // fileUtil.getOrientation(file).then((orient) => {
|
|
|
+ // console.log(orient)
|
|
|
+ // if (orient && orient != "" && orient != 1) {
|
|
|
+ // let reader = new FileReader()
|
|
|
+ // let img = new Image()
|
|
|
+ // reader.onload = (e) => {
|
|
|
+ // img.src = e.target.result
|
|
|
+ // img.onload = function () {
|
|
|
+ // const data = fileUtil.rotateImage(img, img.width, img.height, orient)
|
|
|
+ // const newFile = fileUtil.dataURLtoFile(data, file.name)
|
|
|
+ // resolve(newFile)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // reader.readAsDataURL(file)
|
|
|
+ // } else {
|
|
|
+ // resolve(file)
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ return true
|
|
|
},
|
|
|
beforeDelete(file, detail) {
|
|
|
const obj = detail.name.split('-')
|