From 8aff182ef3a075540119a98a9ae03d80dd97318e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 14 十月 2024 18:15:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin/src/components/common/UploadFaceImg.vue | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/admin/src/components/common/UploadFaceImg.vue b/admin/src/components/common/UploadFaceImg.vue index 4bc0b0d..926bb2d 100644 --- a/admin/src/components/common/UploadFaceImg.vue +++ b/admin/src/components/common/UploadFaceImg.vue @@ -24,8 +24,9 @@ <ImageCropper ref="iconShot" v-if="updateImg" :imgSrc="img" > </ImageCropper> <span slot="footer" class="dialog-footer"> - <el-button @click="updateImg = false">鍙� 娑�</el-button> - <el-button type="primary" @click="uploadIcon">纭� 瀹�</el-button> + <el-button v-if="loading">鍙� 娑�</el-button> + <el-button v-else @click="updateImg = false">鍙� 娑�</el-button> + <el-button :loading="loading" type="primary" @click="uploadIcon">纭� 瀹�</el-button> </span> </el-dialog> </div> @@ -50,6 +51,7 @@ }, data () { return { + loading: false, fileInfo:{}, img: null, updateImg: false, @@ -75,7 +77,9 @@ { type: this.fileInfo.type } // 璁剧疆File绫诲瀷鐨勬枃浠剁被鍨� ) ) + this.loading = true upload(formData).then(res => { + this.loading = false console.log(res) this.file.imgurl = res.imgaddr this.file.imgurlfull = res.url @@ -84,6 +88,8 @@ this.updateImg = false this.$emit('uploadSuccess', { imgurl: res.imgaddr, imgurlfull: res.url, name: res.originname }) this.$emit('uploadEnd') + }, () => { + this.loading = false }) }) }, -- Gitblit v1.9.3