From 3e2bdb482e957b5cf72b3c8f17323c6c637fd968 Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Tue, 26 Aug 2025 15:56:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B6=E6=94=AF=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=97=A5=E6=9C=9F=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=88=B0=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cashFlowCard/cashFlowCard.vue      |  1 -
 .../custom-nav-bar4/custom-nav-bar4.vue       | 92 +++++++++++++++++++
 pages/cashFlow/cashFlow.vue                   | 50 +++++-----
 3 files changed, 121 insertions(+), 22 deletions(-)
 create mode 100644 components/custom-nav-bar4/custom-nav-bar4.vue

diff --git a/components/cashFlowCard/cashFlowCard.vue b/components/cashFlowCard/cashFlowCard.vue
index 8f4343c..6de829b 100644
--- a/components/cashFlowCard/cashFlowCard.vue
+++ b/components/cashFlowCard/cashFlowCard.vue
@@ -15,7 +15,6 @@
         <view class="card-item-detail">
           <view class="card-item-title">
             <view class="left">{{ item.title }}</view>
-            <view v-if="item.status" class="right">{{ item.status }}</view>
           </view>
           <view class="card-item-body">
             <view class="card-time">{{ item.time }}</view>
diff --git a/components/custom-nav-bar4/custom-nav-bar4.vue b/components/custom-nav-bar4/custom-nav-bar4.vue
new file mode 100644
index 0000000..95cf283
--- /dev/null
+++ b/components/custom-nav-bar4/custom-nav-bar4.vue
@@ -0,0 +1,92 @@
+<template>
+  <view class="layout">
+    <view class="navbar">
+      <view :style="{ height: getStatusBarHeight() + 'px' }" class="statusBar"></view>
+      <view
+        :style="{ height: getTitleBarHeight() + 'px', marginLeft: getLeftIconLeft() + 'px' }"
+        class="titleBar"
+      >
+        <view class="search">
+          <image :src="commonEnum.BACK" class="left-icon" @click="goBack"></image>
+        </view>
+        <view class="title">{{ title }}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import {
+  getStatusBarHeight,
+  getTitleBarHeight,
+  getNavBarHeight,
+  getLeftIconLeft,
+} from '@/utils/system.js'
+
+import commonEnum from '../../enum/commonEnum'
+import { navigateBack } from '../../utils/router'
+
+defineProps({
+  title: {
+    type: String,
+    default: '壁纸',
+  },
+})
+
+function goBack() {
+  navigateBack(1)
+  console.log('666')
+}
+</script>
+
+<style lang="scss" scoped>
+.layout {
+  .navbar {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    background-color: #ff803a;
+
+    .statusBar {
+    }
+
+    .titleBar {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 0 30rpx;
+
+      .title {
+        font-size: 36rpx;
+        font-weight: 400;
+        color: #ffffff;
+      }
+
+      .search {
+        position: absolute;
+        left: 0;
+        width: 220rpx;
+        height: 50rpx;
+        margin-left: 10rpx;
+        color: #3d3d3d;
+        font-size: 28rpx;
+        display: flex;
+        align-items: center;
+        //background: black;
+
+        .left-icon {
+          margin-left: 60rpx;
+          width: 18rpx;
+          height: 32rpx;
+        }
+      }
+    }
+  }
+
+  .fill {
+  }
+}
+</style>
diff --git a/pages/cashFlow/cashFlow.vue b/pages/cashFlow/cashFlow.vue
index 49f713d..8ea8587 100644
--- a/pages/cashFlow/cashFlow.vue
+++ b/pages/cashFlow/cashFlow.vue
@@ -6,10 +6,17 @@
     class="page"
   >
     <!-- 头部区域 -->
-    <custom-nav-bar3 title="收支明细"></custom-nav-bar3>
+    <custom-nav-bar4
+      :style="{ background: '#ff803a !important' }"
+      title="收支明细"
+    ></custom-nav-bar4>
     <view :style="{ height: getNavBarHeight() + 'px' }" class="fill"></view>
     <view
-      :style="{ height: getNavBarHeight() + 'px', top: getNavBarHeight() + 'px' }"
+      :style="{
+        height: getNavBarHeight() + 'px',
+        top: getNavBarHeight() + 'px',
+        background: '#ff803a',
+      }"
       class="header"
     >
       <view class="all-type">
