826/1404
This commit is contained in:
parent
44d3469bc1
commit
80d60191b0
|
|
@ -8,7 +8,10 @@
|
||||||
<!-- 头部区域 -->
|
<!-- 头部区域 -->
|
||||||
<custom-nav-bar3 title="收支明细"></custom-nav-bar3>
|
<custom-nav-bar3 title="收支明细"></custom-nav-bar3>
|
||||||
<view :style="{ height: getNavBarHeight() + 'px' }" class="fill"></view>
|
<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">
|
<view class="all-type">
|
||||||
<image :src="commonEnum.TYPE_SELECT" class="all-type-img" @click="openPopup">
|
<image :src="commonEnum.TYPE_SELECT" class="all-type-img" @click="openPopup">
|
||||||
<text>{{ expenseType }}</text>
|
<text>{{ expenseType }}</text>
|
||||||
|
|
@ -34,6 +37,7 @@
|
||||||
<view class="cash-flow-detail">支出¥{{ expenditures }} 入账¥{{ Recorded }}</view>
|
<view class="cash-flow-detail">支出¥{{ expenditures }} 入账¥{{ Recorded }}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view :style="{ height: getNavBarHeight() + 'px' }" class="fill"></view>
|
||||||
|
|
||||||
<!-- 卡片区域 -->
|
<!-- 卡片区域 -->
|
||||||
<view v-if="loading" class="loading-container">
|
<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)
|
const date = this.formatDateForDisplay(item.createTime)
|
||||||
|
|
||||||
|
|
@ -295,7 +292,8 @@ export default {
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
//background: #13c622;
|
//background: #13c622;
|
||||||
position: relative;
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
padding-left: 40rpx;
|
padding-left: 40rpx;
|
||||||
|
|
@ -397,7 +395,7 @@ view {
|
||||||
color: #f5f5f5;
|
color: #f5f5f5;
|
||||||
//border-radius: 50rpx;
|
//border-radius: 50rpx;
|
||||||
margin: 0 0;
|
margin: 0 0;
|
||||||
width: 30%;
|
width: 48%;
|
||||||
height: 100rpx;
|
height: 100rpx;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -414,7 +412,7 @@ view {
|
||||||
}
|
}
|
||||||
|
|
||||||
.type-item {
|
.type-item {
|
||||||
width: 45%;
|
width: 48%;
|
||||||
height: 100rpx;
|
height: 100rpx;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
border-radius: 10rpx;
|
border-radius: 10rpx;
|
||||||
|
|
|
||||||
|
|
@ -63,9 +63,9 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view
|
<view
|
||||||
v-for="(device, deviceIndex) in user.devices.slice(
|
v-for="(device, deviceIndex) in user.orders?.slice(
|
||||||
0,
|
0,
|
||||||
user.isExpanded ? user.devices.length : 1
|
user.isExpanded ? user.orders.length : 1
|
||||||
)"
|
)"
|
||||||
:key="deviceIndex"
|
:key="deviceIndex"
|
||||||
class="table-row"
|
class="table-row"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user