diff --git a/assets/images/stop.png b/assets/images/stop.png new file mode 100644 index 0000000..6744048 Binary files /dev/null and b/assets/images/stop.png differ diff --git a/assets/images/tihuan.png b/assets/images/tihuan.png new file mode 100644 index 0000000..77b8f47 Binary files /dev/null and b/assets/images/tihuan.png differ 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}} + + + + + + + + 合闸 + 拉闸 + 在线 + 失联 + + + + - - + +