From a5f8464bb0f99de052b878c2864b8bff5d65441e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Thu, 26 Dec 2024 10:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 4 ++-- components/diy/article-tabs.vue | 23 ++++++++++++++--------- components/diy/goods-tabs.vue | 20 ++++++++++++-------- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/App.vue b/App.vue index 79b838d1..b2b9f0ff 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-tabs.vue b/components/diy/article-tabs.vue index 79f990f0..7502196a 100644 --- a/components/diy/article-tabs.vue +++ b/components/diy/article-tabs.vue @@ -93,6 +93,8 @@ // #ifdef APP nav_safe_space: bar_height + 0, // #endif + // 选项卡默认数据 + tabs_index: 0, }; }, watch: { @@ -149,18 +151,20 @@ let new_content = this.propValue.content || {}; let new_style = this.propValue.style || {}; let new_data = JSON.parse(JSON.stringify(this.propValue)); + + const new_tabs_data = new_data.content.tabs_list[this.tabs_index] || {}; new_data.content.theme = new_data.content.article_theme; - new_data.content.data_type = new_data.content.tabs_list[0].data_type; - new_data.content.category = new_data.content.tabs_list[0].category; + new_data.content.data_type = new_tabs_data.data_type; + new_data.content.category = new_tabs_data.category; new_data.content.carousel_col = new_data.content.article_carousel_col; - new_data.content.data_list = new_data.content.tabs_list[0].data_list; - new_data.content.data_auto_list = new_data.content.tabs_list[0].data_auto_list; - new_data.content.data_ids = new_data.content.tabs_list[0].data_ids; - new_data.content.number = new_data.content.tabs_list[0].number; - new_data.content.sort = new_data.content.tabs_list[0].sort; - new_data.content.sort_rules = new_data.content.tabs_list[0].sort_rules; + new_data.content.data_list = new_tabs_data.data_list; + new_data.content.data_auto_list = new_tabs_data.data_auto_list; + new_data.content.data_ids = new_tabs_data.data_ids; + new_data.content.number = new_tabs_data.number; + new_data.content.sort = new_tabs_data.sort; + new_data.content.sort_rules = new_tabs_data.sort_rules; new_data.content.field_show = new_data.content.field_show; - new_data.content.is_cover = new_data.content.tabs_list[0].is_cover; + new_data.content.is_cover = new_tabs_data.is_cover; let tabs_style_obj = { padding_top: new_style.common_style.padding_top, padding_left: new_style.common_style.padding_left, @@ -217,6 +221,7 @@ new_data.content.field_show = new_data.content.field_show; new_data.content.is_cover = new_data.content.tabs_list[index].is_cover; this.setData({ + tabs_index: index, article_tabs: new_data, diy_key: Math.random(), }); diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue index 6fcef15a..003f8621 100644 --- a/components/diy/goods-tabs.vue +++ b/components/diy/goods-tabs.vue @@ -92,6 +92,8 @@ // #ifdef APP nav_safe_space: bar_height + 0, // #endif + // 选项卡默认数据 + tabs_index: 0, }; }, watch: { @@ -146,15 +148,16 @@ let new_data = typeof this.propValue == 'string' ? JSON.parse(JSON.stringify(this.propValue)) : this.propValue; const new_content = new_data.content || {}; const new_style = new_data.style || {}; + const new_tabs_data = new_data.content.tabs_list[this.tabs_index] || {}; // 产品的值 - new_data.content.data_type = new_data.content.tabs_list[0].data_type; - new_data.content.category = new_data.content.tabs_list[0].category; - new_data.content.brand = new_data.content.tabs_list[0].brand; - new_data.content.number = new_data.content.tabs_list[0].number; - new_data.content.sort = new_data.content.tabs_list[0].sort; - new_data.content.sort_rules = new_data.content.tabs_list[0].sort_rules; - new_data.content.data_list = new_data.content.tabs_list[0].data_list; - new_data.content.data_auto_list = new_data.content.tabs_list[0].data_auto_list; + new_data.content.data_type = new_tabs_data.data_type; + new_data.content.category = new_tabs_data.category; + new_data.content.brand = new_tabs_data.brand; + new_data.content.number = new_tabs_data.number; + new_data.content.sort = new_tabs_data.sort; + new_data.content.sort_rules = new_tabs_data.sort_rules; + new_data.content.data_list = new_tabs_data.data_list; + new_data.content.data_auto_list = new_tabs_data.data_auto_list; let tabs_style_obj = { padding_top: new_style.common_style.padding_top, padding_left: new_style.common_style.padding_left, @@ -207,6 +210,7 @@ new_data.content.data_list = new_data.content.tabs_list[index].data_list; new_data.content.data_auto_list = new_data.content.tabs_list[index].data_auto_list; this.setData({ + tabs_index: index, goods_tabs: new_data, diy_key: Math.random(), });