diff --git a/childPackage/pages/electricQuery/components/accountingCard/index.js b/childPackage/pages/electricQuery/components/accountingCard/index.js
index 922326c..e1ed51e 100644
--- a/childPackage/pages/electricQuery/components/accountingCard/index.js
+++ b/childPackage/pages/electricQuery/components/accountingCard/index.js
@@ -1,24 +1,23 @@
// pages/electricQuery/components/accountingCard/index.js
Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ data: Object
+ },
- /**
- * 组件的属性列表
- */
- properties: {
- data: Object
- },
+ /**
+ * 组件的初始数据
+ */
+ data: {
- /**
- * 组件的初始数据
- */
- data: {
+ },
- },
+ /**
+ * 组件的方法列表
+ */
+ methods: {
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
+ }
})
\ No newline at end of file
diff --git a/childPackage/pages/electricQuery/components/accountingCard/index.wxml b/childPackage/pages/electricQuery/components/accountingCard/index.wxml
index 1146bb3..d49642f 100644
--- a/childPackage/pages/electricQuery/components/accountingCard/index.wxml
+++ b/childPackage/pages/electricQuery/components/accountingCard/index.wxml
@@ -1,72 +1,86 @@
- {{data.meter.address}}电表编号:{{data.meter.sn}}
+ {{data.meter.address}}
+ 电表编号:{{data.meter.sn}}
-
-
-
- 累计充值金额
-
-
- {{data.rechargeMoney}}
-
-
- {{data.updateRechargeMoneyAt}}
-
-
+
+
+
+ 初始余额
+
+
+ {{data.startMoney}}
+
+
+ {{data.updateStartMoneyAt || '--'}}
+
+
+
-
-
- 电费
-
-
- {{data.electricMoney}}
-
-
- {{data.updateElectricMoneyAt}}
-
-
+
+
+
+ 累计充值金额
+
+
+ {{data.rechargeMoney}}
+
+
+ {{data.updateRechargeMoneyAt || '--'}}
+
+
+
-
-
- 账务余额
-
-
- {{data.accountMoney}}
-
-
- {{data.updateAccountMoneyAt}}
-
-
+
+
+
+ 电费
+
+
+ {{data.electricMoney}}
+
+
+ {{data.updateElectricMoneyAt || '--'}}
+
+
+
-
-
- 电表余额
-
-
- {{data.meterMoney}}
-
-
- {{data.updateMeterMoneyAt}}
-
-
+
+
+
+ 账务余额
+
+
+ {{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 bd91984..776e121 100644
--- a/childPackage/pages/electricQuery/components/accountingCard/index.wxss
+++ b/childPackage/pages/electricQuery/components/accountingCard/index.wxss
@@ -17,7 +17,7 @@
}
.tableContent {
- margin-top: 10rpx;
+ margin-top: 25rpx;
margin-bottom: 20rpx;
text-align: center;
font-size: 32rpx;
diff --git a/childPackage/pages/electricQuery/components/reading/index.wxml b/childPackage/pages/electricQuery/components/reading/index.wxml
index b73f004..c68d434 100644
--- a/childPackage/pages/electricQuery/components/reading/index.wxml
+++ b/childPackage/pages/electricQuery/components/reading/index.wxml
@@ -75,7 +75,6 @@
border="{{ false }}"
label="当前表字(总)"
readonly
- wx:if="{{park.meter04kvType !== 1}}"
/>
上次抄表记录起,至现在时间内的用电量
diff --git a/pages/my/index.wxml b/pages/my/index.wxml
index 5c0684b..b898aa1 100644
--- a/pages/my/index.wxml
+++ b/pages/my/index.wxml
@@ -88,7 +88,7 @@
-
+
{
- item.topTime = dayjs(item.topTime).format("MM-DD HH:mm:ss")
+ item.topTime = dayjs(item.topTime).format("MM-DD")
return item
}),
total: total,
diff --git a/pages/workBench/components/recharge/components/approve/index.wxml b/pages/workBench/components/recharge/components/approve/index.wxml
index 9849d66..6e2a30a 100644
--- a/pages/workBench/components/recharge/components/approve/index.wxml
+++ b/pages/workBench/components/recharge/components/approve/index.wxml
@@ -13,33 +13,34 @@
-
- 商户名字
- 充值金额
- 状态
- 提交时间
- 操作
+
+
+ 商户名字
+ 充值金额
+ 状态
+ 提交时间
+ 操作
-
-
+
+
-
+
{{ item.tenement.shortName }}
-
+
{{ item.money }}
-
+
{{item.orderStatus}}
-
+
{{item.topTime}}
-
+
diff --git a/pages/workBench/components/recharge/components/approve/index.wxss b/pages/workBench/components/recharge/components/approve/index.wxss
index bb7ede4..641964d 100644
--- a/pages/workBench/components/recharge/components/approve/index.wxss
+++ b/pages/workBench/components/recharge/components/approve/index.wxss
@@ -1,6 +1,6 @@
/* pages/workBench/components/recharge/components/waitApprove/index.wxss */
.table {
- width: 810rpx;
+ width: 500rpx;
}
@@ -17,7 +17,7 @@
}
.thead .th {
- padding: 20rpx;
+ padding: 10rpx;
white-space: nowrap;
text-align: center;
box-sizing: border-box;
@@ -28,11 +28,11 @@
}
.tbody {
- width: 810rpx;
+ width: 500rpx;
}
.tbody .tr {
- padding: 20rpx;
+ padding: 10rpx;
border-bottom: 1rpx solid #EEEEEE;
display: flex;
align-items: center;
@@ -55,11 +55,12 @@
/* 基础标签样式 */
.tag {
display: inline-block;
- padding: 8px 16px;
- margin-right: 12px;
+ padding: 4px 5px;
+ margin-right: 0px;
border-radius: 16px;
background: #07c160;
color: white;
+ font-size: 25rpx;
}
/* 激活状态样式 */
diff --git a/project.private.config.json b/project.private.config.json
index 09bced0..7cbcbb6 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -30,6 +30,41 @@
"scene": null,
"launchMode": "default"
},
+ {
+ "name": "pages/workBench/index",
+ "pathName": "pages/workBench/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "childPackage/pages/electricQuery/index",
+ "pathName": "childPackage/pages/electricQuery/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "pages/workBench/index",
+ "pathName": "pages/workBench/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "childPackage/pages/electricQuery/index",
+ "pathName": "childPackage/pages/electricQuery/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "pages/workBench/index",
+ "pathName": "pages/workBench/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "childPackage/pages/electricQuery/index",
"pathName": "childPackage/pages/electricQuery/index",