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

master
gongfuxiang 2025-05-30 11:02:38 +08:00
commit b8bbdfd5b7
1 changed files with 4 additions and 4 deletions

View File

@ -166,9 +166,9 @@
} else if (new_form.img_fit == 'cover') {
fit = 'aspectFill';
}
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 - this.propOuterContainerPadding;
const scale = width / 390;
// 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 - this.propOuterContainerPadding;
const scale = sys_width / 390;
this.setData({
form: new_form,
new_style: new_style,
@ -207,7 +207,7 @@
//
// this.$nextTick(() => {
this.setData({
nextMargin: 50 + data_left_spacing + 'px',
nextMargin: (new_form.carousel_type == 'twoDragOne' ? 50 : 84) + data_left_spacing + 'px',
slides_per_group: new_form.carousel_type == 'twoDragOne' ? 2 : 1,
});
// });