diff --git a/childPackage/pages/billDetail/index.wxml b/childPackage/pages/billDetail/index.wxml index 26cc9d4..443e46a 100644 --- a/childPackage/pages/billDetail/index.wxml +++ b/childPackage/pages/billDetail/index.wxml @@ -11,7 +11,7 @@ - 用电地址: + 商户地址: {{ detail.tenement.address }} diff --git a/childPackage/pages/electricQuery/components/accountingCard/index.wxml b/childPackage/pages/electricQuery/components/accountingCard/index.wxml index 5cae3e3..1146bb3 100644 --- a/childPackage/pages/electricQuery/components/accountingCard/index.wxml +++ b/childPackage/pages/electricQuery/components/accountingCard/index.wxml @@ -1,41 +1,72 @@ - - {{data.meter.address}} - - - - 初始余额 - - - {{data.startMoney}} - - - - - 储值累计金额 - - - {{data.rechargeMoney}} - - - - - 电费 - - - {{data.electricMoney}} - - - - - - 账务余额 - + + {{data.meter.address}}电表编号:{{data.meter.sn}} + + + + + 类目 + 金额 + 更新时间 + + + + 初始余额 + + + {{data.startMoney}} + + + {{data.updateStartMoneyAt}} + + - - - {{data.currentMoney}} - - + + + 累计充值金额 + + + {{data.rechargeMoney}} + + + {{data.updateRechargeMoneyAt}} + + + + + + 电费 + + + {{data.electricMoney}} + + + {{data.updateElectricMoneyAt}} + + + + + + 账务余额 + + + {{data.accountMoney}} + + + {{data.updateAccountMoneyAt}} + + + + + + 电表余额 + + + {{data.meterMoney}} + + + {{data.updateMeterMoneyAt}} + + \ No newline at end of file diff --git a/childPackage/pages/electricQuery/components/accountingCard/index.wxss b/childPackage/pages/electricQuery/components/accountingCard/index.wxss index c538ef6..bd91984 100644 --- a/childPackage/pages/electricQuery/components/accountingCard/index.wxss +++ b/childPackage/pages/electricQuery/components/accountingCard/index.wxss @@ -21,4 +21,21 @@ margin-bottom: 20rpx; text-align: center; font-size: 32rpx; -} \ No newline at end of file +} +.table-header { + display: flex; + width: 100%; + background-color: #f5f5f5; + border-bottom: 1rpx solid #eaeaea; + } + .table-header-row { + display: flex; + width: 100%; + } + .table-header-cell { + flex: 1; + text-align: center; + padding: 20rpx 0; + font-size: 25rpx; + color: #333; + } \ No newline at end of file diff --git a/childPackage/pages/electricQuery/components/reading/index.js b/childPackage/pages/electricQuery/components/reading/index.js index 6a5347e..4a8bafb 100644 --- a/childPackage/pages/electricQuery/components/reading/index.js +++ b/childPackage/pages/electricQuery/components/reading/index.js @@ -35,7 +35,7 @@ Component({ meterReadingHeader: [ { key: 'address', title: '电表地址', renderBody: (item) => item.meter?.address }, { title: '倍率', key: 'ratio' }, - { key: 'number', title: '抄表记录' }, + { key: 'number', title: '当前表字' }, ], meterReadingList: [], yearMonthDayReading: dayjs().format("YYYY-MM-DD"), diff --git a/childPackage/pages/electricQuery/components/reading/index.wxml b/childPackage/pages/electricQuery/components/reading/index.wxml index 204d925..b73f004 100644 --- a/childPackage/pages/electricQuery/components/reading/index.wxml +++ b/childPackage/pages/electricQuery/components/reading/index.wxml @@ -49,54 +49,102 @@ label="地址" readonly /> + + + + + + + + + + + + + + 上次抄表记录起,至现在时间内的用电量 diff --git a/childPackage/pages/electricQuery/components/reading/index.wxss b/childPackage/pages/electricQuery/components/reading/index.wxss index 3779087..a9a3c5d 100644 --- a/childPackage/pages/electricQuery/components/reading/index.wxss +++ b/childPackage/pages/electricQuery/components/reading/index.wxss @@ -92,4 +92,11 @@ page { content:""; display:block; clear:both + } + + .text{ + font-size: 28rpx; + color: #999999; + margin: 10rpx 0; + text-align: center; } \ No newline at end of file diff --git a/childPackage/pages/electricQuery/index.wxml b/childPackage/pages/electricQuery/index.wxml index 3598af7..4c8c574 100644 --- a/childPackage/pages/electricQuery/index.wxml +++ b/childPackage/pages/electricQuery/index.wxml @@ -30,23 +30,25 @@ - 日耗量 + 日用电量 - 月耗量 + 月电用量 - 年耗量 + 年用电量 - 不包括线损电量,显示为电表实际消耗电量。仅供参考,实际能耗电量以电费账单为主。如有疑问,请联系客服。 + 不包括线损电量,显示为电表实际消用电量。仅供参考,实际能用电量以电费账单为主。如有疑问,请联系客服。 - 选择时间 + 选择时间 + 选择日期 + 选择月份 {{yearMonthDay}} {{yearMonth}} @@ -63,7 +65,10 @@ - 账务余额更新时间为:每次预存电费后,每次账单发布后,剩余的实际金额。电表余额与账务余额相差较大的用户,每半年统一处理一次。 + 账务余额更新时间为:每次预存电费后,每次发布账单后剩余的实际金额。 + + + 计算公式:账务余额 = 初始余额 + 累充充值金额 - 电费 @@ -95,7 +100,7 @@ /> - 合计:表计数量:{{meterNumber}},耗电量:{{electricNumber}} + 合计:表计数量:{{meterNumber}},用电量:{{electricNumber}} diff --git a/pages/rechargeDetail/index.wxml b/pages/rechargeDetail/index.wxml index e054c66..41cf703 100644 --- a/pages/rechargeDetail/index.wxml +++ b/pages/rechargeDetail/index.wxml @@ -12,7 +12,7 @@ />