diff --git a/App.vue b/App.vue index 4ad210ea..a742cd58 100644 --- a/App.vue +++ b/App.vue @@ -7,10 +7,10 @@ data: { // 基础配置 // 数据接口请求地址 - request_url:'https://san.shopxo.vip/', + request_url:'https://shopxo.com/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) - static_url:'https://san.shopxo.vip/', + static_url:'https://shopxo.com/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue index 546cebb5..0f11427c 100644 --- a/components/diy/carousel.vue +++ b/components/diy/carousel.vue @@ -168,8 +168,8 @@ const width = sys_width - margin_left - margin_right - padding_left - padding_right - this.propOuterContainerPadding; const scale = width / 390; this.setData({ - form: this.propValue.content, - new_style: this.propValue.style, + form: new_form, + new_style: new_style, seat_list: this.get_seat_list(new_form), new_list: new_form.carousel_list.concat(this.get_seat_list(new_form)), popup_width: block * 16 * 2 + 'rpx', // 视频的宽度,依照16:9比例来算 @@ -229,7 +229,7 @@ return ''; } if (!isEmpty(form.carousel_list[actived_index]?.style?.background_img)) { - return background_computer(form.carousel_list[actived_index].style) + (form?.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.8;` : ''); + return background_computer(form.carousel_list[actived_index].style) + (form?.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : ''); } return ''; }, diff --git a/components/diy/tabs-carousel.vue b/components/diy/tabs-carousel.vue index 4f3290fe..7a086adb 100644 --- a/components/diy/tabs-carousel.vue +++ b/components/diy/tabs-carousel.vue @@ -173,7 +173,7 @@ }, get_swiper_bg_img_style(form, actived_index) { if (!isEmpty(form.carousel_list[actived_index]?.style?.background_img)) { - return background_computer(form.carousel_list[actived_index].style) + (form?.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.8;` : ''); + return background_computer(form.carousel_list[actived_index].style) + (form?.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : ''); } return ''; }, diff --git a/components/share-popup/share-popup.vue b/components/share-popup/share-popup.vue index e8ace10f..407de208 100644 --- a/components/share-popup/share-popup.vue +++ b/components/share-popup/share-popup.vue @@ -200,7 +200,6 @@ // 分享参数 var provider = e.currentTarget.dataset.provider; var scene = e.currentTarget.dataset.scene || null; - // 分享基础数据 var share = app.globalData.share_content_handle(this.share_info || {}); var img = this.images || share.img; @@ -213,7 +212,7 @@ // #ifdef APP // 分享到好友,是否走微信小程序,则获取微信小程序原始id if (scene == 'WXSceneSession') { - var weixin_original_id = app.globalData.get_config('config.common_app_mini_weixin_share_original_id', null); + var weixin_original_id = app.globalData.get_config('config.common_app_mini_weixin_share_original_id') || null; if (weixin_original_id != null) { type = 5; miniProgram = { @@ -230,7 +229,6 @@ this.setData({ popup_status: false, }); - // 调用分享组件 uni.share({ provider: provider,