diff --git a/components/cashFlowCard/cashFlowCard.vue b/components/cashFlowCard/cashFlowCard.vue new file mode 100644 index 0000000..64c8e11 --- /dev/null +++ b/components/cashFlowCard/cashFlowCard.vue @@ -0,0 +1,209 @@ + + + + + \ No newline at end of file diff --git a/pages/cashFlow/cashFlow.vue b/pages/cashFlow/cashFlow.vue index 5a68c9e..5cc0d37 100644 --- a/pages/cashFlow/cashFlow.vue +++ b/pages/cashFlow/cashFlow.vue @@ -15,8 +15,7 @@ - - + - - - 428 - - 200 - 201 - - - - - - - - 1 - 2 - - - 3 - 4 - - - - 2222 - - {{ item.date }} - + @@ -94,10 +68,11 @@ import commonEnum from '../../enum/commonEnum' 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' export default { name: 'CashFlowPage', - components: { uniPopup }, + components: { uniPopup, CashFlowCard }, data() { const currentDate = this.getDate() return { @@ -125,30 +100,46 @@ export default { '公益', '发红包', ], - billList: [ + cardList: [ { - date: '5月31日 星期六', - type: '支出', - category: '购物', - time: '22:08', - merchant: '京东商城平台商户', - amount: '-11.40', + date: '4月28日', + outflow: 200.0, + inflow: 200.0, + items: [ + { + title: '提现', + status: '审核中', + time: '15:22', + orderNumber: '213646848744124758', + amount: -200.0, + }, + { + title: '订单', + time: '15:22', + orderNumber: '213646848744124758', + amount: 200.0, + }, + ], }, { - date: '5月31日 星期六', - type: '支出', - category: '购物', - time: '22:08', - merchant: '京东商城平台商户', - amount: '-11.40', - }, - { - date: '5月31日 星期六', - type: '支出', - category: '购物', - time: '22:08', - merchant: '京东商城平台商户', - amount: '-11.40', + date: '4月28日', + outflow: 200.0, + inflow: 200.0, + items: [ + { + title: '提现', + status: '审核中', + time: '15:22', + orderNumber: '213646848744124758', + amount: -200.0, + }, + { + title: '订单', + time: '15:22', + orderNumber: '213646848744124758', + amount: 200.0, + }, + ], }, ], } @@ -260,19 +251,6 @@ export default { } } -// 主要内容区域 -.card { - position: relative; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - background: #ffffff; - border-radius: 20rpx; - margin: 12rpx 22rpx 12rpx 22rpx; - padding: 40rpx; -} - view { // border: #16ff00 1px solid; }