826/1404

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;

pages/useList/useList.vue

@@ -63,9 +63,9 @@
           </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"