@@ -23,8 +30,8 @@
             <view class="uni-list-cell-db">
               <picker
                 :end="endDate"
-                :start="startDate"
                 :value="date"
+                fields="month"
                 mode="date"
                 @change="bindDateChange"
               >
@@ -81,17 +88,18 @@ import { getNavBarHeight } from '../../utils/system'
 import uniPopup from '../../uni_modules/uni-popup/components/uni-popup/uni-popup.vue'
 import CashFlowCard from '../../components/cashFlowCard/cashFlowCard.vue'
 import { getBalanceLogList } from '../../api/balanceLog'
+import CustomNavBar4 from '../../components/custom-nav-bar4/custom-nav-bar4.vue'
 
 export default {
   name: 'CashFlowPage',
-  components: { uniPopup, CashFlowCard },
+  components: { CustomNavBar4, uniPopup, CashFlowCard },
   data() {
     const currentDate = this.getDate()
     return {
       getNavBarHeight,
       expenseType: '全部类型',
-      expenditures: '1000.00',
-      Recorded: '1000.00',
+      expenditures: '',
+      Recorded: '',
       date: currentDate,
       startDate: this.getDate('start'),
       endDate: this.getDate('end'),
@@ -118,7 +126,6 @@ export default {
       const date = new Date()
       let year = date.getFullYear()
       let month = date.getMonth() + 1
-      let day = date.getDate()
 
       if (type === 'start') {
         year = year - 10
@@ -127,8 +134,7 @@ export default {
         return new Date().toISOString().split('T')[0]
       }
       month = month > 9 ? month : '0' + month
-      day = day > 9 ? day : '0' + day
-      return `${year}-${month}-${day}`
+      return `${year}-${month}`
     },
     // 打开弹窗
     openPopup() {
@@ -157,8 +163,8 @@ export default {
         const endTime = now.toISOString().slice(0, 19).replace('T', ' ')
 
         const params = {
-          beginCreateTime: this.date + ' 00:00:01',
-          endCreateTime: endTime,
+          beginCreateTime: this.date + '-01 00:00:01',
+          endCreateTime: this.date + '-31 00:00:01',
         }
 
         console.log('查询参数:', {
@@ -220,7 +226,7 @@ export default {
             title: this.getTitleByBstType(log.bstType),
             status: this.getStatusByBstType(log.bstType),
             time: time,
-            orderNumber: log.id,
+            orderNumber: log.bstId,
             amount: log.amount,
             bstType: log.bstType, // 保留原始类型用于过滤
           }
@@ -253,7 +259,7 @@ export default {
     // 根据业务类型获取状态
     getStatusByBstType(bstType) {
       const statusMap = {
-        WITHDRAW: '审核中',
+        WITHDRAW: '',
         ORDER: '',
       }
       return statusMap[bstType] || ''
@@ -291,9 +297,11 @@ export default {
 }
 
 .header {
+  z-index: 999;
   //background: #13c622;
   position: fixed;
   top: 0;
+  width: 100%;
   display: flex;
   flex-direction: column;
   padding-left: 40rpx;
@@ -301,12 +309,12 @@ export default {
   .all-type {
     position: relative;
     display: flex;
-    width: 138px;
-    height: 40px;
+    width: 276rpx;
+    height: 65rpx;
 
     &-img {
-      width: 100%;
-      height: 100%;
+      width: 276rpx;
+      height: 65rpx;
       display: flex;
 
       text {
@@ -314,9 +322,9 @@ export default {
         top: 0;
         left: 0;
         width: 100%;
-        height: 40px;
+        height: 65rpx;
         color: #ffffff;
-        line-height: 40px;
+        line-height: 65rpx;
         //border: red 1px solid;
         align-items: center;
         justify-content: center;
@@ -326,9 +334,9 @@ export default {
   }
 
   .cash-flow {
-    height: 84rpx;
     display: flex;
     align-items: center;
+    //border: red 1px solid;
 
     .date {
       display: flex;
@@ -337,7 +345,7 @@ export default {
 
       image {
         width: 19px;
-        height: 11px;
+        height: 25rpx;
       }
     }