From 21a6fa4733fd6cb29d91e8d3217820dd83f33296 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, 29 May 2025 18:47:45 +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=E9=AB=98=E5=BA=A6=E6=AF=94=E4=BE=8B=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                 |  4 ++--
 pages/diy/components/diy/data-magic.vue | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/App.vue b/App.vue
index 4ff095d7..d3d2f178 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url:'https://new.shopxo.vip/',
+                request_url:'http://shopxo.com/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url:'https://new.shopxo.vip/',
+                static_url:'http://shopxo.com/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/pages/diy/components/diy/data-magic.vue b/pages/diy/components/diy/data-magic.vue
index adf4c698..49d66325 100644
--- a/pages/diy/components/diy/data-magic.vue
+++ b/pages/diy/components/diy/data-magic.vue
@@ -1,6 +1,6 @@
 <template>
-    <view class="img-magic" :style="'height:' + container_size + ';' + style_container">
-        <view class="magic-container w h pr" :style="style_img_container">
+    <view class="img-magic" :style="style_container">
+        <view class="magic-container w h pr" :style="'height:' + container_height + ';' + style_img_container">
             <view class="pr" :style="'width:calc(100% + ' + outer_spacing + ');height:calc(100% + ' + outer_spacing + ');margin:-' + spacing + ';'">
                 <!-- 风格9 -->
                 <template v-if="form.style_actived == 7">
@@ -166,7 +166,7 @@
                 // content_img_radius: '',
                 data_magic_list: [],
                 cubeCellWidth: 0,
-                container_size: 0,
+                container_height: 0,
                 style_container: '',
                 style_img_container: '',
                 div_width: 0,
@@ -201,10 +201,10 @@
             init() {
                 const new_form = this.propValue.content;
                 const new_style = this.propValue.style;
-                const container_height = !isEmpty(new_form.container_height) ? new_form.container_height : sys_width;
+                const height = !isEmpty(new_form.container_height) ? new_form.container_height : sys_width;
                 const density = !isEmpty(new_form.magic_cube_density) ? new_form.magic_cube_density : 4;
-                const { margin_left, margin_right } = new_style.common_style;
-                const width = sys_width - margin_left - margin_right - border_width(new_style.common_style) - this.propOuterContainerPadding;
+                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 - border_width(new_style.common_style) - this.propOuterContainerPadding;
                 this.setData({
                     form: new_form,
                     new_style: new_style,
@@ -218,7 +218,7 @@
                     magic_scale: width / 390,
                     div_width: sys_width,
                     cubeCellWidth: sys_width / density,
-                    container_size: container_height * (width / 390) + 'px',
+                    container_height: height * (sys_width / 390) + 'px',
                 });
             },
             get_data_magic_list(data, new_style) {