From cab437d218a53bdc07a231c09b05ec29ee0b6d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 21 Oct 2024 16:32:54 +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=9B=BE=E7=89=87=E5=9C=86=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 8 ++++----
components/diy/data-magic.vue | 14 ++++++++------
.../diy/modules/data-magic/magic-carousel.vue | 4 ++--
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/App.vue b/App.vue
index 5b0f39eb..2cc8131a 100644
--- a/App.vue
+++ b/App.vue
@@ -7,12 +7,12 @@
data: {
// 基础配置
// 数据接口请求地址
- // request_url: 'http://shopxo.com/',
- request_url:'https://new.shopxo.vip/',
+ request_url: 'http://shopxo.com/',
+ // request_url:'https://new.shopxo.vip/',
// 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
- // static_url: 'http://shopxo.com/',
- static_url:'https://new.shopxo.vip/',
+ static_url: 'http://shopxo.com/',
+ // static_url:'https://new.shopxo.vip/',
// 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
system_type: 'default',
diff --git a/components/diy/data-magic.vue b/components/diy/data-magic.vue
index 2507bcae..c7a38108 100644
--- a/components/diy/data-magic.vue
+++ b/components/diy/data-magic.vue
@@ -14,12 +14,12 @@
{{ item.data_content.subtitle || '' }}
-
+
-
+
@@ -46,12 +46,12 @@
{{ item.data_content.subtitle || '' }}
-
+
-
+
@@ -105,7 +105,7 @@
// 内容圆角设置
content_radius: '',
// 图片圆角设置
- content_img_radius: '',
+ // content_img_radius: '',
data_magic_list: [],
cubeCellWidth: 0,
container_size: 0,
@@ -148,7 +148,7 @@
outer_spacing: new_style.image_spacing * 2 + 'rpx',
spacing: new_style.image_spacing + 'rpx',
content_radius: radius_computer(new_style.data_radius),
- content_img_radius: radius_computer(new_style.img_radius),
+ // content_img_radius: radius_computer(new_style.img_radius),
data_magic_list: this.get_data_magic_list(new_form.data_magic_list),
style_container: common_styles_computer(new_style.common_style) + 'box-sizing: border-box;', // 用于样式显示
style_img_container: common_img_computer(new_style.common_style, this.propIndex),
@@ -190,6 +190,8 @@
// 商品名称和价格样式
data_style.goods_title_style = this.goods_trends_config(data_style, 'title');
data_style.goods_price_style = this.goods_trends_config(data_style, 'price');
+ const radius = !isEmpty(data_style.img_radius) ? data_style.img_radius : { radius: 4, radius_top_left: 4, radius_top_right: 4, radius_bottom_left: 4, radius_bottom_right: 4 };
+ data_style.get_img_radius = radius_computer(radius);
data_style.chunk_padding_data = padding_computer(data_style.chunk_padding) + 'box-sizing: border-box;';
data_style.heading_style = this.trends_config(data_style, 'heading');
diff --git a/components/diy/modules/data-magic/magic-carousel.vue b/components/diy/modules/data-magic/magic-carousel.vue
index 18fb53b2..6beb5a08 100644
--- a/components/diy/modules/data-magic/magic-carousel.vue
+++ b/components/diy/modules/data-magic/magic-carousel.vue
@@ -3,11 +3,11 @@
-
+
-
+