From 738f4b23eb298f250a538ecc2429b9e37accf098 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 30 Oct 2024 10:53:56 +0800
Subject: [PATCH 1/4] =?UTF-8?q?1.=E9=80=89=E9=A1=B9=E5=8D=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                |  8 ++++----
 components/diy/diy.vue | 29 +++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/App.vue b/App.vue
index 1c1e2dc8..9c862d64 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 21243944..c461afc7 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -8,8 +8,10 @@
                 </view>
                 <view class="content flex-col" :style="'padding-top:' + (temp_is_header_top ? temp_header_top : '0')">
                     <view v-for="item in tabs_data" :key="item.key">
-                        <componentDiyTabs v-if="item.key == 'tabs'" :propValue="item.com_data" :propTop="temp_header_top" :propNavIsTop="is_header_top" :propTabsIsTop="temp_is_header_top" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event"></componentDiyTabs>
-                        <componentDiyTabsCarousel v-else-if="item.key == 'tabs-carousel'" :propValue="item.com_data" :propTop="temp_header_top" :propNavIsTop="is_header_top" :propTabsIsTop="temp_is_header_top" :propCustomNavHeight="!is_immersion_model && is_header_top ? (is_search_alone_row ? 66 + data_alone_row_space : 33) : 0" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event" @onVideoPlay="video_play"></componentDiyTabsCarousel>
+                        <template v-if="item.is_enable == '1'">
+                            <componentDiyTabs v-if="item.key == 'tabs'" :propValue="item.com_data" :propTop="temp_header_top" :propNavIsTop="is_header_top" :propTabsIsTop="temp_is_header_top" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event"></componentDiyTabs>
+                            <componentDiyTabsCarousel v-else-if="item.key == 'tabs-carousel'" :propValue="item.com_data" :propTop="temp_header_top" :propNavIsTop="is_header_top" :propTabsIsTop="temp_is_header_top" :propCustomNavHeight="!is_immersion_model && is_header_top ? (is_search_alone_row ? 66 + data_alone_row_space : 33) : 0" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event" @onVideoPlay="video_play"></componentDiyTabsCarousel>
+                        </template>
                     </view>
                     <template v-if="is_tabs_type">
                         <template v-if="diy_data.length > 0">
@@ -247,6 +249,7 @@
                 // 顶部导航是否换行
                 is_search_alone_row: false,
                 data_alone_row_space: 0,
+                is_have_tabs: false,
             };
         },
         watch: {
@@ -308,6 +311,7 @@
                         new_diy_index++;
                     }
                 });
+
                 // tabs选项卡数据过滤
                 this.setData({
                     header_data: header,
@@ -326,9 +330,15 @@
                     data_alone_row_space: parseInt(header.com_data.style.data_alone_row_space || 5),
                     is_immersive_style_and_general_safe_distance_value: header_style.immersive_style == '1' && header_style.general_safe_distance_value == '1',
                 });
-                var client_value = app.globalData.application_client_type();
-                var client_brand = app.globalData.application_client_brand();
-                if (client_value == 'h5' || client_brand == 'devtools') {
+                // 判断是否有选项卡切选项卡数组数据内的字段is_enable值是否为1
+                if (this.tabs_data.length > 0) {
+                    this.tabs_data.forEach((item, index) => {
+                        if (item.is_enable == '1') {
+                            this.setData({
+                                is_have_tabs: true,
+                            });
+                        }
+                    });
                 }
                 // 缓存数据
                 uni.setStorageSync(this.cache_key + this.tabs_home_id, diy_data);
@@ -416,9 +426,12 @@
             },
             // 选项卡高度
             tabs_height_event(height) {
-                this.setData({
-                    tabs_height: height,
-                });
+                // 判断是否有选项卡
+                if (this.is_have_tabs) {
+                    this.setData({
+                        tabs_seat_height: height,
+                    });
+                }
             },
 
             // 滚动加载

From 7fad5510302e67766d754ac5c2487c1558fed046 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 30 Oct 2024 11:32:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1.=E9=80=89=E9=A1=B9=E5=8D=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/diy.vue  | 30 ++++++++++++++----------------
 components/diy/tabs.vue |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index c461afc7..a733e8bc 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -249,7 +249,6 @@
                 // 顶部导航是否换行
                 is_search_alone_row: false,
                 data_alone_row_space: 0,
