From 201cba22e7e37af740958014299cc989b15b9ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 21 Nov 2024 18:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E9=AD=94?=
=?UTF-8?q?=E6=96=B9=E5=AD=97=E4=BD=93=E4=B8=8D=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/diy/data-magic.vue | 12 ++++++++----
.../diy/modules/data-magic/magic-carousel.vue | 4 ++++
static/images/common/image-empty.png | Bin 4768 -> 5439 bytes
3 files changed, 12 insertions(+), 4 deletions(-)
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 e851b09a775165af30d12981b82bc0c67b8a1a7e..c24ea3fc6966087293f02c1ca34cef3d524be383 100644
GIT binary patch
literal 5439
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