sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev-yxl

v1.0.0
于肖磊 2024-10-11 19:14:41 +08:00
parent a33dd9dd3c 2909cc1257
commit ca47de37d8
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/const/footer-nav.ts
View File

@ -13,7 +13,7 @@ interface DefaultFooterNav {
common_style: object; common_style: object;
}; };
} }
const defaultFooterNav = ref<DefaultFooterNav>({ const defaultFooterNav: DefaultFooterNav = {
content: { content: {
nav_style: '0', nav_style: '0',
nav_type: '0', nav_type: '0',
@ -65,6 +65,6 @@ const defaultFooterNav = ref<DefaultFooterNav>({
default_text_color: 'rgba(0, 0, 0, 1)', default_text_color: 'rgba(0, 0, 0, 1)',
common_style: { ...defaultCommon, color_list: [{ color: 'rgba(255,255,255,1)', color_percentage: undefined }] }, common_style: { ...defaultCommon, color_list: [{ color: 'rgba(255,255,255,1)', color_percentage: undefined }] },
}, },
}); };
export default defaultFooterNav; export default defaultFooterNav;

11
src/views/layout/index.vue
View File

@ -162,8 +162,17 @@ const data_merge = (list: string[]) => {
}; };
// 浅层数据合并 // 浅层数据合并
const default_merge = (data: any, key: string) => { const default_merge = (data: any, key: string) => {
if (data.style) {
data.style = Object.assign({}, cloneDeep((defaultSettings as any)[key.replace(/-/g, '_')]).style, data.style); 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); } 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; return data;
}; };