From 4f44c739399f431ae0ccc08cda9993fcddc11d3b Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 27 Sep 2024 13:38:38 +0800
Subject: [PATCH] =?UTF-8?q?1.diy---=E7=BD=AE=E9=A1=B6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/article-tabs.vue      | 4 ++--
 components/diy/diy.vue               | 8 ++++----
 components/diy/goods-tabs.vue        | 4 ++--
 components/diy/modules/tabs-view.vue | 2 +-
 components/diy/tabs-carousel.vue     | 4 ++--
 components/diy/tabs.vue              | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue
index 43d7bb01..9f1d1e3a 100644
--- a/components/diy/article-tabs.vue
+++ b/components/diy/article-tabs.vue
@@ -1,7 +1,7 @@
 <template>
     <!-- 文章列表 -->
     <view class="ou" :style="style_container">
-        <componentDiyModulesTabsView :propValue="article_tabs" :propIsTop="top_up == '1'" :propTop="propStickyTop" :propStyle="tabs_style + 'padding-bottom:24rpx;'" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
+        <componentDiyModulesTabsView :propValue="article_tabs" :propIsTop="top_up == '1'" :propTop="propTop" :propStyle="tabs_style + 'padding-bottom:24rpx;'" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
         <view class="oh">
             <componentDiyArticleList v-if="hackReset" :propValue="article_tabs" :propIsCommonStyle="false"></componentDiyArticleList>
         </view>
@@ -23,7 +23,7 @@
                 type: Object,
                 default: () => {},
             },
-            propStickyTop: {
+            propTop: {
                 type: Number,
                 default: 0,
             },
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index df19dcc2..a177145e 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -6,8 +6,8 @@
         </view>
         <view class="content flex-col" :style="'padding-top:' + header_top">
             <template v-for="(item, index) in tabs_data">
-                <componentDiyTabs v-if="item.key == 'tabs'" :key="index" :propValue="item.com_data" :propStickyTop="sticky_top" @tabs-click="tabs_click_event"></componentDiyTabs>
-                <componentDiyTabsCarousel v-else-if="item.key == 'tabs-carousel'" :propValue="item.com_data" :propStickyTop="sticky_top" @tabs-click="tabs_click_event"></componentDiyTabsCarousel>
+                <componentDiyTabs v-if="item.key == 'tabs'" :key="index" :propValue="item.com_data" :propTop="sticky_top" @tabs-click="tabs_click_event"></componentDiyTabs>
+                <componentDiyTabsCarousel v-else-if="item.key == 'tabs-carousel'" :propValue="item.com_data" :propTop="sticky_top" @tabs-click="tabs_click_event"></componentDiyTabsCarousel>
             </template>
             <template v-if="is_tabs_type">
                 <template v-if="diy_data.length > 0">
@@ -21,8 +21,8 @@
                         <componentDiyVideo v-else-if="item.key == 'video'" :propValue="item.com_data"></componentDiyVideo>
                         <componentDiyArticleList v-else-if="item.key == 'article-list'" :propValue="item.com_data"></componentDiyArticleList>
 
-                        <componentDiyArticleTabs v-else-if="item.key == 'article-tabs'" :propValue="item.com_data" :propStickyTop="sticky_top"></componentDiyArticleTabs>
-                        <componentDiyGoodsTabs v-else-if="item.key == 'goods-tabs'" :propValue="item.com_data" :propStickyTop="sticky_top"></componentDiyGoodsTabs>
+                        <componentDiyArticleTabs v-else-if="item.key == 'article-tabs'" :propValue="item.com_data" :propTop="sticky_top"></componentDiyArticleTabs>
+                        <componentDiyGoodsTabs v-else-if="item.key == 'goods-tabs'" :propValue="item.com_data" :propTop="sticky_top"></componentDiyGoodsTabs>
 
                         <componentDiyGoodsList v-else-if="item.key == 'goods-list'" :propValue="item.com_data"></componentDiyGoodsList>
                         <componentDiyDataMagic v-else-if="item.key == 'data-magic'" :propValue="item.com_data"></componentDiyDataMagic>
diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
index a48ac880..ca61e4ec 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="ou" :style="style_container">
-        <componentDiyModulesTabsView :propValue="goods_tabs" :propIsTop="top_up == '1'" :propTop="propStickyTop" :propStyle="tabs_style + 'padding-bottom:24rpx;'" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
+        <componentDiyModulesTabsView :propValue="goods_tabs" :propIsTop="top_up == '1'" :propTop="propTop" :propStyle="tabs_style + 'padding-bottom:24rpx;'" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
         <view class="oh">
             <componentGoodsList v-if="hackReset" :propValue="goods_tabs" :propIsCommonStyle="false"></componentGoodsList>
         </view>
@@ -28,7 +28,7 @@
                     return {};
                 },
             },
-            propStickyTop: {
+            propTop: {
                 type: Number,
                 default: 0,
             },
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
index 40214799..ef0f95b3 100644
--- a/components/diy/modules/tabs-view.vue
+++ b/components/diy/modules/tabs-view.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 文章列表  66rpx是自定义顶部导航栏的高度-->
-    <uv-sticky :disabled="!propIsTop" :offset-top="propTop" zIndex="101" customNavHeight="66rpx" bgColor="#fff">
+    <uv-sticky :disabled="!propIsTop" :offset-top="propTop" zIndex="2" customNavHeight="66rpx" bgColor="#fff">
         <view class="flex-row gap-10 jc-sb align-c" :style="propStyle">
             <view class="tabs flex-1 flex-width">
                 <scroll-view :scroll-x="true" :show-scrollbar="false" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + active_index" class="wh-auto">
diff --git a/components/diy/tabs-carousel.vue b/components/diy/tabs-carousel.vue
index eae5f1c7..e8294d49 100644
--- a/components/diy/tabs-carousel.vue
+++ b/components/diy/tabs-carousel.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="flex-col ou" :style="style_container">
-        <componentDiyModulesTabsView :propValue="propValue" :propIsTop="top_up == '1'" :propTop="propStickyTop" :propStyle="tabs_style" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
+        <componentDiyModulesTabsView :propValue="propValue" :propIsTop="top_up == '1'" :propTop="propTop" :propStyle="tabs_style" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
         <componentDiycarousel :propValue="propValue" :propIsCommon="false"></componentDiycarousel>
     </view>
 </template>
@@ -21,7 +21,7 @@
                     return {};
                 },
             },
-            propStickyTop: {
+            propTop: {
                 type: Number,
                 default: 0,
             },
diff --git a/components/diy/tabs.vue b/components/diy/tabs.vue
index 949b4438..d40ee0a0 100644
--- a/components/diy/tabs.vue
+++ b/components/diy/tabs.vue
@@ -1,11 +1,11 @@
 <template>
     <!-- 选项卡 -->
-    <componentDiyModulesTabsView :propValue="tabs_data" propIsTabsIcon :propIsTop="top_up == '1'" :propTop="propStickyTop" :propStyle="style_container" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
+    <componentDiyModulesTabsView :propValue="tabs_data" propIsTabsIcon :propIsTop="top_up == '1'" :propTop="propTop" :propStyle="style_container" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
 </template>
 
 <script>
     const app = getApp();
-    import { common_styles_computer, padding_computer, margin_computer } from '@/common/js/common/common.js';
+    import { common_styles_computer } from '@/common/js/common/common.js';
     import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
     // 状态栏高度
     var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
@@ -18,7 +18,7 @@
                 type: Object,
                 default: () => ({}),
             },
-            propStickyTop: {
+            propTop: {
                 type: Number,
                 default: 0,
             },