From bfb8d05e66d3e8e3a8f487ea0cdda4ece629f515 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 27 Sep 2024 18:46:50 +0800
Subject: [PATCH] diy

---
 pages/goods-category/goods-category.vue |  7 +------
 pages/index/index.vue                   | 12 +++++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 526240c9..4ff1b93c 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -22,7 +22,7 @@
                     </block>
                     <view class="category-container">
                         <!-- 分类内容 -->
-                        <view :class="'category-content bs-bb pr ' + (category_show_level == 0 ? 'goods-model' : '')" :style="'height:calc(100vh - ' + (search_height + window_bottom_height) + 'px);'">
+                        <view :class="'category-content bs-bb pr ' + (category_show_level == 0 ? 'goods-model' : '')" :style="'height:calc(100vh - ' + search_height + 'px);'">
                             <block v-if="category_show_level == 1">
                                 <!-- 一级模式 -->
                                 <scroll-view scroll-y class="ht-auto" :show-scrollbar="false">
@@ -452,11 +452,6 @@
                 popup_status: false,
                 // 获取搜索框高度
                 search_height: 0,
-                // 底部tab高度 - 只有H5下有值
-                window_bottom_height: 0,
-                // #ifdef H5
-                window_bottom_height: uni.getWindowInfo().windowBottom || 50,
-                // #endif
                 // 样式
                 left_content_actual_style: '',
                 right_content_actual_style: '',
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7560f4b2..bb2e55d3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -272,11 +272,13 @@
 
         <!-- 页面已加载 -->
         <block v-if="load_status == 1">
-            <!-- 结尾 -->
-            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            <block v-if="data_mode != 3">
+                <!-- 结尾 -->
+                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
 
-            <!-- 版权信息 -->
-            <component-copyright></component-copyright>
+                <!-- 版权信息 -->
+                <component-copyright></component-copyright>
+            </block>
 
             <!-- 非diy模式 -->
             <block v-if="data_mode != 3">
@@ -295,7 +297,7 @@
         </block>
 
         <!-- 公共 -->
-        <component-common></component-common>
+        <component-common :propIsFooterSeat="false"></component-common>
     </view>
 </template>