From dbca8cf3c5d8162827e937a8c06064b918d9eecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Wed, 28 Aug 2024 16:24:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?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/components/page-settings/index.vue | 35 ++++++++++++------- src/components/page-settings/page-styles.vue | 21 ++++++++--- .../components/main/default/header-nav.ts | 4 ++- 3 files changed, 41 insertions(+), 19 deletions(-) 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 @@
透明 - 颜色 - 图片 + 颜色/图片 -