From f403c069d79fc7517dbb518a10a476e65910e9fd Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Sat, 12 Oct 2024 18:31:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E9=80=89=E9=A1=B9=E5=8D=A1=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A3=8E=E6=A0=BC1=E7=9A=84=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model-article-tabs-styles.vue | 4 ++++ .../model-goods-tabs-styles.vue | 4 ++++ .../model-tabs/model-tabs-styles.vue | 4 ++++ src/config/const/article-tabs.ts | 2 ++ src/config/const/goods-tabs.ts | 2 ++ src/config/const/tabs-carousel.ts | 18 ++++++++++-------- src/config/const/tabs.ts | 2 ++ 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue index 3c48d48f..1d813fe3 100644 --- a/src/components/model-article-tabs/model-article-tabs-styles.vue +++ b/src/components/model-article-tabs/model-article-tabs-styles.vue @@ -4,6 +4,10 @@
选项卡样式
+ + 样式一 + 样式二 + diff --git a/src/components/model-goods-tabs/model-goods-tabs-styles.vue b/src/components/model-goods-tabs/model-goods-tabs-styles.vue index 9e9cbc4b..b009f930 100644 --- a/src/components/model-goods-tabs/model-goods-tabs-styles.vue +++ b/src/components/model-goods-tabs/model-goods-tabs-styles.vue @@ -4,6 +4,10 @@
选项卡样式
+ + 样式一 + 样式二 + diff --git a/src/components/model-tabs/model-tabs-styles.vue b/src/components/model-tabs/model-tabs-styles.vue index 321eb29b..235cb4b0 100644 --- a/src/components/model-tabs/model-tabs-styles.vue +++ b/src/components/model-tabs/model-tabs-styles.vue @@ -4,6 +4,10 @@
选项卡样式
+ + 样式一 + 样式二 + diff --git a/src/config/const/article-tabs.ts b/src/config/const/article-tabs.ts index d492ef63..1227c01f 100644 --- a/src/config/const/article-tabs.ts +++ b/src/config/const/article-tabs.ts @@ -31,6 +31,7 @@ interface DefaultArticleTabs { field_show: string[]; }; style: { + tabs_one_theme: string; tabs_checked: color_list[]; tabs_direction: string; tabs_weight_checked: string; @@ -78,6 +79,7 @@ const defaultArticleTabs: DefaultArticleTabs = { field_show: ['0', '1'], }, style: { + tabs_one_theme: '0', tabs_checked: [ { color: '#FF2222', color_percentage: undefined }, { color: '#FF9898', color_percentage: undefined }, diff --git a/src/config/const/goods-tabs.ts b/src/config/const/goods-tabs.ts index 41d188e6..9add5985 100644 --- a/src/config/const/goods-tabs.ts +++ b/src/config/const/goods-tabs.ts @@ -36,6 +36,7 @@ interface DefaultProductList { shop_button_size: string; }; style: { + tabs_one_theme: string; tabs_checked: color_list[]; tabs_direction: string; tabs_weight_checked: string; @@ -98,6 +99,7 @@ const defaultProductList: DefaultProductList = { shop_button_size: '1', }, style: { + tabs_one_theme: '0', tabs_checked: [ { color: '#FF2222', color_percentage: undefined }, { color: '#FF9898', color_percentage: undefined }, diff --git a/src/config/const/tabs-carousel.ts b/src/config/const/tabs-carousel.ts index ef7e47a2..679e7c2e 100644 --- a/src/config/const/tabs-carousel.ts +++ b/src/config/const/tabs-carousel.ts @@ -24,11 +24,12 @@ interface defaultTabs { tabs_list: tabs_page[]; carousel_type: string; carousel_list: carousel_list[]; - img_fit: string, + img_fit: string; is_roll: string; interval_time: number; }; style: { + tabs_one_theme: string; tabs_checked: color_list[]; tabs_direction: string; tabs_weight_checked: string; @@ -48,8 +49,8 @@ interface defaultTabs { radius_bottom_left: number; radius_bottom_right: number; is_show: string; - height: number, - image_spacing: number, + height: number; + image_spacing: number; indicator_style: string; indicator_location: string; indicator_size: number; @@ -92,23 +93,24 @@ const defaultTabs: defaultTabs = { carousel_img: [], carousel_video: [], carousel_link: {}, - video_title: '视频名称' + video_title: '视频名称', }, { carousel_img: [], carousel_video: [], carousel_link: {}, - video_title: '视频名称' + video_title: '视频名称', }, { carousel_img: [], carousel_video: [], carousel_link: {}, - video_title: '视频名称' - } - ] + video_title: '视频名称', + }, + ], }, style: { + tabs_one_theme: '0', tabs_checked: [ { color: '#FF2222', color_percentage: undefined }, { color: '#FF9898', color_percentage: undefined }, diff --git a/src/config/const/tabs.ts b/src/config/const/tabs.ts index 013e3e0f..cbbf6f6e 100644 --- a/src/config/const/tabs.ts +++ b/src/config/const/tabs.ts @@ -18,6 +18,7 @@ interface defaultTabs { tabs_list: tabs_page[]; }; style: { + tabs_one_theme: string; tabs_checked: color_list[]; tabs_direction: string; tabs_weight_checked: string; @@ -45,6 +46,7 @@ const defaultTabs: defaultTabs = { ], }, style: { + tabs_one_theme: '0', tabs_checked: [ { color: '#FF2222', color_percentage: undefined }, { color: '#FF9898', color_percentage: undefined }, From f47594a41558d1a5fa00f475d4153286f41590b8 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Tue, 15 Oct 2024 10:29:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E9=80=89=E9=A1=B9=E5=8D=A1=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A3=8E=E6=A0=BC1=E7=9A=84=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/tabs-view/index.vue | 15 ++++++++++++++- .../model-article-tabs-setting.vue | 2 +- .../model-article-tabs-styles.vue | 6 +++++- .../model-goods-tabs/model-goods-tabs-setting.vue | 2 +- .../model-goods-tabs/model-goods-tabs-styles.vue | 9 +++++++-- .../model-tabs-carousel-setting.vue | 5 ++--- .../model-tabs-carousel-styles.vue | 10 +++++++--- src/components/model-tabs/model-tabs-setting.vue | 5 ++--- src/components/model-tabs/model-tabs-styles.vue | 11 ++++++++++- 9 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/components/common/tabs-view/index.vue b/src/components/common/tabs-view/index.vue index 94063b6b..4ce63b29 100644 --- a/src/components/common/tabs-view/index.vue +++ b/src/components/common/tabs-view/index.vue @@ -12,7 +12,7 @@
{{ item.title }}
{{ item.desc }}
-
+
@@ -61,6 +61,10 @@ const tabs_theme = computed(() => { } return tabs_theme; }); +const tabs_bottom_line_theme = computed(() => { + return new_style.value.tabs_one_theme == '1' ? 'tabs-bottom-line-theme' : ''; +}); + // 选中的背景渐变色样式 const tabs_check = computed(() => { const new_gradient_params = { @@ -152,6 +156,15 @@ const icon_tabs_check = () => { display: block; } } + .tabs-bottom-line-theme { + opacity: 0.6; + bottom: 0.8rem; + z-index: 0; + height: 0.7rem; + border-radius: 0; + width: 76%; + left: 12%; + } } &.tabs-style-2 { &.active { diff --git a/src/components/model-article-tabs/model-article-tabs-setting.vue b/src/components/model-article-tabs/model-article-tabs-setting.vue index 95475382..f774bf00 100644 --- a/src/components/model-article-tabs/model-article-tabs-setting.vue +++ b/src/components/model-article-tabs/model-article-tabs-setting.vue @@ -4,7 +4,7 @@ diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue index 1d813fe3..227d954d 100644 --- a/src/components/model-article-tabs/model-article-tabs-styles.vue +++ b/src/components/model-article-tabs/model-article-tabs-styles.vue @@ -4,7 +4,7 @@
选项卡样式
- + 样式一 样式二 @@ -94,6 +94,10 @@ const props = defineProps({ img_radius_1: 0, }), }, + tabsStyle: { + type: String, + default: '', + }, }); // 默认值 const state = reactive({ diff --git a/src/components/model-goods-tabs/model-goods-tabs-setting.vue b/src/components/model-goods-tabs/model-goods-tabs-setting.vue index 3a505d79..03b8238a 100644 --- a/src/components/model-goods-tabs/model-goods-tabs-setting.vue +++ b/src/components/model-goods-tabs/model-goods-tabs-setting.vue @@ -4,7 +4,7 @@ diff --git a/src/components/model-goods-tabs/model-goods-tabs-styles.vue b/src/components/model-goods-tabs/model-goods-tabs-styles.vue index b009f930..aab4dd0a 100644 --- a/src/components/model-goods-tabs/model-goods-tabs-styles.vue +++ b/src/components/model-goods-tabs/model-goods-tabs-styles.vue @@ -4,7 +4,7 @@
选项卡样式
- + 样式一 样式二 @@ -68,7 +68,7 @@
轮播设置
- + @@ -115,6 +115,11 @@ const props = defineProps({ img_radius_1: 0, }), }, + // 选项卡的风格 + tabsStyle: { + type: String, + default: '', + }, }); // 默认值 diff --git a/src/components/model-tabs-carousel/model-tabs-carousel-setting.vue b/src/components/model-tabs-carousel/model-tabs-carousel-setting.vue index 6d0b0348..96602857 100644 --- a/src/components/model-tabs-carousel/model-tabs-carousel-setting.vue +++ b/src/components/model-tabs-carousel/model-tabs-carousel-setting.vue @@ -4,7 +4,7 @@ @@ -20,5 +20,4 @@ const props = defineProps({ }, }); - + diff --git a/src/components/model-tabs-carousel/model-tabs-carousel-styles.vue b/src/components/model-tabs-carousel/model-tabs-carousel-styles.vue index 173bb7f5..bfecee3a 100644 --- a/src/components/model-tabs-carousel/model-tabs-carousel-styles.vue +++ b/src/components/model-tabs-carousel/model-tabs-carousel-styles.vue @@ -2,7 +2,7 @@
- + @@ -31,7 +31,11 @@ const props = defineProps({ content: { type: Object, default: () => {}, - } + }, + tabsStyle: { + type: String, + default: () => {}, + }, }); const state = reactive({ @@ -59,7 +63,7 @@ const common_styles_update = (val: Object) => { width: 10rem; font-size: 1.4rem; } - .el-tabs__active-bar{ + .el-tabs__active-bar { width: 100%; } } diff --git a/src/components/model-tabs/model-tabs-setting.vue b/src/components/model-tabs/model-tabs-setting.vue index f68cc4c2..d36ee28d 100644 --- a/src/components/model-tabs/model-tabs-setting.vue +++ b/src/components/model-tabs/model-tabs-setting.vue @@ -4,7 +4,7 @@
@@ -20,5 +20,4 @@ const props = defineProps({ }, }); - + diff --git a/src/components/model-tabs/model-tabs-styles.vue b/src/components/model-tabs/model-tabs-styles.vue index 235cb4b0..47018729 100644 --- a/src/components/model-tabs/model-tabs-styles.vue +++ b/src/components/model-tabs/model-tabs-styles.vue @@ -4,7 +4,7 @@
选项卡样式
- + 样式一 样式二 @@ -50,6 +50,10 @@ const props = defineProps({ type: Boolean, default: true, }, + tabsStyle: { + type: String, + default: '', + }, }); const state = reactive({ @@ -60,6 +64,11 @@ const { form } = toRefs(state); const common_styles_update = (val: Object) => { form.value.common_style = val; }; +// 选项卡选中主题1时的主题选择事件 +const tabs_one_theme_event = (val: any) => { + +}; +// 选项卡选中 const tabs_checked_event = (arry: string[], type: number) => { form.value.tabs_checked = arry; form.value.tabs_direction = type.toString(); From 5b08e6c4379ecb702b1e1c208fb445c6ccc8e19a Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Tue, 15 Oct 2024 11:06:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E5=AD=97=E5=8F=B7=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=90=8D=E5=AD=97=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/color-text-size-group/index.vue | 13 +++++++------ .../model-goods-list/model-goods-list-styles.vue | 4 ++-- .../model-goods-tabs/model-goods-tabs-styles.vue | 4 ++-- .../model-seckill/model-seckill-styles.vue | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/components/common/color-text-size-group/index.vue b/src/components/common/color-text-size-group/index.vue index 3f114aa7..b8b6fbf5 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 }} - + @@ -14,22 +14,24 @@ interface Props { defaultColor?: string; typeList?: string[]; // 默认显示3个,传递了之后按照传递的显示 + sliderName?: string; } const props = withDefaults(defineProps(), { defaultColor: '', typeList: () => ['color', 'typeface', 'size'], + sliderName: '字号', }); const color = defineModel('color', { type: String, - default: '' + default: '', }); const typeface = defineModel('typeface', { type: String, - default: '400' + default: '400', }); const size = defineModel('size', { type: Number, - default: 15 + default: 15, }); const font_weight = [ @@ -38,5 +40,4 @@ const font_weight = [ ]; - \ No newline at end of file + diff --git a/src/components/model-goods-list/model-goods-list-styles.vue b/src/components/model-goods-list/model-goods-list-styles.vue index c47f1157..478ceee3 100644 --- a/src/components/model-goods-list/model-goods-list-styles.vue +++ b/src/components/model-goods-list/model-goods-list-styles.vue @@ -11,7 +11,7 @@