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 @@
-
+
@@ -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 @@
};
-
+
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 @@
-
-
+
+
@@ -29,8 +29,8 @@
-
-
+
+
@@ -56,8 +56,8 @@
-
-
+
+
@@ -69,7 +69,7 @@
-
+
{{ item.title || '' }}
{{ item.show_price_symbol || ''}}{{ 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 '';