From 00f774f72e2f607b4da23d7183ff4db3bc8c6cb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 十月 2024 18:21:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/UploadAvatarImage.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/admin/src/components/common/UploadAvatarImage.vue b/admin/src/components/common/UploadAvatarImage.vue
index d541ed6..72f91b9 100644
--- a/admin/src/components/common/UploadAvatarImage.vue
+++ b/admin/src/components/common/UploadAvatarImage.vue
@@ -2,7 +2,7 @@
<div>
<el-upload
class="avatar-uploader"
- accept=".png,.jpg"
+ accept=".png,.jpg,.jpeg"
:style="customStyle"
:action="uploadImgUrl"
:data="uploadData"
@@ -30,7 +30,7 @@
tipsLabel: '',
customStyle: {
type: String,
- default: 'width: 90px; height: 90px;'
+ default: 'width: 90px; max-height: 90px;'
},
uploadData: Object
},
@@ -92,8 +92,8 @@
text-align: center;
}
.avatar {
- width: 100% !important;
- height: auto !important;
+ width: 90px;
+ max-height: 90px;
display: block;
}
.tips-style {
--
Gitblit v1.9.3