From 0328f85cb9b61f18eac96887d4ac625c34d99d64 Mon Sep 17 00:00:00 2001
From: Double-_-Z <2492419643@qq.com>
Date: Mon, 18 Nov 2024 17:17:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AClogo=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                           |  2 +-
 src/layout/navBars/topBar/setings.vue | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index eec7b04..780d599 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,7 +65,7 @@ const getGlobalI18n = computed(() => {
 let link: any = document.querySelector("link[rel*='icon']") || document.createElement("link");
 link.type = "image/x-icon";
 link.rel = "shortcut icon";
-link.href = themeConfig.logoMini||logoMini;
+link.href = themeConfig.value.logoMini||logoMini;
 document.getElementsByTagName("head")[0].appendChild(link);
 
 // 设置初始化，防止刷新时恢复默认
diff --git a/src/layout/navBars/topBar/setings.vue b/src/layout/navBars/topBar/setings.vue
index 74289a8..f4c8aed 100644
--- a/src/layout/navBars/topBar/setings.vue
+++ b/src/layout/navBars/topBar/setings.vue
@@ -307,7 +307,7 @@
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.logoSetting') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 						<el-upload ref="uploadRef" action="#" :limit="1" :auto-upload="false" @change="onWartermarkLogoUpload" :on-preview="handlePreview"
-						:file-list="getThemeConfig.logoMini?[{name:getThemeConfig.globalTitle,url:getThemeConfig.logoMini}]:[]" accept='image/*'>
+						:file-list="getThemeConfig.logoMini?[{name:getThemeConfig.globalTitle,url:getThemeConfig.logoMini}]:[]" accept='image/*' :on-remove="handleRemove">
     						<template #default>
 								<el-button v-if="!getThemeConfig.logoMini" class="logo-picture" type="text">上传文件</el-button>
     						</template>
@@ -475,6 +475,7 @@ import commonFunction from '/@/utils/commonFunction';
 import other from '/@/utils/other';
 import mittBus from '/@/utils/mitt';
 import { articleApi } from '/@/api/article';
+import logoMini from '/@/assets/logo-mini.svg';
 
 // 定义变量内容
 const { locale } = useI18n();
@@ -639,13 +640,24 @@ const dialogVisible = ref(false);
 const handlePreview: UploadProps['onPreview'] = (uploadFile) =>{
 	dialogVisible.value = true;
 };
+const handleRemove: UploadProps['onRemove'] = (file, uploadFiles) => {
+	// onWartermarkLogoMiniInput('/src/assets/logo-mini.svg');
+	onWartermarkLogoMiniInput('');
+	uploadRef.value.clearFiles();
+}
 // 封面基本路径
 const viteUrl = import.meta.env.VITE_API_URL;
 // 8、界面显示 --> logo设置
 const onWartermarkLogoMiniInput = (val: string) => {
 	getThemeConfig.value.logoMini = verifyAndSpace(val);
-	if (getThemeConfig.value.logoMini === '') return false;
+	// if (getThemeConfig.value.logoMini === '') return false;
 	if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.logoMini);
+	// 设置网站图标
+	let link: any = document.querySelector("link[rel*='icon']") || document.createElement("link");
+	link.type = "image/x-icon";
+	link.rel = "shortcut icon";
+	link.href = themeConfig.value.logoMini||logoMini;
+	document.getElementsByTagName("head")[0].appendChild(link);
 	setLocalThemeConfig();
 };
 // 8、界面显示 --> logo上传
@@ -917,4 +929,8 @@ defineExpose({
 	justify-content: center;
 	padding: 8px 15px 0;
 }
+:deep(.el-upload-list__item){
+	margin-top: -20px;
+	width: 100px;
+}
 </style>