From 87a9f4a21b15a93755fced6639a811d4c70f42e5 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 25 Mar 2024 10:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=81=AE=E4=BD=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods-category/goods-category.css | 13 ++++++-------
 pages/goods-category/goods-category.vue | 22 ++++++++++------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css
index f6daf3e1..4015e78c 100644
--- a/pages/goods-category/goods-category.css
+++ b/pages/goods-category/goods-category.css
@@ -40,14 +40,10 @@
 /**
 * 左侧导航
 */
-.left-content-actual-list {
-    padding-bottom: 120rpx;
-    background-color: #f5f5f5;
-}
-
-
 .left-nav {
-    width: 200rpx;
+    width: 200rpx;
+    background-color: #f5f5f5;
+    height: 100%;
 }
 .left-nav .item {
     height: 80rpx;
@@ -58,6 +54,9 @@
 .left-nav .nav-active {
     background: #fff;
     font-weight: 500;
+}
+.left-content-actual-list {
+    height: calc(100% - 100rpx);
 }
 
 /**
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 5c67d51b..6c617552 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -74,20 +74,18 @@
                                         </component-nav-more>
                                     </view>
                                     <!-- 二级导航 -->
-                                    <view v-if="category_one_subset_count > 0" class="left-nav bg-white ht-auto">
+                                    <view v-if="category_one_subset_count > 0" :class="'left-nav '+(category_goods_is_show_cart_nav == 1 ? 'left-content-actual-list' : '')">
                                         <scroll-view :scroll-y="true" :show-scrollbar="false" class="ht-auto">
-                                            <view :class="'left-content-actual ht-auto '+(category_goods_is_show_cart_nav == 1 ? 'left-content-actual-list' : '')">
-                                                <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_item_two_index == -1 ? 'nav-active cr-main nav-left-border' : '')" :data-index="nav_active_index" :data-itemtwoindex="-1" :data-itemthreeindex="-1" @tap="nav_event">
-                                                    <text>{{ $t('common.all') }}</text>
-                                                </view>
-                                                <block v-if="(data_content || null) != null && (data_content.items || null) != null && data_content.items.length > 0">
-                                                    <block v-for="(item, index) in data_content.items" :key="index">
-                                                        <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_item_two_index == index ? 'nav-active cr-main nav-left-border' : '')" :data-index="nav_active_index" :data-itemtwoindex="index" :data-itemthreeindex="-1" @tap="nav_event">
-                                                            <text>{{ item.name }}</text>
-                                                        </view>
-                                                    </block>
-                                                </block>
+                                            <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_item_two_index == -1 ? 'nav-active cr-main nav-left-border' : '')" :data-index="nav_active_index" :data-itemtwoindex="-1" :data-itemthreeindex="-1" @tap="nav_event">
+                                                <text>{{ $t('common.all') }}</text>
                                             </view>
+                                            <block v-if="(data_content || null) != null && (data_content.items || null) != null && data_content.items.length > 0">
+                                                <block v-for="(item, index) in data_content.items" :key="index">
+                                                    <view :class="'text-size-sm item tc cr-base cp oh ' + (nav_active_item_two_index == index ? 'nav-active cr-main nav-left-border' : '')" :data-index="nav_active_index" :data-itemtwoindex="index" :data-itemthreeindex="-1" @tap="nav_event">
+                                                        <text>{{ item.name }}</text>
+                                                    </view>
+                                                </block>
+                                            </block>
                                         </scroll-view>
                                     </view>
                                     <!-- 商品列表 -->