From a8fe0e27c805c8e79b307d357c13b299aa735c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 20 May 2025 19:09:47 +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=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                           |  4 ++--
 .../diy/modules/data-magic/magic-carousel.vue     | 13 ++++++++++---
 .../diy/modules/data-magic/product-list-show.vue  | 15 ++++++++-------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/App.vue b/App.vue
index 8f5e9cda..d3d2f178 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url:'https://d1.shopxo.vip/',
+                request_url:'http://shopxo.com/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url:'https://d1.shopxo.vip/',
+                static_url:'http://shopxo.com/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/pages/diy/components/diy/modules/data-magic/magic-carousel.vue b/pages/diy/components/diy/modules/data-magic/magic-carousel.vue
index 9d1f375f..df210e93 100644
--- a/pages/diy/components/diy/modules/data-magic/magic-carousel.vue
+++ b/pages/diy/components/diy/modules/data-magic/magic-carousel.vue
@@ -9,7 +9,7 @@
                         </view>
                     </template>
                     <template v-else>
-                        <view class="wh-auto ht-auto" :style="shop_spacing">
+                        <view class="w h" :style="shop_spacing">
                             <product-list-show :propKey="propKey" :propOuterflex="propValue.data_content.goods_outerflex" :propFlex="propValue.data_content.goods_flex" :propNum="show_num" :propActived="propActived" :propIsShow="propValue.data_content.is_show" :propChunkPadding="propValue.data_style.chunk_padding" :propValue="item1.split_list" :propGoodStyle="propGoodStyle" :propContentImgRadius="propValue.data_style.get_img_radius" @url_event="url_event"></product-list-show>
                         </view>
                     </template>
@@ -120,7 +120,7 @@
                         style_container: gradient_computer(style_data) + radius_computer(data_radius) + margin_computer(data_chunk_margin) + box_shadow_computer(data_pattern) + border_computer(data_pattern), // 用于样式显示
                         style_img_container: padding_computer(data_chunk_padding) + background_computer(style_img_data) + 'box-sizing: border-box;',
                         next_margin: rolling_fashion == 'translation' && rotation_direction == 'horizontal' ? `-${ data_goods_gap * 2 }rpx` : '0rpx',
-                        shop_spacing: this.propType === 'img' ? 'margin-right: 0px;' : `margin-right: ${ data_goods_gap * 2 }rpx;`,
+                        shop_spacing: rolling_fashion == 'translation' && rotation_direction == 'horizontal' ? `padding-right: ${ data_goods_gap * 2 }rpx;box-sizing: border-box;` : 'padding-right: 0px;box-sizing: border-box;',
                         slides_per_view: slides_per_view,
                         show_num: show_num,
                     });
@@ -139,4 +139,11 @@
     };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+.w {
+    width: 100%;
+}
+.h {
+    height: 100%;
+}
+</style>
diff --git a/pages/diy/components/diy/modules/data-magic/product-list-show.vue b/pages/diy/components/diy/modules/data-magic/product-list-show.vue
index b6013d08..f3663bbf 100644
--- a/pages/diy/components/diy/modules/data-magic/product-list-show.vue
+++ b/pages/diy/components/diy/modules/data-magic/product-list-show.vue
@@ -1,8 +1,8 @@
 <template>
     <view :class="['align-c flex-1 w h', (propOuterflex == 'row' ? 'flex-row' : 'flex-col')]" :style="'gap:' + propGoodStyle.data_goods_gap + 'px;'">
         <template v-if="propFlex === 'row'">
-            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h">
-                <view class="w h oh" :style="style_container">
+            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h flex-row">
+                <view class="flex-1 oh" :style="style_container">
                     <view class="w h flex-row gap-10" :style="style_img_container" :data-index="index" :data-value="item.goods_url" @tap="url_event">
                         <template v-if="!isEmpty(item.new_cover)">
                             <view class="w h">
@@ -29,8 +29,8 @@
             </view>
         </template>
         <template v-else-if="propFlex === 'col_price_float'">
-            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h">
-                <view class="w h oh" :style="style_container">
+            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h flex-row">
+                <view class="flex-1 oh" :style="style_container">
                     <view class="w h flex-col gap-10" :style="style_img_container" :data-index="index" :data-value="item.goods_url" @tap="url_event">
                         <view class="w h flex-1 pr oh">
                             <template v-if="!isEmpty(item.new_cover)">
@@ -56,8 +56,8 @@
             </view>
         </template>
         <template v-else>
-            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h">
-                <view class="w h oh" :style="style_container">
+            <view v-for="(item, index) in propValue" :key="index" :style="block_size" class="w h flex-row">
+                <view class="flex-1 oh" :style="style_container">
                     <view class="w h flex-col" :style="style_img_container" :data-index="index" :data-value="item.goods_url" @tap="url_event">
                         <template v-if="!isEmpty(item.new_cover)">
                             <view class="w h">
@@ -69,7 +69,7 @@
                                 <image-empty :propImageSrc="item.images" :propStyle="propContentImgRadius" propErrorStyle="width: 80rpx;height: 80rpx;"></image-empty>
                             </view>
                         </template>
-                        <view v-if="!isEmpty(propIsShow)" class="flex-col w h tl jc-sb">
+                        <view v-if="!isEmpty(propIsShow)" class="flex-1 flex-col w h tl jc-sb" :style="style_img_col_container">
                             <view v-if="propIsShow.includes('title')" class="text-line-2" :style="propGoodStyle.goods_title_style + 'height:'+ ((propGoodStyle.goods_title_size + 3) * 4) + 'rpx;'">{{ item.title || '' }}</view>
                             <view v-if="propIsShow.includes('price')" :style="propGoodStyle.goods_price_style">
                                 <text :style="propGoodStyle.goods_price_symbol_style">{{ item.show_price_symbol || ''}}</text>{{ item.min_price || '' }}
@@ -200,6 +200,7 @@
                         style_container: gradient_computer(style_data) + radius_computer(goods_radius) + margin_computer(goods_chunk_margin) + border_computer(this.propGoodStyle) + box_shadow_computer(this.propGoodStyle), // 用于样式显示
                         style_img_container: this.propFlex == 'col' ? background_computer(style_img_data) : padding_computer(goods_chunk_padding) + background_computer(style_img_data) + 'box-sizing: border-box;',
                         block_size: this.propOuterflex == 'row' ?  'height:calc(100% - ' +  shop_top_bottom_width_margin.value + 'px);width:calc((100% - ' + all_width + 'px) / ' + this.propNum  + ');' : 'width:calc(100% - ' +  shop_left_right_width_margin.value + 'px);height:calc((100% - ' + all_height + 'px) / ' + this.propNum  + ');',
+                        style_img_col_container: this.propFlex == 'col' ? padding_computer(goods_chunk_padding) + 'box-sizing: border-box;' : '',
                     });
                 } else {
                     return '';