From d3cb2763ce9f70eb15688a959f3edb3074ef9b2a Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Fri, 18 Oct 2024 10:30:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.icon=E6=9B=B4=E6=96=B0=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/plugins/realstore/detail/detail.vue | 2 +- pages/plugins/thirdpartylogin/index/index.vue | 2 +- pages/plugins/weixinliveplayer/index/index.vue | 4 ++-- pages/plugins/weixinliveplayer/search/search.vue | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue index 8d81febe..373944d0 100644 --- a/pages/plugins/realstore/detail/detail.vue +++ b/pages/plugins/realstore/detail/detail.vue @@ -19,7 +19,7 @@ :propIsIconOnEvent="is_realstore_top_search_scan == 1" :propIsOnEvent="true" :propIsRequired="false" - :propIcon="is_realstore_top_search_scan == 1 ? 'icon-scan' : 'icon-qiandao-dqxz'" + :propIcon="is_realstore_top_search_scan == 1 ? 'icon-scan' : 'icon-qiandao-yixuan'" propPlaceholderClass="cr-grey-c" propBgColor="#fff" propIconColor="#333" diff --git a/pages/plugins/thirdpartylogin/index/index.vue b/pages/plugins/thirdpartylogin/index/index.vue index e3801910..b3cd2c91 100644 --- a/pages/plugins/thirdpartylogin/index/index.vue +++ b/pages/plugins/thirdpartylogin/index/index.vue @@ -15,7 +15,7 @@ - + {{$t('index.index.n0vnl6')}} diff --git a/pages/plugins/weixinliveplayer/index/index.vue b/pages/plugins/weixinliveplayer/index/index.vue index db21a9e5..5ee86bf4 100644 --- a/pages/plugins/weixinliveplayer/index/index.vue +++ b/pages/plugins/weixinliveplayer/index/index.vue @@ -50,9 +50,9 @@
- + - + {{item.status_name}} diff --git a/pages/plugins/weixinliveplayer/search/search.vue b/pages/plugins/weixinliveplayer/search/search.vue index 9cd001b6..6f31aa0f 100644 --- a/pages/plugins/weixinliveplayer/search/search.vue +++ b/pages/plugins/weixinliveplayer/search/search.vue @@ -38,9 +38,9 @@
- + - + {{ item.status_name }} From a38c39b8eeef75db62a1c274946094dda6db8191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Fri, 18 Oct 2024 11:01:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 8 ++++---- components/diy/goods-list.vue | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/App.vue b/App.vue index 418bcde4..1abfddf0 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/goods-list.vue b/components/diy/goods-list.vue index 09271ed4..c3896a1d 100644 --- a/components/diy/goods-list.vue +++ b/components/diy/goods-list.vue @@ -408,9 +408,10 @@ url_event(e) { let index = e.currentTarget.dataset.index || 0; let goods = this.list[index]; + let split_index = 0; if (this.theme == '5') { - split_index = e.currentTarget.dataset.split_index || 0; - goods = this.shop_content_list[index][split_index]; + split_index = e.currentTarget.dataset.splitIndex || 0; + goods = this.shop_content_list[index].split_list[split_index]; } app.globalData.goods_data_cache_handle(goods.id, goods); @@ -425,8 +426,8 @@ let split_index = 0; let goods = this.list[index]; if (this.theme == '5') { - split_index = e.currentTarget.dataset.split_index || 0; - goods = this.shop_content_list[index][split_index]; + split_index = e.currentTarget.dataset.splitIndex || 0; + goods = this.shop_content_list[index].split_list[split_index]; } if (this.form.shop_button_effect == '0') { app.globalData.goods_data_cache_handle(goods.id, goods); From ccc889b2f1953022456abcdfe574fc0e48e102c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Fri, 18 Oct 2024 11:15:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E7=A4=BA?= =?UTF-8?q?=E5=99=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/diy/modules/image-empty.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/diy/modules/image-empty.vue b/components/diy/modules/image-empty.vue index af0bf056..242e771e 100644 --- a/components/diy/modules/image-empty.vue +++ b/components/diy/modules/image-empty.vue @@ -58,6 +58,11 @@ empty_style: `${this.propErrorStyle}`, }); img_url = this.default_image; + } else { + this.setData({ + empty_outer_style: '', + empty_style: 'width: 100%; height: 100%;', // 有图片的时候显示为100% + }); } this.setData({ img_url: img_url, From e998b632a62be267091a5144f4720c5cd5a88ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Fri, 18 Oct 2024 15:15:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 8 +++--- components/diy/diy.vue | 4 +-- components/diy/footer.vue | 2 +- components/diy/goods-list.vue | 32 +++++++++++++++++------ components/diy/seckill.vue | 48 ++++++++++++++++++++--------------- 5 files changed, 59 insertions(+), 35 deletions(-) diff --git a/App.vue b/App.vue index 1abfddf0..9bb5cc13 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/diy.vue b/components/diy/diy.vue index 6cab8cb6..994e3207 100644 --- a/components/diy/diy.vue +++ b/components/diy/diy.vue @@ -141,8 +141,8 @@ default: '', }, propKey: { - type: String, - default: '', + type: Number, + default: 0, }, }, components: { diff --git a/components/diy/footer.vue b/components/diy/footer.vue index 7074963b..8603e337 100644 --- a/components/diy/footer.vue +++ b/components/diy/footer.vue @@ -35,7 +35,7 @@ props: { propKey: { type: [Number, String], - default: '‘', + default: '', }, propValue: { type: Object, diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue index c3896a1d..b9869942 100644 --- a/components/diy/goods-list.vue +++ b/components/diy/goods-list.vue @@ -23,9 +23,12 @@ - + - {{ item.title }} + + {{ item.title }} + {{ item.simple_desc }} + {{ icon_data.name }} @@ -113,9 +116,12 @@ - + - {{ item.title }} + + {{ item.title }} + {{ item.simple_desc }} + {{ icon_data.name }} @@ -219,6 +225,7 @@ sold_number_style: '', score_style: '', button_style: '', + simple_desc: '', }; }, computed: { @@ -277,11 +284,12 @@ style_container: this.propIsCommonStyle ? common_styles_computer(new_style.common_style) : '', // 公共样式 style_img_container: this.propIsCommonStyle ? common_img_computer(new_style.common_style) : '', // 图片样式 // 内容样式设置 - title_style: this.trends_config(new_style, 'title'), + title_style: this.trends_config(new_style, 'title', 'title', new_form.theme), price_style: this.trends_config(new_style, 'price'), sold_number_style: this.trends_config(new_style, 'sold_number'), score_style: this.trends_config(new_style, 'score'), button_style: this.trends_config(new_style, 'button', 'gradient'), + simple_desc: this.trends_config(new_style, 'simple_desc', 'desc'), shop_content_list: this.get_shop_content_list(new_list, new_form), is_show_cart: new_form.shop_button_effect == '1', }); @@ -382,14 +390,22 @@ return this.form.is_show.includes(index); }, // 根据传递的参数，从对象中取值 - trends_config(new_style, key, type) { - return this.style_config(new_style[`shop_${key}_typeface`], new_style[`shop_${key}_size`], new_style[`shop_${key}_color`], type); + trends_config(new_style, key, type, theme) { + return this.style_config(new_style[`shop_${key}_typeface`], new_style[`shop_${key}_size`], new_style[`shop_${key}_color`], type, theme); }, // 根据传递的值，显示不同的内容 - style_config(typeface, size, color, type) { + style_config(typeface, size, color, type, theme) { let style = `font-weight:${typeface}; font-size: ${size * 2}rpx;`; if (type == 'gradient') { style += this.button_gradient; + } else if (type == 'title') { + if (['1', '6'].includes(theme)) { + style += `line-height: ${size}px;height: ${size}px;color: ${color};`; + } else if (['0', '2', '3', '4', '5'].includes(theme)) { + style += `line-height: ${size > 0 ? size + 3 : 0}px;height: ${size > 0 ? (size + 3) * 2 : 0}px;color: ${color};`; + } + } else if (type == 'desc') { + style += `line-height: ${size}px;height: ${size}px;color: ${color};`; } else { style += `color: ${color};`; } diff --git a/components/diy/seckill.vue b/components/diy/seckill.vue index 27bf64ef..ec036fa1 100644 --- a/components/diy/seckill.vue +++ b/components/diy/seckill.vue @@ -37,7 +37,7 @@