From 902b4726c686042c8487a9c1b91d8fdd59f45fe9 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Wed, 26 Feb 2025 13:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/updatePhoneModal/index.js | 6 +-
pages/workBench/components/account/index.js | 13 +-
pages/workBench/components/account/index.json | 4 +-
pages/workBench/components/account/index.wxml | 85 ++++-----
pages/workBench/components/account/index.wxss | 20 +++
.../recharge/components/approve/index.wxml | 39 +++--
.../workBench/components/recharge/index.wxml | 12 +-
pages/workBench/components/record/index.js | 10 +-
pages/workBench/components/record/index.json | 4 +-
pages/workBench/components/record/index.wxml | 163 +++++++-----------
pages/workBench/components/record/index.wxss | 16 ++
.../workBench/components/tenement/index.json | 4 +-
.../workBench/components/tenement/index.wxml | 70 ++++----
.../workBench/components/tenement/index.wxss | 21 +++
pages/workBench/index.js | 2 +-
15 files changed, 250 insertions(+), 219 deletions(-)
diff --git a/pages/workBench/components/account/components/updatePhoneModal/index.js b/pages/workBench/components/account/components/updatePhoneModal/index.js
index d813ef8..6c15979 100644
--- a/pages/workBench/components/account/components/updatePhoneModal/index.js
+++ b/pages/workBench/components/account/components/updatePhoneModal/index.js
@@ -19,7 +19,11 @@ Component({
parentName:String,
parentId:String,
},
-
+ observers: {
+ "parentPhone": function (newPhone) {
+ this.setData({ phone: newPhone })
+ }
+ },
/**
* 组件的初始数据
*/
diff --git a/pages/workBench/components/account/index.js b/pages/workBench/components/account/index.js
index 0703e22..eae210d 100644
--- a/pages/workBench/components/account/index.js
+++ b/pages/workBench/components/account/index.js
@@ -103,7 +103,9 @@ Component({
this.handleCancel();
},
onUpdatePhoneConfirm() {
+ this.setData({ parentPhone: "", phone: "", type: "", title: "" })
this.getTenementInfo();
+ this.initUserList()
},
async getTenementInfo() {
const { tenement, park } = this.data;
@@ -135,18 +137,12 @@ Component({
})
},
handleChangeMain() {
- // const { list = [] } = this.data;
- // const main = list?.find(item => item.Permissions)
- // if (!main) {
- // alertInfo("没有主账号")
- // return
- // }
- // console.log("main", main)
+ const { tenementInfo = {} } = this.data;
this.setData({
updatePhoneVisible: true,
type: "update",
title: "编辑管理员",
- // phone: main.WechatPhone,
+ parentPhone: tenementInfo.phone,
// name: main.WechatUserName,
// id: main.WechatUserID,
})
@@ -156,6 +152,7 @@ Component({
updatePhoneVisible: false,
type: "",
phone: "",
+ parentPhone: "",
name: "",
id: "",
})
diff --git a/pages/workBench/components/account/index.json b/pages/workBench/components/account/index.json
index 6243554..8a466f7 100644
--- a/pages/workBench/components/account/index.json
+++ b/pages/workBench/components/account/index.json
@@ -12,6 +12,8 @@
"van-radio-group": "@vant/weapp/radio-group/index",
"van-tag": "@vant/weapp/tag/index",
"edit-modal": "./components/editModal/index",
- "updatePhoneModal": "./components/updatePhoneModal/index"
+ "updatePhoneModal": "./components/updatePhoneModal/index",
+ "van-row": "@vant/weapp/row/index",
+ "van-col": "@vant/weapp/col/index"
}
}
\ No newline at end of file
diff --git a/pages/workBench/components/account/index.wxml b/pages/workBench/components/account/index.wxml
index bcdf593..febd95e 100644
--- a/pages/workBench/components/account/index.wxml
+++ b/pages/workBench/components/account/index.wxml
@@ -29,60 +29,66 @@
-
-
-
-
添加子账号
修改主账号
-
-
-
-
- 序号
- 昵称
- 手机号
- 操作
-
-
-
-
+
+
+
+
+
+
+ {{tenementInfo.shortName}}
+ {{tenementInfo.fullName}}
+
+
+
+
+
+
+ 华昌宝能收费
+ 物业代收1
+ 物业代收2
+ 物业代收线损
+ {{tenementInfo.contact}} {{tenementInfo.phone}}
+
+
+
+
+
+
+
+
+
+
+
{{ itemIndex + 1 }}
{{ item.WechatUserName }}
{{ item.WechatPhone }}
-
+
+
移除
- 管理员
+ 管理员
-
-
-
-
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/pages/workBench/components/account/index.wxss b/pages/workBench/components/account/index.wxss
index e07b279..9bb6f1c 100644
--- a/pages/workBench/components/account/index.wxss
+++ b/pages/workBench/components/account/index.wxss
@@ -46,4 +46,24 @@
}
.primaryTextBtn {
color: #1989fa;
+}
+
+.customTable {
+ margin: 20rpx;
+ font-size: 32rpx;
+}
+
+.customTableTile {
+ background-color: var(--light-green);
+ box-sizing: border-box;
+}
+
+.tableTitleRow {
+ padding: 16rpx;
+}
+
+.tableRow {
+ padding: 16rpx;
+ border: 1rpx solid #ccc;
+ border-top: 0rpx;
}
\ No newline at end of file
diff --git a/pages/workBench/components/recharge/components/approve/index.wxml b/pages/workBench/components/recharge/components/approve/index.wxml
index 006432d..19b2a37 100644
--- a/pages/workBench/components/recharge/components/approve/index.wxml
+++ b/pages/workBench/components/recharge/components/approve/index.wxml
@@ -28,6 +28,25 @@
+
+
+ 同意
+ 拒绝
+
+
@@ -65,25 +84,7 @@
-
-
- 同意
- 拒绝
-
-
+
diff --git a/pages/workBench/components/recharge/index.wxml b/pages/workBench/components/recharge/index.wxml
index 6a29299..1e23e63 100644
--- a/pages/workBench/components/recharge/index.wxml
+++ b/pages/workBench/components/recharge/index.wxml
@@ -1,9 +1,11 @@
-
+
+
+
diff --git a/pages/workBench/components/record/index.js b/pages/workBench/components/record/index.js
index 3e2c0e7..602d4c5 100644
--- a/pages/workBench/components/record/index.js
+++ b/pages/workBench/components/record/index.js
@@ -122,11 +122,10 @@ Component({
},
async handleMeterSwitchOn() {
const that = this;
- const { meter, list } = this.data;
- const item = list.find(ele => ele.id === meter)
+ const { meter, meterName } = this.data;
wx.showModal({
title: '提示',
- content: `您确认要对${item?.address || 当前电表}进行合闸吗?`,
+ content: `您确认要对${meterName || 当前电表}进行合闸吗?`,
complete: async (res) => {
if (res.cancel) {
@@ -149,11 +148,10 @@ Component({
},
async handleMeterSwitchOff() {
const that = this;
- const { meter, list } = this.data;
- const item = list.find(ele => ele.id === meter)
+ const { meter, meterName } = this.data;
wx.showModal({
title: '提示',
- content: `您确认要对${item?.address || 当前电表}进行拉闸吗?`,
+ content: `您确认要对${meterName || 当前电表}进行拉闸吗?`,
complete: async (res) => {
if (res.cancel) {
return;
diff --git a/pages/workBench/components/record/index.json b/pages/workBench/components/record/index.json
index cd9253e..b4547a4 100644
--- a/pages/workBench/components/record/index.json
+++ b/pages/workBench/components/record/index.json
@@ -10,6 +10,8 @@
"empty": "/components/empty/index",
"van-radio": "@vant/weapp/radio/index",
"van-radio-group": "@vant/weapp/radio-group/index",
- "van-tag": "@vant/weapp/tag/index"
+ "van-tag": "@vant/weapp/tag/index",
+ "van-row": "@vant/weapp/row/index",
+ "van-col": "@vant/weapp/col/index"
}
}
\ No newline at end of file
diff --git a/pages/workBench/components/record/index.wxml b/pages/workBench/components/record/index.wxml
index 3449f8f..f653736 100644
--- a/pages/workBench/components/record/index.wxml
+++ b/pages/workBench/components/record/index.wxml
@@ -31,112 +31,71 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 合闸
+ 拉闸
+
+
+
+
+ {{item.tenement.shortName}}
+ {{item.tenement.name}}
+
+
+
+
+
+
+
+ 商户电表
+ 公摊电表
+ 园区电表
+ 表号:{{item.meterNo}}
+
+
+
+
+
+
+ {{item.address}}
+ SN:{{item.meterSn}}
+
+
+
+
+
+
+ {{item.amount}}
+ 余额:{{item.money}}
+
+
+
+
+
+
+ 合闸
+ 拉闸
+ 在线
+ 失联
+
+
+
-
+
+
+
+
-
-
- 合闸
- 拉闸
-
-
+
diff --git a/pages/workBench/components/record/index.wxss b/pages/workBench/components/record/index.wxss
index 34f106c..b82170d 100644
--- a/pages/workBench/components/record/index.wxss
+++ b/pages/workBench/components/record/index.wxss
@@ -39,3 +39,19 @@
word-break: break-all;
text-align: center;
}
+
+.customTable {
+ margin: 20rpx;
+}
+
+.customTableTile {
+ background-color: var(--light-green);
+ padding: 16rpx;
+ box-sizing: border-box;
+}
+
+.tableRow {
+ padding: 16rpx;
+ border: 1rpx solid #ccc;
+ border-top: 0rpx;
+}
diff --git a/pages/workBench/components/tenement/index.json b/pages/workBench/components/tenement/index.json
index 4fea529..aedb0e2 100644
--- a/pages/workBench/components/tenement/index.json
+++ b/pages/workBench/components/tenement/index.json
@@ -7,6 +7,8 @@
"van-empty": "@vant/weapp/empty/index",
"kaihu": "./components/kaihu/index",
"bindMeter": "./components/bindMeter/index",
- "unBindMeter": "./components/unBindMeter/index"
+ "unBindMeter": "./components/unBindMeter/index",
+ "van-row": "@vant/weapp/row/index",
+ "van-col": "@vant/weapp/col/index"
}
}
\ No newline at end of file
diff --git a/pages/workBench/components/tenement/index.wxml b/pages/workBench/components/tenement/index.wxml
index 84e215f..ba5c582 100644
--- a/pages/workBench/components/tenement/index.wxml
+++ b/pages/workBench/components/tenement/index.wxml
@@ -46,36 +46,37 @@
-
-
-
-
-
-
-
-
- 电表地址
- SN
- 操作
-
-
-
-
+
+
+
+
+
+
+ {{tenementInfo.shortName}}
+ {{tenementInfo.fullName}}
+
+
+
+
+
+
+ 华昌宝能收费
+ 物业代收1
+ 物业代收2
+ 物业代收线损
+ {{tenementInfo.contact}} {{tenementInfo.phone}}
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.address }}
{{ item.meterSn }}
@@ -90,12 +91,11 @@
-
-
-
-
+
+
+
+
-