From 5cc7f7e6ff9e28698799aaaf081d4f0b098fe3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 26 May 2022 13:26:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=E5=A4=B4=E5=83=8F=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=B0=E5=90=8E=E5=8F=B0=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue             | 2 +-
 src/views/system/user/profile/userAvatar.vue | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index be05506..8ba0837 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -158,7 +158,7 @@ function setLayout() {
           cursor: pointer;
           width: 30px;
           height: 30px;
-          border-radius: 10px;
+          border-radius: 50%;
           vertical-align: middle;
           margin-right: 5px;
         }
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 581dee1..9d8088b 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -14,8 +14,7 @@
           :autoCropHeight="options.autoCropHeight"
           :fixedBox="options.fixedBox"
           @realTime="realTime"
-          v-if="visible"
-        />
+          v-if="visible" />
       </el-col>
       <el-col :xs="24" :md="12" :style="{ height: '350px' }">
         <div class="avatar-upload-preview">
@@ -76,7 +75,7 @@ export default {
     const open = ref(false)
     const visible = ref(false)
     const title = ref('修改头像')
-
+    const fileName = ref('')
     //图片裁剪数据
     const options = reactive({
       img: store.getters.avatar, // 裁剪图片的地址
@@ -115,6 +114,7 @@ export default {
       if (file.type.indexOf('image/') == -1) {
         proxy.$modal.msgError('文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。')
       } else {
+        fileName.value = file.name
         const reader = new FileReader()
         reader.readAsDataURL(file)
         reader.onload = () => {
@@ -126,7 +126,8 @@ export default {
     function uploadImg() {
       proxy.$refs.cropper.getCropBlob((data) => {
         let formData = new FormData()
-        formData.append('picture', data)
+				var fileOfBlob = new File([data], fileName.value);
+        formData.append('picture', fileOfBlob)
         uploadAvatar(formData).then((response) => {
           open.value = false
           options.img = response.data.imgUrl