diff --git a/App.vue b/App.vue index c3f6a85c..58989faf 100644 --- a/App.vue +++ b/App.vue @@ -7,10 +7,10 @@ data: { // 基础配置 // 数据接口请求地址 - request_url:'http://shopxo.com/', + request_url:'http://new.shopxo.vip/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) - static_url:'http://shopxo.com/', + static_url:'http://new.shopxo.vip/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', diff --git a/components/diy/article-list.vue b/components/diy/article-list.vue index 09ca0535..c571e58e 100644 --- a/components/diy/article-list.vue +++ b/components/diy/article-list.vue @@ -233,11 +233,11 @@ } // 背景图的处理 const article_data = { - background_img_style: new_style.article_background_img_style, - background_img: new_style.article_background_img, + background_img_style: new_style?.article_background_img_style || '', + background_img: new_style?.article_background_img || '', } // 渐变效果 - const gradient = gradient_handle(new_style.article_color_list, new_style.article_direction); + const gradient = gradient_handle(new_style?.article_color_list || [], new_style?.article_direction || ''); // 文章样式 if (this.article_theme == '0') { this.setData({ diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue index b31aca32..a09591b9 100644 --- a/components/diy/goods-list.vue +++ b/components/diy/goods-list.vue @@ -386,7 +386,7 @@ // 不同风格下的样式 get_layout_style(new_style, form) { const radius = form.theme == '6' ? '' : radius_computer(new_style.shop_radius); - const gradient = form.theme != '6' ? gradient_handle(new_style.shop_color_list, new_style.shop_direction) : ''; + const gradient = form.theme != '6' ? gradient_handle(new_style?.shop_color_list || [], new_style?.shop_direction || '') : ''; let size_style = ``; if (['1', '4'].includes(form.theme)) { size_style = `width: calc((100% - ${new_style.content_outer_spacing * 2 + 'rpx'}) / 2);`; @@ -400,8 +400,8 @@ get_layout_img_style(new_style, form) { const padding = ['0', '4'].includes(form.theme) ? padding_computer(new_style.shop_padding) + 'box-sizing: border-box;' : ''; const data = { - background_img_style: new_style.shop_background_img_style, - background_img: new_style.shop_background_img, + background_img_style: new_style?.shop_background_img_style || '', + background_img: new_style?.shop_background_img || '', } const background = form.theme != '6' ? background_computer(data) : ''; return `${padding} ${background}`; diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue index 0a6f66b5..ee1d83b0 100644 --- a/components/diy/modules/tabs-view.vue +++ b/components/diy/modules/tabs-view.vue @@ -212,7 +212,8 @@ } else if (form.tabs_theme == '3') { bottom = 10; } - return ['1', '2', '4'].includes(form.tabs_theme) ? '' : `padding-bottom: ${(new_style?.tabs_sign_spacing || 0) + bottom}px;`; + const tabs_sign_spacing = !isEmpty(new_style.tabs_sign_spacing) ? new_style.tabs_sign_spacing : 4; + return ['1', '2', '4'].includes(form.tabs_theme) ? '' : `padding-bottom: ${tabs_sign_spacing + bottom}px;`; }, // 选中的背景渐变色样式 tabs_check_computer(data) {