From 32d38efb78221d397ee2e6664a88ada3bb2c7547 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Sat, 14 Sep 2024 14:53:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/model-img-magic/index.vue | 4 +--
src/components/model-notice/index.vue | 33 ++++++++++---------
.../model-tabs/model-tabs-content.vue | 14 ++++----
.../layout/components/main/default/tabs.ts | 6 ++--
4 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/components/model-img-magic/index.vue b/src/components/model-img-magic/index.vue
index 00bba6c6..b7864fd4 100644
--- a/src/components/model-img-magic/index.vue
+++ b/src/components/model-img-magic/index.vue
@@ -135,12 +135,12 @@ const style_container = computed(() => common_styles_computer(new_style.value.co
position: relative;
}
.style9-top {
- width: calc(50% - 0.2rem);
+ width: 50%;
height: 50%;
position: relative;
}
.style9-bottom {
- width: calc(33% - 0.1rem);
+ width: calc(100% / 3);
height: 50%;
position: relative;
}
diff --git a/src/components/model-notice/index.vue b/src/components/model-notice/index.vue
index 221a84db..b5cf2041 100644
--- a/src/components/model-notice/index.vue
+++ b/src/components/model-notice/index.vue
@@ -14,9 +14,9 @@
{{ form.title || '公告' }}
- {{ item.notice_title }}
+ {{ item.notice_title }}
-
+
@@ -33,9 +33,12 @@
{{ form.title || '公告' }}
- 更多
+ 更多
+
+
+
{{ index + 1 }}
+
{{ item.notice_title }}
- {{ index + 1 }}{{ item.notice_title }}
@@ -76,16 +79,16 @@ const container_background_style = computed(() => {
return gradient_computer(styles) + radius_computer(new_style.value.container_radius) + background_computer(styles) + `overflow:hidden;`;
});
// 图片设置
-const img_style = computed(() => `height: ${ new_style.value.title_height }px; width: ${ new_style.value.title_width }px`);
+const img_style = computed(() => `height: ${new_style.value.title_height}px; width: ${new_style.value.title_width}px`);
// 标题的设置
const topic_style = computed(() => {
// 标题渐变色处理
const gradient = gradient_handle(new_style.value.title_color_list, '90deg');
// 标题设置
- return `color:${ new_style.value.title_color }; font-size: ${ new_style.value.title_size }px; font-weight: ${ new_style.value.title_typeface }; ${ gradient }`;
+ return `color:${new_style.value.title_color}; font-size: ${new_style.value.title_size}px; font-weight: ${new_style.value.title_typeface}; ${gradient}`;
});
// 内容标题设置
-const news_style = computed(() => `font-size: ${ new_style.value.news_size }px; font-weight: ${ new_style.value.news_typeface };`);
+const news_style = computed(() => `font-size: ${new_style.value.news_size}px; font-weight: ${new_style.value.news_typeface};`);
// 指示器的样式
// 轮播图定时显示
const interval_time = ref(2000);
@@ -97,14 +100,14 @@ const carouselKey = ref('0');
const interval_list = ref({
time: 2000,
direction: 'vertical',
- notice_length: 1
-})
+ notice_length: 1,
+});
const notice_list = computed(() => {
// 深拷贝一下,确保不会出现问题
const arry_list = cloneDeep(form.value.notice_list);
- return arry_list.filter((item: { is_show: string; }) => item.is_show == '1');
-})
+ return arry_list.filter((item: { is_show: string }) => item.is_show == '1');
+});
// 内容参数的集合
watchEffect(() => {
@@ -123,7 +126,7 @@ watchEffect(() => {
interval_list.value = {
time: time,
direction: direction,
- notice_length: notice_length
+ notice_length: notice_length,
};
// 更新轮播图的key,确保更换时能重新更新轮播图
carouselKey.value = get_math();
@@ -147,13 +150,13 @@ watchEffect(() => {
color: #999;
}
.one1 {
- color: #EA3323;
+ color: #ea3323;
}
.one2 {
- color: #FF7303;
+ color: #ff7303;
}
.one3 {
- color: #FFC300;
+ color: #ffc300;
}
.two-style {
width: 2.4rem;
diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue
index 615c054d..9bcdb153 100644
--- a/src/components/model-tabs/model-tabs-content.vue
+++ b/src/components/model-tabs/model-tabs-content.vue
@@ -25,12 +25,12 @@
- 微页面
- 选择分类
+ 微页面
+ 选择分类
-
-
+
+
@@ -69,11 +69,11 @@ const add = () => {
id: get_math(),
title: '',
desc: '',
- data_type: 'micro_page',
+ data_type: '0',
classify: {},
micro_page: '',
- micro_page_list: [],
- category_list: [],
+ micro_page_list: {},
+ category_list: {},
});
};
const remove = (index: number) => {
diff --git a/src/views/layout/components/main/default/tabs.ts b/src/views/layout/components/main/default/tabs.ts
index 15e0bf26..a96294d8 100644
--- a/src/views/layout/components/main/default/tabs.ts
+++ b/src/views/layout/components/main/default/tabs.ts
@@ -34,9 +34,9 @@ const defaultTabs: defaultTabs = {
tabs_theme: '0',
tabs_top_up: '1',
tabs_list: [
- { id: get_math(), title: '热门推荐', desc: '简介', data_type: 'micro_page', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} },
- { id: get_math(), title: '测试一', desc: '简介', data_type: 'micro_page', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} },
- { id: get_math(), title: '测试二', desc: '简介', data_type: 'micro_page', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} },
+ { id: get_math(), title: '热门推荐', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} },
+ { id: get_math(), title: '测试一', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} },
+ { id: get_math(), title: '测试二', desc: '简介', data_type: '0', classify: {}, micro_page: '', micro_page_list: {}, category_list: {} },
],
},
style: {