diff --git a/pages/meterBalanceRecord/index.js b/pages/meterBalanceRecord/index.js index ae3edec..8e77f63 100644 --- a/pages/meterBalanceRecord/index.js +++ b/pages/meterBalanceRecord/index.js @@ -16,6 +16,26 @@ Page({ list: [], page: 1, size: 999, + header: [ + { key: 'day', title: '日期', }, + { key: "money", title: '充值金额', renderBody: (item) => { + if (item.type === 1 || item.type === 7) { + return item.topFee + } else if (item.type === 5 || item.type === 6 || item.type === 8) { + return `-${item.topFee}` + } else { + return 0 + } + } }, + { key: 'overall', title: '电费', renderBody: (item) => { + if (item.type == 1 || item.type === 5 || item.type === 6 || item.type === 7 || item.type === 8) { + return 0; + } else { + return item.money + } + } }, + { key: 'balance', title: '电表余额' }, + ], }, /** diff --git a/pages/meterBalanceRecord/index.json b/pages/meterBalanceRecord/index.json index 21e1dfc..0d27767 100644 --- a/pages/meterBalanceRecord/index.json +++ b/pages/meterBalanceRecord/index.json @@ -6,6 +6,7 @@ "van-tag": "@vant/weapp/tag/index", "van-row": "@vant/weapp/row/index", "empty": "/components/empty/index", + "table": "/components/table/table", "van-col": "@vant/weapp/col/index" }, "navigationStyle": "custom" diff --git a/pages/meterBalanceRecord/index.wxml b/pages/meterBalanceRecord/index.wxml index 54a812e..e22637d 100644 --- a/pages/meterBalanceRecord/index.wxml +++ b/pages/meterBalanceRecord/index.wxml @@ -11,7 +11,7 @@ - + + diff --git a/pages/meterBalanceRecord/index.wxss b/pages/meterBalanceRecord/index.wxss index 0037407..91973bf 100644 --- a/pages/meterBalanceRecord/index.wxss +++ b/pages/meterBalanceRecord/index.wxss @@ -84,3 +84,8 @@ border-top: 0rpx; font-size: 32rpx; } + + +page { + background-color: var(--transparent-green); + } \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index 7cbcbb6..37a609a 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -27,8 +27,8 @@ "name": "pages/workBench/index", "pathName": "pages/workBench/index", "query": "", - "scene": null, - "launchMode": "default" + "launchMode": "default", + "scene": null }, { "name": "pages/workBench/index", diff --git a/utils/index.js b/utils/index.js index 6d79893..abb74af 100644 --- a/utils/index.js +++ b/utils/index.js @@ -45,8 +45,8 @@ export function getConfigByEnv() { switch (envVersion) { // 开发版 case 'develop': - api = "http://localhost:8000" - // api = "https://zgd.hbhcbn.com/api3" + // api = "http://localhost:8000" + api = "https://zgd.hbhcbn.com/api3" // TODO: 发布正式时使用此路径 // api = "https://zgd.hbhcbn.com/wxApi" // api = "http://127.0.0.1:4523/m1/4143821-0-default"