diff --git a/src/components/model-carousel/index.vue b/src/components/model-carousel/index.vue
index fd5294da..92811e56 100644
--- a/src/components/model-carousel/index.vue
+++ b/src/components/model-carousel/index.vue
@@ -139,7 +139,7 @@ const seat_list = computed(() => {
}
})
// 轮播图自适应高度
-const newHeight = computed(() => new_style.value.height + 'px');
+const newHeight = computed(() => form.value.height + 'px');
// 轮播图样式
const interval_type = ref('');
// 轮播图key值
diff --git a/src/components/model-carousel/model-carousel-content.vue b/src/components/model-carousel/model-carousel-content.vue
index 0c6f8407..9f21a097 100644
--- a/src/components/model-carousel/model-carousel-content.vue
+++ b/src/components/model-carousel/model-carousel-content.vue
@@ -14,7 +14,7 @@
等比缩放
- 铺满
+ 铺满
等比剪切
@@ -24,6 +24,9 @@
+
+
+
diff --git a/src/components/model-carousel/model-carousel-styles.vue b/src/components/model-carousel/model-carousel-styles.vue
index 2e439ef6..90c64b7b 100644
--- a/src/components/model-carousel/model-carousel-styles.vue
+++ b/src/components/model-carousel/model-carousel-styles.vue
@@ -7,16 +7,15 @@
-
-
- 轮播设置
-
-
-
-
-
-
-
+
+
+
+ 轮播设置
+
+
+
+
+
diff --git a/src/components/model-data-magic/components/tabs-content.vue b/src/components/model-data-magic/components/tabs-content.vue
index 647139d4..559712b5 100644
--- a/src/components/model-data-magic/components/tabs-content.vue
+++ b/src/components/model-data-magic/components/tabs-content.vue
@@ -18,7 +18,7 @@
等比缩放
- 铺满
+ 铺满
等比剪切
diff --git a/src/components/model-img-magic/index.vue b/src/components/model-img-magic/index.vue
index 0687505b..9e8e6ac3 100644
--- a/src/components/model-img-magic/index.vue
+++ b/src/components/model-img-magic/index.vue
@@ -19,9 +19,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/model-img-magic/model-img-magic-content.vue b/src/components/model-img-magic/model-img-magic-content.vue
index 9ebf9706..e37a257b 100644
--- a/src/components/model-img-magic/model-img-magic-content.vue
+++ b/src/components/model-img-magic/model-img-magic-content.vue
@@ -13,10 +13,27 @@
等比缩放
- 铺满
+ 铺满
等比剪切
+
+
+
+
+
+
+
+
+
+
+ 等比缩放
+ 铺满
+ 等比剪切
+
+
+
+
@@ -80,7 +97,7 @@ const props = defineProps({
},
});
const style_list = ['heng2', 'shu2', 'shu3', 'shang2xia1', 'shang1xia2', 'zuo1you2', 'zuo2you1', 'tianzige', 'shang2xia3', 'zuo1youshang1youxia2', 'a-1ge', 'a-4x4'];
-
+const img_fit_10 = 'contain';
// 风格
const style_show_list = [
[{ start: {x: 1, y: 1}, end: {x: 4, y: 2}, img: [], img_link: {} }, { start: {x: 1, y: 3},end: {x: 4, y: 4},img: [], img_link: {}}], // 风格1
diff --git a/src/components/model-title/index.vue b/src/components/model-title/index.vue
index 13c98ad6..55eb4a01 100644
--- a/src/components/model-title/index.vue
+++ b/src/components/model-title/index.vue
@@ -10,7 +10,7 @@
- {{ form.title || '标题' }}
+ {{ form.title }}
@@ -84,6 +84,7 @@ const keyword_style = computed(() => {
const right_style = computed(() => {
return `color:${new_style.value.right_color}; font-size: ${new_style.value.right_size}px;`;
});
+const title_img_height = computed(() => new_style.value.img_height + 'px');
// 通用样式区
const style_container = computed(() => common_styles_computer(new_style.value.common_style));
const style_img_container = computed(() => common_img_computer(new_style.value.common_style));
@@ -99,7 +100,8 @@ const style_img_container = computed(() => common_img_computer(new_style.value.c
word-wrap: break-word;
}
.title-img {
- max-width: 6rem;
- max-height: 3rem;
+ // max-width: 6rem;
+ // max-height: 3rem;
+ height: v-bind(title_img_height);
}
diff --git a/src/components/model-title/model-title-styles.vue b/src/components/model-title/model-title-styles.vue
index e04a45aa..88cb4f99 100644
--- a/src/components/model-title/model-title-styles.vue
+++ b/src/components/model-title/model-title-styles.vue
@@ -28,6 +28,9 @@
+
+
+
diff --git a/src/config/const/carousel.ts b/src/config/const/carousel.ts
index cf4b7e55..e5dca746 100644
--- a/src/config/const/carousel.ts
+++ b/src/config/const/carousel.ts
@@ -14,6 +14,7 @@ interface defaultSearch {
img_fit: string,
is_roll: string;
interval_time: number;
+ height: number,
};
style: {
radius: number;
@@ -22,7 +23,6 @@ interface defaultSearch {
radius_bottom_left: number;
radius_bottom_right: number;
is_show: string;
- height: number,
image_spacing: number,
indicator_style: string;
indicator_location: string;
@@ -53,6 +53,7 @@ const defaultSearch: defaultSearch = {
img_fit: 'contain',
is_roll: '1',
interval_time: 3,
+ height: 300,
carousel_list: [
{
carousel_img: [],
@@ -81,7 +82,6 @@ const defaultSearch: defaultSearch = {
radius_bottom_left: 0,
radius_bottom_right: 0,
is_show: '1',
- height: 300,
image_spacing: 10,
indicator_style: 'dot',
indicator_location: 'center',
diff --git a/src/config/const/img-magic.ts b/src/config/const/img-magic.ts
index 1a52ff58..44d53d53 100644
--- a/src/config/const/img-magic.ts
+++ b/src/config/const/img-magic.ts
@@ -11,6 +11,8 @@ interface defaultSearch {
style_actived: number;
img_magic_list: img_magic[];
img_fit: string;
+ limit_size: string,
+ image_height: number;
};
style: {
radius: number;
@@ -41,6 +43,8 @@ const defaultSearch: defaultSearch = {
}
],
img_fit: 'cover',
+ limit_size: '0',
+ image_height: 100,
},
style: {
radius: 0,
diff --git a/src/config/const/title.ts b/src/config/const/title.ts
index 99e0db76..80684056 100644
--- a/src/config/const/title.ts
+++ b/src/config/const/title.ts
@@ -25,6 +25,7 @@ interface defaultSearch {
title_color: string;
title_size: number;
title_weight: string;
+ img_height: number;
icon_size: number;
icon_color: string;
subtitle_color: string;
@@ -39,7 +40,7 @@ interface defaultSearch {
}
const defaultSearch: defaultSearch = {
content: {
- title: '',
+ title: '标题',
title_link: {},
img_src: [],
icon_class: '',
@@ -62,6 +63,7 @@ const defaultSearch: defaultSearch = {
title_color: '#000',
title_size: 12,
title_weight: 'normal',
+ img_height: 30,
icon_size: 12,
icon_color: '#999',
subtitle_color: '#999',