diff --git a/src/components/model-notice/index.vue b/src/components/model-notice/index.vue
index 57171889..d044f147 100644
--- a/src/components/model-notice/index.vue
+++ b/src/components/model-notice/index.vue
@@ -13,12 +13,12 @@
- {{ form.title || '公告' }}
+ {{ form.title }}
- {{ item.notice_title }}
+ {{ item.notice_title }}
-
+ {{ form.right_title }}
@@ -35,9 +35,9 @@
- {{ form.title || '公告' }}
+ {{ form.title }}
- 更多
+ {{ form.right_title }}
{{ index + 1 }}
@@ -182,7 +182,7 @@ watchEffect(() => {
line-height: 4.4rem;
overflow: hidden;
text-overflow: ellipsis;
- white-space: nowrap;
+ // white-space: nowrap;
}
}
}
diff --git a/src/components/model-notice/model-notice-content.vue b/src/components/model-notice/model-notice-content.vue
index 724b354d..7a83509f 100644
--- a/src/components/model-notice/model-notice-content.vue
+++ b/src/components/model-notice/model-notice-content.vue
@@ -43,9 +43,14 @@
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/components/model-notice/model-notice-styles.vue b/src/components/model-notice/model-notice-styles.vue
index 4f371948..5fd79316 100644
--- a/src/components/model-notice/model-notice-styles.vue
+++ b/src/components/model-notice/model-notice-styles.vue
@@ -37,14 +37,21 @@
-
-
-
+
+ 更多设置
+
+
+
+
+
+
+
+
容器设置
diff --git a/src/config/const/notice.ts b/src/config/const/notice.ts
index 24a097c3..4283508f 100644
--- a/src/config/const/notice.ts
+++ b/src/config/const/notice.ts
@@ -15,13 +15,15 @@ interface defaultSearch {
direction: string;
img_src: uploadList[];
icon_class: string;
+ right_title: string;
more_link: object;
interval_time: number;
is_right_button: string;
notice_list: carousel_list[];
};
style: {
- button_color: string;
+ right_button_color: string;
+ right_button_size: number;
news_color: string;
news_typeface: string;
news_size: number;
@@ -50,12 +52,12 @@ const defaultSearch: defaultSearch = {
title_type: 'img-icon',
title: '测试标题',
img_src: [],
-
// 滚动方式
direction: 'vertical',
interval_time: 3,
// 更多配置
is_right_button: '1',
+ right_title: '',
more_link: {},
icon_class: '',
// 公告内容
@@ -92,7 +94,8 @@ const defaultSearch: defaultSearch = {
title_height: 24,
icon_size: 12,
icon_color: '#999',
- button_color: '#999',
+ right_button_color: '#999',
+ right_button_size: 12,
// 容器高度
container_height: 44,
// 容器信息
diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue
index fbf41e46..35ece6ec 100644
--- a/src/views/layout/components/main/index.vue
+++ b/src/views/layout/components/main/index.vue
@@ -165,7 +165,7 @@ const set_padding_top_value = () => {
} else {
if (index === padding_top_index && item.key !== 'float-window') {
item.com_data.style.common_style.padding_top_safe_value = common_store.header_height;
- } else {
+ } else if (item.key !== 'float-window') {
item.com_data.style.common_style.padding_top_safe_value = 0;
}
}