diff --git a/components/diy/data-magic.vue b/components/diy/data-magic.vue
index b902d29c..1ed12b57 100644
--- a/components/diy/data-magic.vue
+++ b/components/diy/data-magic.vue
@@ -52,7 +52,7 @@
-
+
@@ -68,13 +68,13 @@
{{ item.data_content.subtitle || '' }}
-
+
-
+
@@ -153,6 +153,7 @@
style_img_container: '',
div_width: 0,
magic_scale: 1,
+ is_unlimited_size: false,
};
},
computed: {
@@ -186,6 +187,8 @@
const density = !isEmpty(new_form.magic_cube_density) ? new_form.magic_cube_density : 4;
const { margin_left, margin_right, padding_left, padding_right } = new_style.common_style;
const width = sys_width - margin_left - margin_right - padding_left - padding_right - this.propOuterContainerPadding;
+ // 是否不限尺寸
+ const is_unlimited_size = new_form.style_actived === 9 && new_form.limit_size == '0';
this.setData({
form: new_form,
new_style: new_style,
@@ -199,7 +202,8 @@
magic_scale: width / 390,
div_width: sys_width,
cubeCellWidth: sys_width / density,
- container_size: container_height * 2 + 'rpx',
+ container_size: is_unlimited_size ? '100%;' : container_height * 2 + 'rpx',
+ is_unlimited_size: is_unlimited_size,
});
},
get_data_magic_list(data, new_style) {
diff --git a/components/diy/modules/data-magic/magic-carousel.vue b/components/diy/modules/data-magic/magic-carousel.vue
index 042f66e3..96bd4d2c 100644
--- a/components/diy/modules/data-magic/magic-carousel.vue
+++ b/components/diy/modules/data-magic/magic-carousel.vue
@@ -53,6 +53,10 @@
propDataIndex: {
type: Number,
default: () => 0,
+ },
+ propIsUnlimitedSize: {
+ type: Boolean,
+ default: () => false,
}
},
data() {
diff --git a/static/images/common/image-empty.png b/static/images/common/image-empty.png
index e851b09a..c24ea3fc 100644
Binary files a/static/images/common/image-empty.png and b/static/images/common/image-empty.png differ