From 9dc4022bfad192daaa9182c20779fc892d5e6784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 22 Oct 2024 17:51:00 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?=
=?UTF-8?q?=E5=8F=B3=E4=BE=A7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/model-notice/index.vue | 8 ++++----
.../model-notice/model-notice-content.vue | 11 ++++++++---
src/components/model-notice/model-notice-styles.vue | 13 ++++++++++---
src/config/const/notice.ts | 7 ++++---
4 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/components/model-notice/index.vue b/src/components/model-notice/index.vue
index 57171889..cad3ce89 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 }}
-
+ {{ form.right_title }}
@@ -35,9 +35,9 @@
- {{ form.title || '公告' }}
+ {{ form.title }}
- 更多
+ {{ form.right_title }}
{{ index + 1 }}
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..bb49b975 100644
--- a/src/config/const/notice.ts
+++ b/src/config/const/notice.ts
@@ -21,7 +21,8 @@ interface defaultSearch {
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,7 +51,6 @@ const defaultSearch: defaultSearch = {
title_type: 'img-icon',
title: '测试标题',
img_src: [],
-
// 滚动方式
direction: 'vertical',
interval_time: 3,
@@ -92,7 +92,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,
// 容器信息
From 7b456b7c089a9fc62e3b23bc4cd21603c5fdc344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 22 Oct 2024 18:05:35 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/model-notice/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/model-notice/index.vue b/src/components/model-notice/index.vue
index cad3ce89..d044f147 100644
--- a/src/components/model-notice/index.vue
+++ b/src/components/model-notice/index.vue
@@ -16,9 +16,9 @@
{{ form.title }}
- {{ item.notice_title }}
+ {{ item.notice_title }}
- {{ form.right_title }}
+ {{ form.right_title }}
@@ -37,7 +37,7 @@
{{ form.title }}
- {{ form.right_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;
}
}
}
From 23d0517cfaa04a3a2e59a671a064b71dfeafd0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 22 Oct 2024 18:11:39 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config/const/notice.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/config/const/notice.ts b/src/config/const/notice.ts
index bb49b975..4283508f 100644
--- a/src/config/const/notice.ts
+++ b/src/config/const/notice.ts
@@ -15,6 +15,7 @@ interface defaultSearch {
direction: string;
img_src: uploadList[];
icon_class: string;
+ right_title: string;
more_link: object;
interval_time: number;
is_right_button: string;
@@ -56,6 +57,7 @@ const defaultSearch: defaultSearch = {
interval_time: 3,
// 更多配置
is_right_button: '1',
+ right_title: '',
more_link: {},
icon_class: '',
// 公告内容
From a7f6c50e7c7e16150761e93b6ca4c50d569bd9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 22 Oct 2024 18:23:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A?=
=?UTF-8?q?=E4=B9=89=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/layout/components/main/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
}
}