From ede7ead5a3a2a8e51cfac01aebfb59866108b165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Thu, 7 Aug 2025 09:56:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model-tabs-magic/model-tabs-magic-content.vue | 2 +- src/config/const/tabs-magic.ts | 6 +++--- src/views/layout/index.vue | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/model-tabs-magic/model-tabs-magic-content.vue b/src/components/model-tabs-magic/model-tabs-magic-content.vue index 971b203d..6bd23cab 100644 --- a/src/components/model-tabs-magic/model-tabs-magic-content.vue +++ b/src/components/model-tabs-magic/model-tabs-magic-content.vue @@ -205,7 +205,7 @@ const add = () => { micro_page: '', micro_page_list: {}, category_list: {}, - magic_type: 'carousel', + magic_type: '', rotating_background: '0', ...cloneDeep(magic_config), }); diff --git a/src/config/const/tabs-magic.ts b/src/config/const/tabs-magic.ts index b34eb351..e3dda665 100644 --- a/src/config/const/tabs-magic.ts +++ b/src/config/const/tabs-magic.ts @@ -312,7 +312,7 @@ const defaultTabs: defaultTabs = { micro_page: '', micro_page_list: {}, category_list: {}, - magic_type: 'carousel', + magic_type: '', rotating_background: '0', ...cloneDeep(magic_config), }, @@ -329,7 +329,7 @@ const defaultTabs: defaultTabs = { micro_page: '', micro_page_list: {}, category_list: {}, - magic_type: 'carousel', + magic_type: '', rotating_background: '0', ...cloneDeep(magic_config), }, @@ -346,7 +346,7 @@ const defaultTabs: defaultTabs = { micro_page: '', micro_page_list: {}, category_list: {}, - magic_type: 'carousel', + magic_type: '', rotating_background: '0', ...cloneDeep(magic_config), }, diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 487d4705..d535a6fe 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -291,6 +291,7 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false, is_ // 将数据信息合并起来 const new_data_list = cloneDeep([item.com_data.content.home_data, ...item.com_data.content.tabs_list]); // 对整个数据进行处理 + const data_list_handle: any[] = []; new_data_list.forEach((item1: any) => { if (['goods_list', 'article_list'].includes(item1.magic_type)) { // 处理商品或者文章的数据 @@ -299,16 +300,16 @@ const save_formmat_form_data = (data: diy_data_item, close: boolean = false, is_ // 自定义数据处理 custom_data_processing(item1[item1.magic_type].content); } - item1 = Object.keys(item1) + data_list_handle.push(Object.keys(item1) .filter(key => !(all_type.filter((item2: string) => !isEmpty(item1.magic_type) ? (item2 !== item1.magic_type) : item2).includes(key))) .reduce((acc: Record, key: string) => { acc[key] = item1[key]; return acc; - }, {}); + }, {})); }); // 处理完成之后拆分开 - item.com_data.content.home_data = new_data_list.length > 0 ? new_data_list[0] : null; - item.com_data.content.tabs_list = new_data_list.slice(1, new_data_list.length); + item.com_data.content.home_data = data_list_handle.length > 0 ? data_list_handle[0] : null; + item.com_data.content.tabs_list = data_list_handle.slice(1, data_list_handle.length); } return { ...item,