diff --git a/src/components/page-settings/index.vue b/src/components/page-settings/index.vue
index 0237ed39..2aca4f63 100644
--- a/src/components/page-settings/index.vue
+++ b/src/components/page-settings/index.vue
@@ -2,10 +2,15 @@
-
![]()
+
-
- {{ props.pageData.com_data?.content?.title || '新建页面' }}
+
+
+ {{ props.pageData.com_data?.content?.title || '新建页面' }}
+
+
+
![]()
+
@@ -30,17 +35,15 @@ const new_style = computed(() => props.pageData.com_data.style);
const position = computed(() => new_style.value.up_slide_display ? 'absolute' : 'relative');
const roll_style = computed(() => {
let style = ``;
- if (new_style.value.background_type === 'color') {
- style += gradient_computer({ color_list: new_style.value.background_color_list, direction: new_style.value.background_direction });
- } else if (new_style.value.background_type === 'image') {
- style += background_computer(new_style.value);
+ if (new_style.value.background_type === 'color_image') {
+ style += gradient_computer({ color_list: new_style.value.background_color_list, direction: new_style.value.background_direction }) + background_computer(new_style.value);
} else {
style += `background: transparent;`;
}
return style
});
-const url_computer = () => {
- const new_url = ref(new URL(`../../assets/images/layout/main/main-top.png`, import.meta.url).href).value;
+const url_computer = (name: string) => {
+ const new_url = ref(new URL(`../../assets/images/layout/main/${name}.png`, import.meta.url).href).value;
return new_url;
};
@@ -54,8 +57,7 @@ const url_computer = () => {
.roll {
width: 39rem;
margin: 0 auto;
- // box-shadow: 0px 0 0px 0.2rem #fff;
- // border-bottom: 0.1rem solid #f5f5f5;
+ cursor: pointer;
}
.img {
width: 34rem;
@@ -63,8 +65,15 @@ const url_computer = () => {
}
.model-head {
height: 4.3rem;
- padding: 1.1rem 0;
- cursor: pointer;
+}
+.model-head-icon {
+ position: absolute;
+ right: 1.2rem;
+ bottom: 0.6rem;
+ height: 3.2rem;
+ .function-icon {
+ height: 3.2rem;
+ }
}
.page-settings-border {
// border: 0.2rem solid $cr-main;
diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue
index b461ce5d..cf4dc49d 100644
--- a/src/components/page-settings/page-styles.vue
+++ b/src/components/page-settings/page-styles.vue
@@ -7,13 +7,24 @@
透明
- 颜色
- 图片
+ 颜色/图片
-
+
-
-
+
+
背景图
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layout/components/main/default/header-nav.ts b/src/layout/components/main/default/header-nav.ts
index e443e1e8..92d43058 100644
--- a/src/layout/components/main/default/header-nav.ts
+++ b/src/layout/components/main/default/header-nav.ts
@@ -9,6 +9,7 @@ interface DefaultFooterNav {
background_type: string;
background_color_list: color_list[];
background_direction: string;
+ background_img_style: number;
background_img_url: uploadList[];
background_title_color: string,
background_title_typeface: string,
@@ -25,9 +26,10 @@ const defaultFooterNav: DefaultFooterNav = {
title: '',
},
style: {
- background_type: 'color',
+ background_type: 'color_image',
background_color_list: [{ color: '#fff', color_percentage: '' }],
background_direction: '180deg',
+ background_img_style: 2,
background_img_url: [],
background_title_color: '#000',
background_title_typeface: '500',