From e26d3f022e260e62d1b2f683b86ccc9070336e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Sat, 23 Nov 2024 14:56:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=92=8C?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/color-text-size-group/index.vue | 4 +- .../common/mult-color-picker/index.vue | 6 +- src/components/model-article-list/index.vue | 25 +++++- .../model-article-list-content.vue | 15 ++++ .../model-article-list-styles.vue | 21 ++++- .../model-article-tabs-content.vue | 15 ++++ .../model-article-tabs-styles.vue | 20 ++++- .../components/carousel/product-list-show.vue | 67 +++++++++------- .../magic-cube-settings/tabs-styles.vue | 60 ++++++++++++-- src/components/model-data-magic/index.vue | 3 + .../model-data-magic-content.vue | 30 +++++++ src/components/model-goods-list/index.vue | 27 +++---- .../model-goods-list-styles.vue | 79 ++++++++++++------- .../model-goods-tabs-styles.vue | 74 +++++++++++------ src/config/const/article-list.ts | 32 +++++++- src/config/const/article-tabs.ts | 32 +++++++- src/config/const/goods-list.ts | 12 +++ src/config/const/goods-tabs.ts | 12 +++ 18 files changed, 419 insertions(+), 115 deletions(-) diff --git a/src/components/common/color-text-size-group/index.vue b/src/components/common/color-text-size-group/index.vue index efc7da75..5083ef16 100644 --- a/src/components/common/color-text-size-group/index.vue +++ b/src/components/common/color-text-size-group/index.vue @@ -4,7 +4,7 @@ {{ item.name }} - + @@ -17,11 +17,13 @@ interface Props { defaultColor?: string; typeList?: string[]; // 默认显示3个,传递了之后按照传递的显示 sliderName?: string; + labelWidth?: number; } const props = withDefaults(defineProps(), { defaultColor: '', typeList: () => ['color', 'typeface', 'size'], sliderName: '字号', + labelWidth: 40, }); const color = defineModel('color', { type: String, diff --git a/src/components/common/mult-color-picker/index.vue b/src/components/common/mult-color-picker/index.vue index 1a4fa621..1749d171 100644 --- a/src/components/common/mult-color-picker/index.vue +++ b/src/components/common/mult-color-picker/index.vue @@ -10,7 +10,7 @@ - + % @@ -46,6 +46,10 @@ const props = defineProps({ ['']; }, }, + isShowAlpha: { + type: Boolean, + default: false, + }, }); const direction_type = ref(props.type); let state = reactive({ diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue index 6f69e314..164a9b99 100644 --- a/src/components/model-article-list/index.vue +++ b/src/components/model-article-list/index.vue @@ -46,15 +46,18 @@ + + {{ !isEmpty(item.new_title) ? item.new_title : item.data.title }} + - + - {{ !isEmpty(item.new_title) ? item.new_title : item.data.title }} + {{ !isEmpty(item.new_title) ? item.new_title : item.data.title }} {{ item.data.describe || '' }} - + {{ field_show.includes('0') ? (!is_obj_empty(item.data) ? item.data.add_time : '2020-06-05 15:20') : '' }} @@ -73,7 +76,7 @@