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({ +const defaultFooterNav: DefaultFooterNav = { content: { nav_style: '0', nav_type: '0', @@ -65,6 +65,6 @@ const defaultFooterNav = ref({ 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; };