From bd5578e5d1aa1a6bfe099306621e76d0f5274499 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 25 Sep 2024 18:46:50 +0800
Subject: [PATCH] =?UTF-8?q?1.diy---=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                  |  2 +-
 components/diy/article-tabs.vue      | 14 ++++++++------
 components/diy/goods-tabs.vue        | 15 +++++++++++----
 components/diy/modules/tabs-view.vue | 10 +++++++++-
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index 191c5b65..43ba7165 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -236,7 +236,7 @@ button:before {
     z-index: 2 !important;
 }
 .z-i-deep-must {
-    z-index: 9 !important;
+    z-index: 999 !important;
 }
 .bs-bb {
     box-sizing: border-box;
diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue
index dacae2ee..d04bd912 100644
--- a/components/diy/article-tabs.vue
+++ b/components/diy/article-tabs.vue
@@ -1,10 +1,8 @@
 <template>
     <!-- 文章列表 -->
-    <view class="pr" :style="style_container">
-        <view :class="top_up == '1' ? 'ps z-i-deep-must top-0' : ''">
-            <componentDiyModulesTabsView :value="article_tabs" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
-        </view>
-        <view class="padding-top">
+    <view class="overflow-unset" :style="style_container">
+        <componentDiyModulesTabsView :value="article_tabs" :is-top="top_up == '1'" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
+        <view class="padding-top oh">
             <componentDiyArticleList :key="key" :value="article_tabs" :is-common-style="false"></componentDiyArticleList>
         </view>
     </view>
@@ -86,4 +84,8 @@
         },
     };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+    .overflow-unset {
+        overflow: unset !important;
+    }
+</style>
diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
index 4750466b..1c27c67f 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -1,7 +1,7 @@
 <template>
-    <view :style="style_container">
-        <componentDiyModulesTabsView :value="goods_tabs" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
-        <view class="padding-top">
+    <view class="overflow-unset" :style="style_container">
+        <componentDiyModulesTabsView :value="goods_tabs" :is-top="top_up == '1'" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
+        <view class="padding-top oh">
             <componentGoodsList :key="key" :value="goods_tabs" :is-common-style="false"></componentGoodsList>
         </view>
     </view>
@@ -29,6 +29,7 @@
                 style_container: '',
                 goods_tabs: {},
                 key: 1,
+                top_up: '0',
             };
         },
         created() {
@@ -36,8 +37,10 @@
         },
         methods: {
             init() {
+                const new_content = this.value.content || {};
                 const new_style = this.value.style || {};
                 let new_data = JSON.parse(JSON.stringify(this.value));
+                this.top_up = new_content.tabs_top_up;
                 // 产品的值
                 new_data.content.data_type = new_data.content.tabs_list[0].data_type;
                 new_data.content.category = new_data.content.tabs_list[0].category;
@@ -71,4 +74,8 @@
     };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+    .overflow-unset {
+        overflow: unset !important;
+    }
+</style>
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
index 23b1e84c..7da6b359 100644
--- a/components/diy/modules/tabs-view.vue
+++ b/components/diy/modules/tabs-view.vue
@@ -1,6 +1,6 @@
 <template>
     <!-- 文章列表 -->
-    <view class="container">
+    <view class="container" :class="isTop ? 'ps z-i-deep-must bg-white' : ''" :style="'top:' + top + 'px;'">
         <view class="flex-row gap-10 jc-sb align-c">
             <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">
@@ -60,6 +60,14 @@
                 type: Boolean,
                 default: false,
             },
+            isTop: {
+                type: Boolean,
+                default: false,
+            },
+            top: {
+                type: String,
+                default: '0',
+            },
         },
         components: {
             componentPopup,