From 0ddb4150b9a137bdbf92d730c0d78e1f2dd824bf 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, 24 Dec 2024 09:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E9=83=A8=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E8=BE=B9=E6=A1=86=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 | 9 ++----- src/components/page-settings/page-setting.vue | 10 +++++-- src/components/page-settings/page-styles.vue | 26 ++----------------- src/config/const/header-nav.ts | 14 +++++++--- 4 files changed, 22 insertions(+), 37 deletions(-) diff --git a/src/components/page-settings/index.vue b/src/components/page-settings/index.vue index 8d6d685b..f3d4bec5 100644 --- a/src/components/page-settings/index.vue +++ b/src/components/page-settings/index.vue @@ -182,19 +182,14 @@ const style_location_container = computed(() => { }); // 背景图片 const style_location_img_container = computed(() => { - const { location_background_img, location_background_img_style, location_padding, location_border_direction, location_border_size, location_border_color, location_margin } = new_style.value; + const { location_background_img, location_background_img_style, location_padding, location_border_size, location_border_color, location_margin, location_border_style = 'solid' } = new_style.value; const style = { background_img: location_background_img, background_img_style: location_background_img_style, } let border = ``; if (new_style.value.location_border_show == '1') { - // 边框 - if (location_border_direction == 'all') { - border += `border: ${location_border_size}px solid ${location_border_color};`; - } else { - border += `border-${location_border_direction}: ${location_border_size}px solid ${location_border_color};`; - } + border += `border-width: ${location_border_size.padding_top}px ${location_border_size.padding_right}px ${location_border_size.padding_bottom}px ${location_border_size.padding_left}px;border-style: ${ location_border_style };border-color: ${location_border_color};` } const height = 32 - location_margin.margin_top - location_margin.margin_bottom; return background_computer(style) + padding_computer(location_padding) + radius_computer(new_style.value.location_radius) + border + `height: ${height}px;line-height: ${height}px;`; diff --git a/src/components/page-settings/page-setting.vue b/src/components/page-settings/page-setting.vue index 7bc6b10e..aaf27d96 100644 --- a/src/components/page-settings/page-setting.vue +++ b/src/components/page-settings/page-setting.vue @@ -82,8 +82,14 @@ const default_data = { location_right_icon_size: 12, location_border_show: '0', location_border_color: '#FF3F3F', - location_border_direction: 'all', - location_border_size: 1, + location_border_style: 'solid', + location_border_size: { + padding: 0, + padding_top: 0, + padding_right: 0, + padding_bottom: 0, + padding_left: 0, + }, location_radius: { radius: 0, radius_top_left: 0, diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue index b9aa6fb0..e8e79a49 100644 --- a/src/components/page-settings/page-styles.vue +++ b/src/components/page-settings/page-styles.vue @@ -102,26 +102,8 @@ - - - - + +
@@ -214,10 +196,6 @@ const location_mult_color_picker_event = (arry: color_list[], type: number) => { form.value.location_color_list = arry; form.value.location_direction = type.toString(); }; -// 定位背景图片处理 -const location_background_img_change = (val: uploadList[]) => { - form.value.location_background_img = val; -}; const change_immersive_style = (val: string | number | boolean) => { if (val === '0') { diff --git a/src/config/const/header-nav.ts b/src/config/const/header-nav.ts index ba0794fe..ce265532 100644 --- a/src/config/const/header-nav.ts +++ b/src/config/const/header-nav.ts @@ -82,8 +82,8 @@ interface DefaultFooterNav { location_right_icon_size: number; location_border_show: string; location_border_color: string; - location_border_direction: string; - location_border_size: number; + location_border_style: string; + location_border_size: paddingStyle; location_radius: radiusStyle; location_padding: paddingStyle; location_margin: marginStyle; @@ -184,8 +184,14 @@ const defaultFooterNav: DefaultFooterNav = { location_right_icon_size: 12, location_border_show: '0', location_border_color: '#FF3F3F', - location_border_direction: 'all', - location_border_size: 1, + location_border_style: 'solid', + location_border_size: { + padding: 0, + padding_top: 0, + padding_right: 0, + padding_bottom: 0, + padding_left: 0, + }, location_radius: { radius: 0, radius_top_left: 0,