From 2909cc12575c0a141286ea77cb854e021f01a9f3 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 11 Oct 2024 18:40:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/const/footer-nav.ts |  4 ++--
 src/views/layout/index.vue     | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/config/const/footer-nav.ts b/src/config/const/footer-nav.ts
index 3740e7e5..77cc0e1a 100644
--- a/src/config/const/footer-nav.ts
+++ b/src/config/const/footer-nav.ts
@@ -13,7 +13,7 @@ interface DefaultFooterNav {
         common_style: object;
     };
 }
-const defaultFooterNav = ref<DefaultFooterNav>({
+const defaultFooterNav: DefaultFooterNav = {
     content: {
         nav_style: '0',
         nav_type: '0',
@@ -65,6 +65,6 @@ const defaultFooterNav = ref<DefaultFooterNav>({
         default_text_color: 'rgba(0, 0, 0, 1)',
         common_style: { ...defaultCommon, color_list: [{ color: 'rgba(255,255,255,1)', color_percentage: undefined }] },
     },
-});
+};
 
 export default defaultFooterNav;
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 413cc634..e66f15fe 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -162,8 +162,17 @@ const data_merge = (list: string[]) => {
 };
 // 浅层数据合并
 const default_merge = (data: any, key: string) => {
-    data.style = Object.assign({}, cloneDeep((defaultSettings as any)[key.replace(/-/g, '_')]).style, data.style);
-    data.content = Object.assign({}, cloneDeep((defaultSettings as any)[key.replace(/-/g, '_')]), data.content);
+    if (data.style) {
+        data.style = Object.assign({}, cloneDeep((defaultSettings as any)[key.replace(/-/g, '_')]).style, data.style);
+    } else {
+        data.style = cloneDeep((defaultSettings as any)[key.replace(/-/g, '_')]).style;
+    }
+    if (data.content) {
+        data.content = Object.assign({}, cloneDeep((defaultSettings as any)[key.replace(/-/g, '_')]).content, data.content);
+    } else {
+        console.log(data.content);
+        data.content = cloneDeep((defaultSettings as any)[key.replace(/-/g, '_')]).content;
+    }
     return data;
 };