From 6054e64192ac7903f1676dca41eb50eaee658c74 Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Tue, 26 Aug 2025 14:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cashFlow/cashFlow.vue | 20 +++++++++-----------
 pages/useList/useList.vue   | 12 ++++++------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pages/cashFlow/cashFlow.vue b/pages/cashFlow/cashFlow.vue
index db48f95..49f713d 100644
--- a/pages/cashFlow/cashFlow.vue
+++ b/pages/cashFlow/cashFlow.vue
@@ -8,7 +8,10 @@
     <!-- 头部区域 -->
     <custom-nav-bar3 title="收支明细"></custom-nav-bar3>
     <view :style="{ height: getNavBarHeight() + 'px' }" class="fill"></view>
-    <view :style="{ height: getNavBarHeight() + 'px' }" class="header">
+    <view
+      :style="{ height: getNavBarHeight() + 'px', top: getNavBarHeight() + 'px' }"
+      class="header"
+    >
       <view class="all-type">
         <image :src="commonEnum.TYPE_SELECT" class="all-type-img" @click="openPopup">
           <text>{{ expenseType }}</text>
@@ -34,6 +37,7 @@
         <view class="cash-flow-detail">支出￥{{ expenditures }} 入账￥{{ Recorded }}</view>
       </view>
     </view>
+    <view :style="{ height: getNavBarHeight() + 'px' }" class="fill"></view>
 
     <!-- 卡片区域 -->
     <view v-if="loading" class="loading-container">
@@ -222,13 +226,6 @@ export default {
           }
         })
 
-        // 如果是"其他"类型，过滤掉提现和订单
-        if (this.expenseType === '其他') {
-          const originalCount = items.length
-          items = items.filter(item => item.bstType !== 'WITHDRAW' && item.bstType !== 'ORDER')
-          console.log(`其他类型过滤: 原始${originalCount}条，过滤后${items.length}条`)
-        }
-
         // 格式化日期显示
         const date = this.formatDateForDisplay(item.createTime)
 
@@ -295,7 +292,8 @@ export default {
 
 .header {
   //background: #13c622;
-  position: relative;
+  position: fixed;
+  top: 0;
   display: flex;
   flex-direction: column;
   padding-left: 40rpx;
@@ -397,7 +395,7 @@ view {
   color: #f5f5f5;
   //border-radius: 50rpx;
   margin: 0 0;
-  width: 30%;
+  width: 48%;
   height: 100rpx;
   font-size: 28rpx;
   display: flex;
@@ -414,7 +412,7 @@ view {
 }
 
 .type-item {
-  width: 45%;
+  width: 48%;
   height: 100rpx;
   background-color: #fff;
   border-radius: 10rpx;
diff --git a/pages/useList/useList.vue b/pages/useList/useList.vue
index 5e0d0f2..234bc5f 100644
--- a/pages/useList/useList.vue
+++ b/pages/useList/useList.vue
@@ -63,18 +63,18 @@
           </view>
 
           <view
-            v-for="(device, deviceIndex) in user.devices.slice(
+            v-for="(device, deviceIndex) in user.orders?.slice(
               0,
-              user.isExpanded ? user.devices.length : 1
+              user.isExpanded ? user.orders.length : 1
             )"
             :key="deviceIndex"
             class="table-row"
           >
-            <text class="table-cell">{{ device.type }}</text>
+            <text class="table-cell">{{ device.typeName }}</text>
             <text class="table-cell amount-cell">¥ {{ device.amount }}</text>
-            <text class="table-cell">{{ device.rentDate }}</text>
-            <text class="table-cell period-cell">{{ device.period }}</text>
-            <text class="table-cell expiry-cell">{{ device.expiryDate }}</text>
+            <text class="table-cell">{{ device.leaseTime }}</text>
+            <text class="table-cell period-cell">{{ device.suitName }}</text>
+            <text class="table-cell expiry-cell">{{ device.expirationTime }}</text>
           </view>
         </view>