diff --git a/App.vue b/App.vue index 75cab551..8ffd52d3 100644 --- a/App.vue +++ b/App.vue @@ -7,12 +7,12 @@ data: { // 基础配置 // 数据接口请求地址 - // request_url: 'http://shopxo.com/', - request_url:'https://new.shopxo.vip/', + request_url: 'http://shopxo.com/', + // request_url:'https://new.shopxo.vip/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) - // static_url: 'http://shopxo.com/', - static_url:'https://new.shopxo.vip/', + static_url: 'http://shopxo.com/', + // static_url:'https://new.shopxo.vip/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue index 9771c2c4..78296b91 100644 --- a/components/diy/carousel.vue +++ b/components/diy/carousel.vue @@ -127,12 +127,14 @@ const block = (windowWidth * 0.9) / 16; const { common_style, actived_color } = new_style; - // aspectFill 对应 cover aspectFit 对应 contain scaleToFill 对应 none - let fit = 'scaleToFill'; + // scaleToFill 对应 cover aspectFit 对应 contain center 对应 none + let fit = ''; if (new_form.img_fit == 'cover') { - fit = 'aspectFill'; + fit = 'scaleToFill'; } else if (new_form.img_fit == 'contain') { fit = 'aspectFit'; + } else if (new_form.img_fit =='none') { + fit = 'center'; } this.setData({ form: this.propValue.content, diff --git a/components/diy/img-magic.vue b/components/diy/img-magic.vue index b9a0841a..347fbdc1 100644 --- a/components/diy/img-magic.vue +++ b/components/diy/img-magic.vue @@ -91,12 +91,13 @@ const outer_sx = `-${new_style.image_spacing}rpx`; // 图片间距设置 const spacing = `${new_style.image_spacing}rpx`; - // aspectFill 对应 cover aspectFit 对应 contain scaleToFill 对应 none - let fit = 'scaleToFill'; - if (new_content.img_fit == 'cover') { - fit = 'aspectFill'; - } else if (new_content.img_fit == 'contain') { + // scaleToFill 对应 cover aspectFit 对应 contain center 对应 none + if (new_form.img_fit == 'cover') { + fit = 'scaleToFill'; + } else if (new_form.img_fit == 'contain') { fit = 'aspectFit'; + } else if (new_form.img_fit =='none') { + fit = 'center'; } const density = 4; this.setData({ diff --git a/components/diy/modules/image-empty.vue b/components/diy/modules/image-empty.vue index b76b19ec..af0bf056 100644 --- a/components/diy/modules/image-empty.vue +++ b/components/diy/modules/image-empty.vue @@ -40,7 +40,7 @@ watch: { propImageSrc(val) { this.init(); - }, + } }, mounted() { this.init();