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/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 3c48d48f..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,6 +4,10 @@
选项卡样式
+
+ 样式一
+ 样式二
+
@@ -90,6 +94,10 @@ const props = defineProps({
img_radius_1: 0,
}),
},
+ tabsStyle: {
+ type: String,
+ default: '',
+ },
});
// 默认值
const state = reactive({
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 @@
-
+