From a1aa2165be79472cf13f210633b493f2a8915e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Fri, 11 Oct 2024 10:56:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/tabs-styles.vue | 10 +++++++++ src/components/model-data-magic/index.vue | 11 +++------- src/components/page-settings/index.vue | 2 +- src/components/page-settings/page-styles.vue | 5 +++-- src/views/layout/index.vue | 22 ++++++++++++++++++- 5 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/components/model-data-magic/components/tabs-styles.vue b/src/components/model-data-magic/components/tabs-styles.vue index cdad8d91..d1dc7179 100644 --- a/src/components/model-data-magic/components/tabs-styles.vue +++ b/src/components/model-data-magic/components/tabs-styles.vue @@ -40,6 +40,16 @@
+ +
商品样式
+ + + + + + + +
diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue index 20bd246c..5888177f 100644 --- a/src/components/model-data-magic/index.vue +++ b/src/components/model-data-magic/index.vue @@ -239,12 +239,7 @@ const commodity_list = (list: any[], num: number) => { return [{ split_list: Array(num).fill(default_list)}]; } } -const background_style = (item: any) => { - return gradient_computer(item); -}; -const background_img_style = (item: any) => { - return background_computer(item); -}; + const old_list = ref({}); const data_magic_list = ref([]); watch(props.value.content, (val) => { @@ -257,8 +252,8 @@ watch(props.value.content, (val) => { item.actived_index = 0; // 指示器样式 data_style.indicator_styles = indicator_style(data_style); - data_style.background_style = background_style(data_style); - data_style.background_img_style = background_img_style(data_style); + data_style.background_style = gradient_computer(data_style); + data_style.background_img_style = background_computer(data_style); const { is_roll, rotation_direction, interval_time } = data_style; const { goods_list, images_list } = data_content; diff --git a/src/components/page-settings/index.vue b/src/components/page-settings/index.vue index 3aff0ba1..a2f15036 100644 --- a/src/components/page-settings/index.vue +++ b/src/components/page-settings/index.vue @@ -107,7 +107,7 @@ const up_slide_style = computed(() => { const up_slide_img_style = computed(() => { let style = ``; if (props.scollTop > 0) { - const { up_slide_background_img, up_slide_background_img_style } = new_style.value; + const { up_slide_background_img = '', up_slide_background_img_style = '' } = new_style.value; // 背景图 const back = { background_img: up_slide_background_img, background_img_style: up_slide_background_img_style }; style += background_computer(back); diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue index ef56b519..97c53a46 100644 --- a/src/components/page-settings/page-styles.vue +++ b/src/components/page-settings/page-styles.vue @@ -19,7 +19,7 @@
- + 黑色 白色 @@ -41,7 +41,7 @@
- +
背景图
@@ -103,6 +103,7 @@ const state = reactive({ }); // 如果需要解构，确保使用toRefs const { form, search_content } = toRefs(state); +console.log(form); const header_background_type_change_event = (val: any) => { if (val === 'color_image') { diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 686b090f..548c3845 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -133,7 +133,14 @@ const init = () => { if (get_id()) { DiyAPI.getInit({ id: get_id() }).then((res: any) => { if (res.data) { - form.value = form_data_transfor_diy_data(res.data); + let data = form_data_transfor_diy_data(res.data); + // 默认数据合并 + data.header.com_data = default_merge(data.header.com_data, 'header_nav'); + data.footer.com_data = default_merge(data.footer.com_data, 'footer_nav'); + data.diy_data = data_merge(data.diy_data); + data.tabs_data = data_merge(data.tabs_data); + + form.value = data; } else { is_empty.value = true; } @@ -146,6 +153,19 @@ const init = () => { loading_event(); } }; +// 数据合并 +const data_merge = (list: string[]) => { + list.forEach((item: any) => { + item.com_data = default_merge(item.com_data, item.key);; + }); + return list; +}; +// 浅层数据合并 +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); + return data; +}; // 初始化公共数据 const common_init = () => { From b78301365032a255a2cebfded90e942a96f2cc8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Fri, 11 Oct 2024 12:00:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/custom-module/model-text/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/custom-module/model-text/index.vue b/src/components/common/custom-module/model-text/index.vue index 34239060..2d2f03b5 100644 --- a/src/components/common/custom-module/model-text/index.vue +++ b/src/components/common/custom-module/model-text/index.vue @@ -47,7 +47,7 @@ const text_title = computed(() => { }); const text_style = computed(() => { - let style = `font-size: ${ form.text_size }px;color: ${ form.text_color }; text-align: ${ form.text_location }; transform: rotate(${form.text_rotate}deg);text-decoration: ${ form.text_option };${ padding_computer(form.text_padding) };`; + let style = `font-size: ${ form.text_size }px;line-height: ${ form.text_size }px;color: ${ form.text_color }; text-align: ${ form.text_location }; transform: rotate(${form.text_rotate}deg);text-decoration: ${ form.text_option };${ padding_computer(form.text_padding) };`; if (form.text_weight == 'italic') { style += `font-style: italic`; } else if (form.text_weight == '500') { From 54ded86b271e5d15f0701f6ff7d03849655c804b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Fri, 11 Oct 2024 14:22:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=AD=94=E6=96=B9=E7=9A=84=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/magic-carousel.vue | 13 +++---- .../components/product-list-show.vue | 34 +++++++------------ .../components/tabs-styles.vue | 6 ++-- src/components/model-data-magic/index.vue | 14 +++++--- .../model-data-magic-content.vue | 6 ++++ src/views/layout/components/main/index.vue | 5 ++- 6 files changed, 43 insertions(+), 35 deletions(-) diff --git a/src/components/model-data-magic/components/magic-carousel.vue b/src/components/model-data-magic/components/magic-carousel.vue index b6d2b710..e3df2977 100644 --- a/src/components/model-data-magic/components/magic-carousel.vue +++ b/src/components/model-data-magic/components/magic-carousel.vue @@ -5,7 +5,7 @@ @@ -17,18 +17,19 @@ interface Props { contentImgRadius: string; type: string; actived: number; + goodStyle?: any; } -const props = defineProps(); +const props = withDefaults(defineProps(), { + goodStyle: {}, +}); + +const form = computed(() => props.value); -const form = ref(props.value); const emits = defineEmits(['carousel_change']); const carousel_change = (index: number) => { emits('carousel_change', index); }; -watchEffect(() => { - form.value = props.value; -}); \ No newline at end of file diff --git a/src/components/model-data-magic/components/tabs-styles.vue b/src/components/model-data-magic/components/tabs-styles.vue index d1dc7179..1a2af617 100644 --- a/src/components/model-data-magic/components/tabs-styles.vue +++ b/src/components/model-data-magic/components/tabs-styles.vue @@ -40,13 +40,13 @@
- +
商品样式
- + - +
diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue index 5888177f..52c5207a 100644 --- a/src/components/model-data-magic/index.vue +++ b/src/components/model-data-magic/index.vue @@ -6,7 +6,7 @@