-                is_have_tabs: false,
             };
         },
         watch: {
@@ -311,7 +310,6 @@
                         new_diy_index++;
                     }
                 });
-
                 // tabs选项卡数据过滤
                 this.setData({
                     header_data: header,
@@ -330,16 +328,6 @@
                     data_alone_row_space: parseInt(header.com_data.style.data_alone_row_space || 5),
                     is_immersive_style_and_general_safe_distance_value: header_style.immersive_style == '1' && header_style.general_safe_distance_value == '1',
                 });
-                // 判断是否有选项卡切选项卡数组数据内的字段is_enable值是否为1
-                if (this.tabs_data.length > 0) {
-                    this.tabs_data.forEach((item, index) => {
-                        if (item.is_enable == '1') {
-                            this.setData({
-                                is_have_tabs: true,
-                            });
-                        }
-                    });
-                }
                 // 缓存数据
                 uni.setStorageSync(this.cache_key + this.tabs_home_id, diy_data);
             },
@@ -426,11 +414,21 @@
             },
             // 选项卡高度
             tabs_height_event(height) {
-                // 判断是否有选项卡
-                if (this.is_have_tabs) {
-                    this.setData({
-                        tabs_seat_height: height,
+                // 判断是否有选项卡切选项卡数组数据内的字段is_enable值是否为1
+                if (this.tabs_data.length > 0) {
+                    this.tabs_data.forEach((item, index) => {
+                        if (item.is_enable == '1') {
+                            this.setData({
+                                tabs_height: height,
+                            });
+                            console.log(height);
+                        }
                     });
+                } else {
+                    this.setData({
+                        tabs_height: 0,
+                    });
+                    console.log(2);
                 }
             },
 
diff --git a/components/diy/tabs.vue b/components/diy/tabs.vue
index e1a6502c..b116171e 100644
--- a/components/diy/tabs.vue
+++ b/components/diy/tabs.vue
@@ -85,7 +85,7 @@
         mounted() {
             setTimeout(() => {
                 this.get_tabs_height();
-            });
+            }, 500);
         },
         // 属性值改变监听
         watch: {

From 7302ed36ae3fc879242f25b8fb6388e0d1de1447 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 30 Oct 2024 11:49:46 +0800
Subject: [PATCH 3/4] =?UTF-8?q?1.=E9=80=89=E9=A1=B9=E5=8D=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/tabs.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/diy/tabs.vue b/components/diy/tabs.vue
index b116171e..4b80669f 100644
--- a/components/diy/tabs.vue
+++ b/components/diy/tabs.vue
@@ -85,16 +85,16 @@
         mounted() {
             setTimeout(() => {
                 this.get_tabs_height();
-            }, 500);
+            }, 100);
         },
         // 属性值改变监听
         watch: {
             // 数据
             propTabsIsTop(value, old_value) {
                 this.init();
-                this.$nextTick(() => {
+                setTimeout(() => {
                     this.get_tabs_height();
-                });
+                }, 100);
             },
             propKey(val) {
                 // 初始化

From 7410dd0c5bdfa70a2b41dd27761b4e9fa41b4f4f Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 30 Oct 2024 11:52:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?1.=E9=80=89=E9=A1=B9=E5=8D=A1=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/diy.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index a733e8bc..90fa382c 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -414,22 +414,18 @@
             },
             // 选项卡高度
             tabs_height_event(height) {
+                let new_tabs_height = 0;
                 // 判断是否有选项卡切选项卡数组数据内的字段is_enable值是否为1
                 if (this.tabs_data.length > 0) {
                     this.tabs_data.forEach((item, index) => {
                         if (item.is_enable == '1') {
-                            this.setData({
-                                tabs_height: height,
-                            });
-                            console.log(height);
+                            new_tabs_height = height;
                         }
                     });
-                } else {
-                    this.setData({
-                        tabs_height: 0,
-                    });
-                    console.log(2);
                 }
+                this.setData({
+                    tabs_height: new_tabs_height,
+                });
             },
 
             // 滚动加载