From d58436ef5f87c5717953f1b8943ab3dc80784c62 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Mon, 3 Mar 2025 16:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/stop.png | Bin 0 -> 5497 bytes assets/images/tihuan.png | Bin 0 -> 443980 bytes components/searchSelectWrapper/index.js | 24 ++- components/searchSelectWrapper/index.json | 4 +- components/searchSelectWrapper/index.wxml | 30 +++- components/searchSelectWrapper/index.wxss | 15 ++ pages/workBench/components/account/index.json | 3 +- pages/workBench/components/account/index.wxml | 4 +- .../recharge/components/approve/index.js | 10 ++ .../recharge/components/approve/index.wxml | 36 ++-- .../recharge/components/reharge/index.js | 1 - .../recharge/components/reharge/index.wxml | 85 +++------ pages/workBench/components/record/index.wxml | 161 +++++++++--------- pages/workBench/index.js | 2 +- service/meter.js | 1 + 15 files changed, 200 insertions(+), 176 deletions(-) create mode 100644 assets/images/stop.png create mode 100644 assets/images/tihuan.png diff --git a/assets/images/stop.png b/assets/images/stop.png new file mode 100644 index 0000000000000000000000000000000000000000..674404891679e7448cfc49f9fa743cf39f33df44 GIT binary patch literal 5497 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 VR$VqyE literal 0 HcmV?d00001 diff --git a/assets/images/tihuan.png b/assets/images/tihuan.png new file mode 100644 index 0000000000000000000000000000000000000000..77b8f4724869c4ba303146b17ced74c58c749b19 GIT binary patch literal 443980 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 literal 0 HcmV?d00001 diff --git a/components/searchSelectWrapper/index.js b/components/searchSelectWrapper/index.js index 9120124..8d191c9 100644 --- a/components/searchSelectWrapper/index.js +++ b/components/searchSelectWrapper/index.js @@ -7,14 +7,23 @@ Component({ properties: { label: String, placeholder: String, - text: String + text: String, + fieldType: { + type: String, + value: "text" + }, + type: { + type: String, + value: "select" + } }, /** * 组件的初始数据 */ data: { - + keyword: "", + text: "", }, /** @@ -23,6 +32,17 @@ Component({ methods: { onSearch() { this.triggerEvent("search") + }, + onChangeKeyword(e) { + this.setData({ keyword: e.detail }); + }, + onChangeText(e) { + this.setData({ text: e.detail }); + this.triggerEvent("changeText", e.detail) + }, + onSearchKeyword() { + this.triggerEvent("searchKeyword", this.data.keyword) + this.setData({ keyword: "" }) } } }) \ No newline at end of file diff --git a/components/searchSelectWrapper/index.json b/components/searchSelectWrapper/index.json index 6f50345..fda2119 100644 --- a/components/searchSelectWrapper/index.json +++ b/components/searchSelectWrapper/index.json @@ -1,6 +1,8 @@ { "component": true, "usingComponents": { - "van-icon": "@vant/weapp/icon/index" + "van-icon": "@vant/weapp/icon/index", + "van-button": "@vant/weapp/button/index", + "van-field": "@vant/weapp/field/index" } } \ No newline at end of file diff --git a/components/searchSelectWrapper/index.wxml b/components/searchSelectWrapper/index.wxml index ce9e592..2b781e5 100644 --- a/components/searchSelectWrapper/index.wxml +++ b/components/searchSelectWrapper/index.wxml @@ -1,9 +1,35 @@ - - {{ label }} + + {{ label }} {{placeholder}} {{text}} + + + {{ label }} + + + + 搜索 + + + {{ label }} + + + \ No newline at end of file diff --git a/components/searchSelectWrapper/index.wxss b/components/searchSelectWrapper/index.wxss index 3ae12f1..cd7bdc4 100644 --- a/components/searchSelectWrapper/index.wxss +++ b/components/searchSelectWrapper/index.wxss @@ -16,7 +16,22 @@ border: 1rpx solid #ccc; background-color: #fff; } + +.inputContent { + flex: 1; + margin-left: 30rpx; + margin-right: 30rpx; + display: flex; + padding: 0 20rpx; + border-radius: 12rpx; + border: 1rpx solid #ccc; + background-color: #fff; +} .text { flex: 1; +} + +.label { + width: 120rpx; } \ No newline at end of file diff --git a/pages/workBench/components/account/index.json b/pages/workBench/components/account/index.json index 922ddaa..3ef3d13 100644 --- a/pages/workBench/components/account/index.json +++ b/pages/workBench/components/account/index.json @@ -15,6 +15,7 @@ "updatePhoneModal": "./components/updatePhoneModal/index", "van-row": "@vant/weapp/row/index", "van-col": "@vant/weapp/col/index", - "searchSelectWrapper": "/components/searchSelectWrapper/index" + "searchSelectWrapper": "/components/searchSelectWrapper/index", + "van-image": "@vant/weapp/image/index" } } \ No newline at end of file diff --git a/pages/workBench/components/account/index.wxml b/pages/workBench/components/account/index.wxml index a04e003..f10ad16 100644 --- a/pages/workBench/components/account/index.wxml +++ b/pages/workBench/components/account/index.wxml @@ -84,7 +84,7 @@ data-id="{{item.WechatUserID}}" data-name="{{item.WechatUserName}}" > - 移除 + - 设为管理 + diff --git a/pages/workBench/components/recharge/components/approve/index.js b/pages/workBench/components/recharge/components/approve/index.js index 47a4c79..004ed18 100644 --- a/pages/workBench/components/recharge/components/approve/index.js +++ b/pages/workBench/components/recharge/components/approve/index.js @@ -53,6 +53,16 @@ Component({ }) this.onCancel(); }, + onSearchKeyword(e) { + const that = this; + that.setData({ + keyword: e.detail + }, () => { + loadingFunc(async () => { + await that.init(); + }) + }) + }, onChangeKeyword(e) { this.setData({ keywordTemp: e.detail }) }, diff --git a/pages/workBench/components/recharge/components/approve/index.wxml b/pages/workBench/components/recharge/components/approve/index.wxml index 19b2a37..a1795ce 100644 --- a/pages/workBench/components/recharge/components/approve/index.wxml +++ b/pages/workBench/components/recharge/components/approve/index.wxml @@ -1,31 +1,18 @@ - - - 选择 - - + text="{{parkName}}" + bind:search="onParkFocus" +/> - - - 搜索 - - + text="{{meterName}}" + bind:searchKeyword="onSearchKeyword" + type="inputSearch" +/> @@ -87,7 +74,6 @@ - - - - 选择 - - - + + - - 选择 - - - + - - + - - 选择 - - - + diff --git a/pages/workBench/components/record/index.wxml b/pages/workBench/components/record/index.wxml index 9773ff1..259d77b 100644 --- a/pages/workBench/components/record/index.wxml +++ b/pages/workBench/components/record/index.wxml @@ -6,93 +6,88 @@ bind:search="onParkFocus" /> - + + - - - - - - - 合闸 - 拉闸 - - - - - - - {{item.tenement.shortName}} - - {{item.tenement.name}} - - - - - - - - - 商户电表 - - 公摊电表 - - 园区电表 - 表号:{{item.meterNo}} - - - - - - - - {{item.address}} - - SN:{{item.meterSn}} - - - - - - - - 表字:{{item.amount}} - - 余额:{{item.money}} - - - - - - - - 合闸 - 拉闸 - 在线 - 失联 - - - - - - - + + + + 合闸 + 拉闸 + + + + + + + {{item.tenement.shortName}} + + {{item.tenement.name}} + + + + + + + + + 商户电表 + + 公摊电表 + + 园区电表 + 表号:{{item.meterNo}} + + + + + + + + {{item.address}} + + SN:{{item.meterSn}} + + + + + + + + 表字:{{item.amount}} + + 余额:{{item.money}} + + + + + + + + 合闸 + 拉闸 + 在线 + 失联 + + + + - - + +