From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 11:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/common/UploadFaceImg.vue | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/admin/src/components/common/UploadFaceImg.vue b/admin/src/components/common/UploadFaceImg.vue
index 98e2dd1..467f672 100644
--- a/admin/src/components/common/UploadFaceImg.vue
+++ b/admin/src/components/common/UploadFaceImg.vue
@@ -21,7 +21,7 @@
:visible.sync="updateImg"
width="1000px"
class="icon-dialog-wrapper dialong-com-style">
- <ImageCropper ref="iconShot" v-if="updateImg" :imgSrc="img" >
+ <ImageCropper ref="iconShot" v-if="updateImg" :imgSrc="img" :auto-crop="autoCrop">
</ImageCropper>
<span slot="footer" class="dialog-footer">
<el-button v-if="loading">鍙� 娑�</el-button>
@@ -42,7 +42,17 @@
type: Object,
default: () => {}
},
- tipsLabel: '',
+ autoCrop: {
+ type: Object,
+ default () {
+ return { width: 500, height: 500 }
+ }
+ },
+ // eslint-disable-next-line vue/require-prop-type-constructor
+ tipsLabel: {
+ type: String,
+ default: ''
+ },
customStyle: {
type: String,
default: 'width: 90px; height: 90px;'
@@ -52,7 +62,7 @@
data () {
return {
loading: false,
- fileInfo:{},
+ fileInfo: {},
img: null,
updateImg: false,
imageSrc: null,
@@ -68,17 +78,17 @@
console.log(fileData)
const formData = new FormData()
- formData.append('folder', 'member')
- if(this.uploadData.isFace || this.uploadData.isFace == 0){
+ formData.append('folder', this.uploadData.folder || 'member')
+ if (this.uploadData.isFace || this.uploadData.isFace == 0) {
formData.append('isFace', 0)
}
formData.append(
- 'file',
- new File(
- [fileData], // 灏咮lob绫诲瀷杞寲鎴怓ile绫诲瀷
- this.fileInfo.name, // 璁剧疆File绫诲瀷鐨勬枃浠跺悕绉�
- { type: this.fileInfo.type } // 璁剧疆File绫诲瀷鐨勬枃浠剁被鍨�
- )
+ 'file',
+ new File(
+ [fileData], // 灏咮lob绫诲瀷杞寲鎴怓ile绫诲瀷
+ this.fileInfo.name, // 璁剧疆File绫诲瀷鐨勬枃浠跺悕绉�
+ { type: this.fileInfo.type } // 璁剧疆File绫诲瀷鐨勬枃浠剁被鍨�
+ )
)
this.loading = true
upload(formData).then(res => {
--
Gitblit v1.9.3