sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws

master
sws 2024-10-17 18:12:53 +08:00
parent c0cac29acf d0591ee353
commit 16c660e2e5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/diy/carousel.vue
View File

@ -120,7 +120,6 @@
},
created() {
this.init();
console.log(sys_width);
},
methods: {
isEmpty,
@ -141,6 +140,7 @@
} else if (new_form.img_fit == 'cover') {
fit = 'aspectFill';
}
this.setData({
form: this.propValue.content,
new_style: this.propValue.style,
@ -152,9 +152,9 @@
style_img_container: this.propIsCommon ? common_img_computer(common_style) : '', // 用于样式显示
img_style: radius_computer(new_style), // 图片的设置
indicator_style: this.get_indicator_style(new_style), // 指示器的样式
dot_style: `bottom: ${ new_style.indicator_bottom * 2 }rpx;`, // 指示器位置
dot_style: `bottom: ${ (new_style.indicator_bottom + common_style.margin_bottom + common_style.padding_bottom) * (sys_width / 390) * 2 }rpx;`, // 指示器位置
img_fit: fit,
video_style: this.get_video_style(new_style), // 视频播放按钮显示逻辑
video_style: this.get_video_style(new_style), // 视频播放按钮显示逻辑
swiper_height: new_form.height * (sys_width / 390) * 2 + 'rpx',
});
if (new_form.carousel_type == 'card') {

2
components/diy/goods-list.vue
View File

@ -357,7 +357,7 @@
} else if (form.theme == '3') {
size_style = `width: calc((100% - ${new_style.content_outer_spacing * 4 + 'rpx'}) / 3);`;
} else if (form.theme == '5') {
size_style = `width: ${this.get_multicolumn_columns_width(new_style, form)};min-width: ${this.get_multicolumn_columns_width(form)};height: ${new_style.content_outer_height * 2 + 'rpx'}`;
size_style = `width: ${this.get_multicolumn_columns_width(new_style, form)};min-width: ${this.get_multicolumn_columns_width(new_style, form)};height: ${new_style.content_outer_height * 2 + 'rpx'}`;
}
return `${radius} ${padding} ${size_style}`;
},