diff --git a/src/components/common/data-tabs-common/article/article-style.vue b/src/components/common/data-tabs-common/article/article-style.vue new file mode 100644 index 00000000..22a99b59 --- /dev/null +++ b/src/components/common/data-tabs-common/article/article-style.vue @@ -0,0 +1,44 @@ + + + + + \ No newline at end of file diff --git a/src/components/common/data-tabs-common/article/data-article-content.vue b/src/components/common/data-tabs-common/article/data-article-content.vue new file mode 100644 index 00000000..582a7c48 --- /dev/null +++ b/src/components/common/data-tabs-common/article/data-article-content.vue @@ -0,0 +1,195 @@ + + + \ No newline at end of file diff --git a/src/components/common/data-tabs-common/custom/custom-content.vue b/src/components/common/data-tabs-common/custom/custom-content.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/components/common/data-tabs-common/custom/custom-style.vue b/src/components/common/data-tabs-common/custom/custom-style.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/components/common/data-tabs-common/goods/goods-content.vue b/src/components/common/data-tabs-common/goods/data-goods-content.vue similarity index 78% rename from src/components/common/data-tabs-common/goods/goods-content.vue rename to src/components/common/data-tabs-common/goods/data-goods-content.vue index d130fe4f..90e658bb 100644 --- a/src/components/common/data-tabs-common/goods/goods-content.vue +++ b/src/components/common/data-tabs-common/goods/data-goods-content.vue @@ -1,31 +1,29 @@ @@ -50,6 +48,7 @@ const props = defineProps({ }), }, }); + const base_list = reactive({ product_style_list: [ { name: '单列展示', value: '0', width: 110, height: 120 }, @@ -117,7 +116,6 @@ const change_style = (val: any): void => { styles.value.content_img_width = list[0].width; styles.value.content_img_height = list[0].height; } - console.log(styles.value); }; const url_value_multiple_bool = ref(true); const data_list_replace_index = ref(0); diff --git a/src/components/common/data-tabs-common/goods/goods-style.vue b/src/components/common/data-tabs-common/goods/data-goods-style.vue similarity index 100% rename from src/components/common/data-tabs-common/goods/goods-style.vue rename to src/components/common/data-tabs-common/goods/data-goods-style.vue diff --git a/src/components/model-article-list/model-article-list-content.vue b/src/components/model-article-list/model-article-list-content.vue index 8a6dcf9a..da83a78b 100644 --- a/src/components/model-article-list/model-article-list-content.vue +++ b/src/components/model-article-list/model-article-list-content.vue @@ -155,7 +155,9 @@ const theme_change = (val: any) => { // 切换风格时，将对应图片的默认值宽度和高度赋值 const list = base_list.theme_list.filter(item => item.value == form.value.theme); if (list.length > 0) { - emits('theme_change', list[0].width, list[0].height); + // emits('theme_change', list[0].width, list[0].height); + data.value.content_img_width = list[0].width; + data.value.content_img_height = list[0].height; } }; // 移除 diff --git a/src/components/model-article-list/model-article-list-setting.vue b/src/components/model-article-list/model-article-list-setting.vue index 5db382da..011b996e 100644 --- a/src/components/model-article-list/model-article-list-setting.vue +++ b/src/components/model-article-list/model-article-list-setting.vue @@ -1,7 +1,7 @@ diff --git a/src/components/model-custom/index.vue b/src/components/model-custom/index.vue index a106a9e5..60c6d698 100644 --- a/src/components/model-custom/index.vue +++ b/src/components/model-custom/index.vue @@ -78,6 +78,10 @@ const props = defineProps({ return {}; }, }, + isCommonStyle: { + type: Boolean, + default: true, + }, outerContainerPadding: { type: Number, default: 0, @@ -131,8 +135,8 @@ watchEffect(() => { }); //#endregion // 公共样式 -const style_container = computed(() => common_styles_computer(new_style.value.common_style)); -const style_img_container = computed(() => common_img_computer(new_style.value.common_style)); +const style_container = computed(() => props.isCommonStyle ? common_styles_computer(new_style.value.common_style) : ''); +const style_img_container = computed(() => props.isCommonStyle ? common_img_computer(new_style.value.common_style) : ''); // 内容样式 const style_content_container = computed(() => common_styles_computer(new_style.value.data_content_style)); const style_content_img_container = computed(() => common_img_computer(new_style.value.data_content_style)); diff --git a/src/components/model-data-tabs/index.vue b/src/components/model-data-tabs/index.vue index 14b0bc7d..b5ec6ee1 100644 --- a/src/components/model-data-tabs/index.vue +++ b/src/components/model-data-tabs/index.vue @@ -11,6 +11,12 @@ + + @@ -68,17 +74,13 @@ watch( // 显示的数据处理 const tabs_data_list = new_data.content.tabs_list[tabs_active_index.value] || {}; tabs_data_type.value = tabs_data_list?.tabs_data_type || ''; - console.log(tabs_data_list); if (tabs_data_list.tabs_data_type === 'goods') { tabs_list.value = tabs_data_list.goods_config; } else if (tabs_data_list.tabs_data_type === 'article') { - tabs_list.value = tabs_data_list.goods_config; + tabs_list.value = tabs_data_list.article_config; } else if (tabs_data_list.tabs_data_type === 'custom') { - tabs_list.value = tabs_data_list.goods_config; + tabs_list.value = tabs_data_list.custom_config; } - console.log( - tabs_list.value - ); // 公共样式 style_container.value += common_styles_computer(new_style.common_style); style_img_container.value = common_img_computer(new_style.common_style) + `gap: ${new_style.shop_content_spacing}px;`; diff --git a/src/components/model-data-tabs/model-data-tabs-content.vue b/src/components/model-data-tabs/model-data-tabs-content.vue index e0897413..a099781f 100644 --- a/src/components/model-data-tabs/model-data-tabs-content.vue +++ b/src/components/model-data-tabs/model-data-tabs-content.vue @@ -59,25 +59,25 @@ -
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
diff --git a/src/components/model-goods-list/index.vue b/src/components/model-goods-list/index.vue index 5188ea00..ed87578e 100644 --- a/src/components/model-goods-list/index.vue +++ b/src/components/model-goods-list/index.vue @@ -458,21 +458,8 @@ const icon_style = (item: { bg_color: string; color: string; br_color: string }) return style; }; // 公共样式 -const style_container = computed(() => { - if (props.isCommonStyle) { - return common_styles_computer(new_style.value.common_style); - } else { - return ''; - } -}); - -const style_img_container = computed(() => { - if (props.isCommonStyle) { - return common_img_computer(new_style.value.common_style); - } else { - return ''; - } -}); +const style_container = computed(() => props.isCommonStyle ? common_styles_computer(new_style.value.common_style) : ''); +const style_img_container = computed(() => props.isCommonStyle ? common_img_computer(new_style.value.common_style) : ''); // 不换行显示 const multicolumn_columns_width = computed(() => { const { carousel_col } = toRefs(form.value); diff --git a/src/components/model-goods-list/model-goods-list-content.vue b/src/components/model-goods-list/model-goods-list-content.vue index 21444fd4..491f841d 100644 --- a/src/components/model-goods-list/model-goods-list-content.vue +++ b/src/components/model-goods-list/model-goods-list-content.vue @@ -168,7 +168,9 @@ const change_style = (val: string | number | boolean | undefined): void => { // 切换风格时，将对应图片的默认值宽度和高度赋值 const list = base_list.product_style_list.filter(item => item.value == form.value.theme); if (list.length > 0) { - emits('theme_change', list[0].width, list[0].height); + // emits('theme_change', list[0].width, list[0].height); + data.value.shop_img_width = list[0].width; + data.value.shop_img_height = list[0].height; } }; const is_revise = ref(false); diff --git a/src/components/model-goods-list/model-goods-list-setting.vue b/src/components/model-goods-list/model-goods-list-setting.vue index 6231ae80..ef3486b3 100644 --- a/src/components/model-goods-list/model-goods-list-setting.vue +++ b/src/components/model-goods-list/model-goods-list-setting.vue @@ -1,7 +1,7 @@