From d3af6622679dc97903a34051585d5197b9013d97 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 30 Mar 2023 20:24:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#11249=E3=80=8111247=E3=80=8110637?=
 =?UTF-8?q?=E3=80=8111250?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Layout/BasicLayoutPage.vue | 12 +++++++++---
 src/views/system/Basis/index.vue          |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index fb83774c..97d0ae30 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -56,15 +56,21 @@ const system = useSystem();
 const {configInfo} = storeToRefs(system);
 
 const layoutConf = reactive({
-    theme: configInfo.value.front?.headerTheme || DefaultSetting.layout.theme,
+    theme: DefaultSetting.layout.theme,
     siderWidth: DefaultSetting.layout.siderWidth,
-    logo: configInfo.value.front?.logo || DefaultSetting.layout.logo,
-    title: configInfo.value.front?.title || DefaultSetting.layout.title,
+    logo: DefaultSetting.layout.logo,
+    title: DefaultSetting.layout.title,
     menuData: [...clearMenuItem(menu.siderMenus), AccountMenu],
     // menuData: menu.siderMenus,
     splitMenus: true,
 });
 
+watchEffect(() => {
+    layoutConf.theme = configInfo.value.front?.headerTheme || DefaultSetting.layout.theme;
+    layoutConf.title = configInfo.value.front?.title || DefaultSetting.layout.title;
+    layoutConf.logo = configInfo.value.front?.logo || DefaultSetting.layout.logo;
+})
+
 const state = reactive<StateType>({
     pure: false,
     collapsed: false, // default value
diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue
index 8561c46b..9424caa3 100644
--- a/src/views/system/Basis/index.vue
+++ b/src/views/system/Basis/index.vue
@@ -59,7 +59,7 @@
                                 </template>
                                 <j-input
                                     v-model:value="formValue['base-path']"
-                                    placeholder="请输入高德API Key"
+                                    placeholder="输入base-path"
                                 />
                             </j-form-item>
                             <j-row :gutter="24" :span="24">
@@ -455,7 +455,7 @@ const uploader: uploaderType = {
     },
     // 浏览器页签格式校验
     beforeIconUpload: (file) => {
-        const typeBool = file.type.includes('.icon');
+        const typeBool = file.type.includes('x-icon');
         const sizeBool = file.size / 1024 / 1024 < 1;
         if (!typeBool) {
             message.error(`请上传ico格式的图片`);