From ba3e5d0194d8cdfbe7ae977b72170ed31909ae5a Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Mon, 3 Apr 2023 20:31:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/account/Center/index.vue                  | 11 ++++++++---
 src/views/system/Apply/Save/components/EditForm.vue |  8 +++-----
 src/views/user/Login/index.vue                      |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/views/account/Center/index.vue b/src/views/account/Center/index.vue
index becf59e7..89d62d93 100644
--- a/src/views/account/Center/index.vue
+++ b/src/views/account/Center/index.vue
@@ -140,8 +140,10 @@
                 <div class="content">
                     <div class="account-card" v-for="item in bindList">
                         <img
-                            :src="getImage(bindIcon[item.provider])"
-                            style="height: 50px"
+                            :src="item.logoUrl || getImage(bindIcon[item.provider])"
+                            style="height: 50px;width: 50px"
+                            width='50px'
+                            height='50px'
                             alt=""
                         />
                         <Ellipsis style="width: 150px; font-size: 22px">
@@ -399,6 +401,8 @@ function getViews() {
             display: flex;
             margin-top: 24px;
             flex-wrap: wrap;
+            gap: 24px;
+
             .content-item {
                 margin-right: 24px;
 
@@ -438,9 +442,10 @@ function getViews() {
             }
 
             .account-card {
-                margin-right: 24px;
                 width: 415px;
                 background-image: url(/images/notice/dingtalk-background.png);
+                border-right: 1px solid #f0f0f0;
+                border-bottom: 1px solid #f0f0f0;
                 display: flex;
                 align-items: center;
                 justify-content: space-between;
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index 01a7b8cf..11ba5baa 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -1065,12 +1065,10 @@
                             >
                                 <img
                                     v-if="
-                                        form.data.sso.configuration.oauth2
-                                            .logoUrl
+                                        form.data.logoUrl
                                     "
                                     :src="
-                                        form.data.sso.configuration.oauth2
-                                            .logoUrl
+                                        form.data.logoUrl
                                     "
                                     alt="avatar"
                                     style="width: 150px"
@@ -1905,7 +1903,7 @@ function changeBackUpload(info: UploadChangeParam<UploadFile<any>>) {
     } else if (info.file.status === 'done') {
         info.file.url = info.file.response?.result;
         form.uploadLoading = false;
-        form.data.sso.configuration.oauth2.logoUrl = info.file.response?.result;
+        form.data.logoUrl = info.file.response?.result;
     } else if (info.file.status === 'error') {
         form.uploadLoading = false;
         message.error('logo上传失败，请稍后再试');
diff --git a/src/views/user/Login/index.vue b/src/views/user/Login/index.vue
index f313f2a3..9ea0a1fb 100644
--- a/src/views/user/Login/index.vue
+++ b/src/views/user/Login/index.vue
@@ -143,7 +143,7 @@
                                                 style="width: 32px; height: 33px"
                                                 :alt="item.name"
                                                 :src="
-                                                    iconMap.get(
+                                                    item.logoUrl || iconMap.get(
                                                         item.provider,
                                                     ) || defaultImg
                                                 "