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 @@