From 616c6a53fb1eeaa7da940d9f6d67312fee3fe73b Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Wed, 19 Feb 2025 19:54:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=A5=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E5=92=8C=E6=9A=82=E5=AD=98=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- components/Segmented/index.js | 24 +++ components/Segmented/index.json | 4 + components/Segmented/index.wxml | 4 + components/Segmented/index.wxss | 1 + components/navigator/index.js | 7 +- components/searchSelect/index.js | 20 ++- components/searchSelect/index.wxml | 23 ++- components/searchSelect/index.wxss | 2 - pages/discountCoupon/index.js | 1 - pages/home/index.js | 2 +- pages/invoicing/index.wxml | 2 +- .../account/components/editModal/index.js | 50 ++++++ .../account/components/editModal/index.json | 8 + .../account/components/editModal/index.wxml | 30 ++++ .../account/components/editModal/index.wxss | 1 + pages/workBench/components/account/index.js | 77 ++++++++++ pages/workBench/components/account/index.json | 16 ++ pages/workBench/components/account/index.wxml | 98 ++++++++++++ pages/workBench/components/account/index.wxss | 1 + pages/workBench/components/record/index.js | 44 ++++-- pages/workBench/components/record/index.wxml | 144 ++++++++++++------ .../tenement/components/bindMeter/index.js | 35 +++++ .../tenement/components/bindMeter/index.json | 8 + .../tenement/components/bindMeter/index.wxml | 41 +++++ .../tenement/components/bindMeter/index.wxss | 1 + .../components/createTenement/index.js | 103 +++++++++++++ .../components/createTenement/index.json | 8 + .../components/createTenement/index.wxml | 74 +++++++++ .../components/createTenement/index.wxss | 1 + .../tenement/components/kaihu/index.js | 57 +++++++ .../tenement/components/kaihu/index.json | 10 ++ .../tenement/components/kaihu/index.wxml | 81 ++++++++++ .../tenement/components/kaihu/index.wxss | 1 + pages/workBench/components/tenement/index.js | 72 +++++++++ .../workBench/components/tenement/index.json | 10 ++ .../workBench/components/tenement/index.wxml | 100 ++++++++++++ .../workBench/components/tenement/index.wxss | 1 + pages/workBench/index.js | 4 +- pages/workBench/index.json | 4 +- pages/workBench/index.wxml | 15 +- service/park.js | 5 + service/system.js | 1 + service/tenement.js | 21 ++- utils/data.js | 2 + utils/index.js | 4 +- utils/system.js | 3 + 47 files changed, 1142 insertions(+), 82 deletions(-) create mode 100644 components/Segmented/index.js create mode 100644 components/Segmented/index.json create mode 100644 components/Segmented/index.wxml create mode 100644 components/Segmented/index.wxss create mode 100644 pages/workBench/components/account/components/editModal/index.js create mode 100644 pages/workBench/components/account/components/editModal/index.json create mode 100644 pages/workBench/components/account/components/editModal/index.wxml create mode 100644 pages/workBench/components/account/components/editModal/index.wxss create mode 100644 pages/workBench/components/account/index.js create mode 100644 pages/workBench/components/account/index.json create mode 100644 pages/workBench/components/account/index.wxml create mode 100644 pages/workBench/components/account/index.wxss create mode 100644 pages/workBench/components/tenement/components/bindMeter/index.js create mode 100644 pages/workBench/components/tenement/components/bindMeter/index.json create mode 100644 pages/workBench/components/tenement/components/bindMeter/index.wxml create mode 100644 pages/workBench/components/tenement/components/bindMeter/index.wxss create mode 100644 pages/workBench/components/tenement/components/createTenement/index.js create mode 100644 pages/workBench/components/tenement/components/createTenement/index.json create mode 100644 pages/workBench/components/tenement/components/createTenement/index.wxml create mode 100644 pages/workBench/components/tenement/components/createTenement/index.wxss create mode 100644 pages/workBench/components/tenement/components/kaihu/index.js create mode 100644 pages/workBench/components/tenement/components/kaihu/index.json create mode 100644 pages/workBench/components/tenement/components/kaihu/index.wxml create mode 100644 pages/workBench/components/tenement/components/kaihu/index.wxss create mode 100644 pages/workBench/components/tenement/index.js create mode 100644 pages/workBench/components/tenement/index.json create mode 100644 pages/workBench/components/tenement/index.wxml create mode 100644 pages/workBench/components/tenement/index.wxss diff --git a/app.json b/app.json index eed1179..c4c9274 100644 --- a/app.json +++ b/app.json @@ -31,7 +31,8 @@ "pages/integral/index", "pages/discountCoupon/index", "pages/integralRecord/index", - "pages/meterList/index" + "pages/meterList/index", + "pages/workBench/components/tenement/components/createTenement/index" ], "subPackages": [ { diff --git a/components/Segmented/index.js b/components/Segmented/index.js new file mode 100644 index 0000000..13fe062 --- /dev/null +++ b/components/Segmented/index.js @@ -0,0 +1,24 @@ +// components/Segmented/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + list: Array + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) \ No newline at end of file diff --git a/components/Segmented/index.json b/components/Segmented/index.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/Segmented/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/Segmented/index.wxml b/components/Segmented/index.wxml new file mode 100644 index 0000000..3b51e43 --- /dev/null +++ b/components/Segmented/index.wxml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/components/Segmented/index.wxss b/components/Segmented/index.wxss new file mode 100644 index 0000000..74130e5 --- /dev/null +++ b/components/Segmented/index.wxss @@ -0,0 +1 @@ +/* components/Segmented/index.wxss */ \ No newline at end of file diff --git a/components/navigator/index.js b/components/navigator/index.js index a86a1d7..0be511e 100644 --- a/components/navigator/index.js +++ b/components/navigator/index.js @@ -7,6 +7,7 @@ Component({ properties: { title: String, canBack: Boolean, + beforeBack: Function, }, /** @@ -34,7 +35,11 @@ Component({ * 组件的方法列表 */ methods: { - back() { + async back() { + const { beforeBack } = this; + if (beforeBack) { + await beforeBack(); + } wx.navigateBack(); } } diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js index a25737e..069b1db 100644 --- a/components/searchSelect/index.js +++ b/components/searchSelect/index.js @@ -1,8 +1,8 @@ -import { getLoginParkList } from "../../service/park" +import { getLoginParkList, getParkBuildingList } from "../../service/park" import { getParkSimpleMeterList } from "../../service/meter" import { alertInfo } from "../../utils/index"; import request from "../../utils/request" -import { payWays } from "../../utils/data"; +import { payWays, feeType } from "../../utils/data"; import { getTenementList } from "../../service/tenement"; const { OK } = request; @@ -86,9 +86,13 @@ Component({ return; case "meter": this.onSearchMeter(); + return case "tenement": this.onSearchTenement(); return; + case "building": + this.onSearchBuilding(); + return; } }, async onSearchPark() { @@ -127,6 +131,18 @@ Component({ list: data, }) }, + async onSearchBuilding() { + const { park } = this.data; + const { code, message, data = [] } = await getParkBuildingList(park); + if (code !== OK) { + alertInfo(message) + return + } + this.setData({ + columns: data?.length ? data?.map(item => item?.name) : [], + list: data, + }) + }, } }) diff --git a/components/searchSelect/index.wxml b/components/searchSelect/index.wxml index fe751bf..8e9a2f3 100644 --- a/components/searchSelect/index.wxml +++ b/components/searchSelect/index.wxml @@ -3,6 +3,7 @@ show="{{ show }}" bind:click="onClickHide" position="bottom" + z-index="100000" > - + + + + + + + \ No newline at end of file diff --git a/components/searchSelect/index.wxss b/components/searchSelect/index.wxss index 540bed4..ad01756 100644 --- a/components/searchSelect/index.wxss +++ b/components/searchSelect/index.wxss @@ -1,3 +1 @@ /* components/searchSelect/index.wxss */ -.van-ellipsis van-picker-column__item { -} \ No newline at end of file diff --git a/pages/discountCoupon/index.js b/pages/discountCoupon/index.js index 4820acb..f0d079f 100644 --- a/pages/discountCoupon/index.js +++ b/pages/discountCoupon/index.js @@ -23,7 +23,6 @@ Page({ }, onChange(e) { - console.log('e', e) this.setData({ active: e.detail.index, }, () => { diff --git a/pages/home/index.js b/pages/home/index.js index 8b39029..12760ed 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -56,7 +56,7 @@ Page({ * 生命周期函数--监听页面初次渲染完成 */ onReady() { - + }, async changeMeter() { const { meterList = [] } = this.data; diff --git a/pages/invoicing/index.wxml b/pages/invoicing/index.wxml index 86883ff..29d2b91 100644 --- a/pages/invoicing/index.wxml +++ b/pages/invoicing/index.wxml @@ -104,7 +104,7 @@ > + + + + + + + + \ No newline at end of file diff --git a/pages/workBench/components/account/components/editModal/index.wxss b/pages/workBench/components/account/components/editModal/index.wxss new file mode 100644 index 0000000..5ddf238 --- /dev/null +++ b/pages/workBench/components/account/components/editModal/index.wxss @@ -0,0 +1 @@ +/* pages/workBench/components/account/components/editModal/index.wxss */ \ No newline at end of file diff --git a/pages/workBench/components/account/index.js b/pages/workBench/components/account/index.js new file mode 100644 index 0000000..f66d8c6 --- /dev/null +++ b/pages/workBench/components/account/index.js @@ -0,0 +1,77 @@ +// pages/workBench/components/account/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + onParkFocus(e) { + this.setData({ + show: true, + title: "园区", + type: 'park' + }) + }, + onTenementFocus(e) { + const { park } = this.data; + if (!park) { + alertInfo("请先选择园区") + return; + } + this.setData({ + show: true, + title: "商户", + type: 'tenement' + }) + }, + onConfirm(e) { + const { type, data } = e.detail; + switch(type) { + case "park": + this.setData({ + park: data.id, + parkName: data.name, + show: false, + }) + break; + case "tenement": + this.setData({ + tenement: data.id, + tenementName: data.name, + show: false, + }) + break; + } + }, + handleDelete(e) { + const {} = e; + wx.showModal({ + title: '提示', + content: '确认要移除该用户吗？', + complete: (res) => { + if (res.cancel) { + + } + + if (res.confirm) { + + } + } + }) + } + } +}) \ No newline at end of file diff --git a/pages/workBench/components/account/index.json b/pages/workBench/components/account/index.json new file mode 100644 index 0000000..57b9106 --- /dev/null +++ b/pages/workBench/components/account/index.json @@ -0,0 +1,16 @@ +{ + "component": true, + "usingComponents": { + "van-field": "@vant/weapp/field/index", + "van-button": "@vant/weapp/button/index", + "search-select": "/components/searchSelect/index", + "van-empty": "@vant/weapp/empty/index", + "table": "/components/table/table", + "pagination": "/components/pagination/index", + "empty": "/components/empty/index", + "van-radio": "@vant/weapp/radio/index", + "van-radio-group": "@vant/weapp/radio-group/index", + "van-tag": "@vant/weapp/tag/index", + "edit-modal": "./components/editModal/index" + } +} \ No newline at end of file diff --git a/pages/workBench/components/account/index.wxml b/pages/workBench/components/account/index.wxml new file mode 100644 index 0000000..06804ad --- /dev/null +++ b/pages/workBench/components/account/index.wxml @@ -0,0 +1,98 @@ + + + + + 选择 + + + + + 选择 + + + + + + + + + + + + + + + 序号 + 昵称 + 手机号 + 操作 + + + + + + {{ index }} + {{ item.tenement.shortName }} + {{ item.money }} + + + 移除 + + + + + + + + + + 添加子账号 + 修改主账号 + + + + + \ No newline at end of file diff --git a/pages/workBench/components/account/index.wxss b/pages/workBench/components/account/index.wxss new file mode 100644 index 0000000..80816c6 --- /dev/null +++ b/pages/workBench/components/account/index.wxss @@ -0,0 +1 @@ +/* pages/workBench/components/account/index.wxss */ \ No newline at end of file diff --git a/pages/workBench/components/record/index.js b/pages/workBench/components/record/index.js index d16e606..31ed2f9 100644 --- a/pages/workBench/components/record/index.js +++ b/pages/workBench/components/record/index.js @@ -33,17 +33,39 @@ Component({ type: 'park' }) }, - onConfirm(e) { - const { data } = e.detail; - const that = this; + onMeterFocus(e) { + const { park } = this.data; + if (!park) { + alertInfo("请先选择园区") + return; + } this.setData({ - parkName: data.name, - park: data.id, - }, () => { - loadingFunc(async () => { - await that.init(); - }) + show: true, + title: "电表", + type: 'meter' }) + }, + onConfirm(e) { + console.log('e', e) + const { data, type } = e.detail; + const that = this; + switch(type) { + case "park": + this.setData({ + parkName: data.name, + park: data.id, + }) + break; + case "meter": + this.setData({ + meterName: data.address, + meter: data.id, + }, () => { + that.init(); + }) + break; + } + this.onConcal(); }, onChangeKeyword(e) { @@ -60,11 +82,11 @@ Component({ }) }, async init() { - const { page, keyword, park } = this.data; + const { page, park, meter } = this.data; if (!park) { return; } - const { code, message, data, total } = await getParkMeterList({ park, keyword, page }) + const { code, message, data, total } = await getParkMeterList({ park, keyword: meter, page }) if (code !== OK) { alertInfo(message); return; diff --git a/pages/workBench/components/record/index.wxml b/pages/workBench/components/record/index.wxml index a57aee8..8a077ff 100644 --- a/pages/workBench/components/record/index.wxml +++ b/pages/workBench/components/record/index.wxml @@ -16,65 +16,113 @@ - - 搜索 + + 选择 + - - - - - 商户名称 - 电表地址 - 电表余额 - 拉合闸 - 是否失联 - - - - - - - - {{ item.tenement.shortName }} - {{ item.address }} - {{ item.money }} - - 拉闸 - - - 合闸 - - - 在线 - - - 失联 - - - - - + + + + + + + + + + + + + + - - @@ -88,7 +136,7 @@ > 合闸 拉闸 - + diff --git a/pages/workBench/components/tenement/components/bindMeter/index.js b/pages/workBench/components/tenement/components/bindMeter/index.js new file mode 100644 index 0000000..f0cb820 --- /dev/null +++ b/pages/workBench/components/tenement/components/bindMeter/index.js @@ -0,0 +1,35 @@ +// pages/workBench/components/tenement/components/bindMeter/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + onMeterFocus(e) { + const { park } = this.data; + if (!park) { + alertInfo("请先选择园区") + return; + } + this.setData({ + show: true, + title: "电表", + type: 'meter' + }) + }, + } +}) \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/bindMeter/index.json b/pages/workBench/components/tenement/components/bindMeter/index.json new file mode 100644 index 0000000..953d7ac --- /dev/null +++ b/pages/workBench/components/tenement/components/bindMeter/index.json @@ -0,0 +1,8 @@ +{ + "component": true, + "usingComponents": { + "van-dialog": "@vant/weapp/dialog/index", + "search-select": "/components/searchSelect/index", + "van-field": "@vant/weapp/field/index" + } +} \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/bindMeter/index.wxml b/pages/workBench/components/tenement/components/bindMeter/index.wxml new file mode 100644 index 0000000..491582c --- /dev/null +++ b/pages/workBench/components/tenement/components/bindMeter/index.wxml @@ -0,0 +1,41 @@ + + + + + + + 选择 + + + + + + \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/bindMeter/index.wxss b/pages/workBench/components/tenement/components/bindMeter/index.wxss new file mode 100644 index 0000000..3fb490f --- /dev/null +++ b/pages/workBench/components/tenement/components/bindMeter/index.wxss @@ -0,0 +1 @@ +/* pages/workBench/components/tenement/components/bindMeter/index.wxss */ \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/createTenement/index.js b/pages/workBench/components/tenement/components/createTenement/index.js new file mode 100644 index 0000000..da2774b --- /dev/null +++ b/pages/workBench/components/tenement/components/createTenement/index.js @@ -0,0 +1,103 @@ +// pages/workBench/components/tenement/components/createTenement/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData(options) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + onBuildingFocus() { + const { park } = this.data; + if (!park) { + alertInfo("请先选择园区") + return; + } + this.setData({ + show: true, + title: "建筑", + type: 'building' + }) + }, + onFeeTypeFocus() { + const { park } = this.data; + if (!park) { + alertInfo("请先选择园区") + return; + } + this.setData({ + show: true, + title: "建筑", + type: 'building' + }) + }, + beforeBack() { + let pages = getCurrentPages(); // 获取当前页面栈 + let prevPage = pages[pages.length - 2]; // 获取上一页 + const { tenement = '', tenementName = '', park = '', parkName = '' } = this.data; + // 修改上一页的数据 + prevPage.setData({ + needBackShow: true, + tenement, + tenementName, + park, + parkName + }); + + }, + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/createTenement/index.json b/pages/workBench/components/tenement/components/createTenement/index.json new file mode 100644 index 0000000..b97afff --- /dev/null +++ b/pages/workBench/components/tenement/components/createTenement/index.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "search-select": "/components/searchSelect/index", + "van-field": "@vant/weapp/field/index", + "van-button": "@vant/weapp/button/index", + "navigator": "/components/navigator/index" + } +} \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/createTenement/index.wxml b/pages/workBench/components/tenement/components/createTenement/index.wxml new file mode 100644 index 0000000..6d0a517 --- /dev/null +++ b/pages/workBench/components/tenement/components/createTenement/index.wxml @@ -0,0 +1,74 @@ + + + + + + + + + + + 选择 + + + + + 选择 + + + + + \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/createTenement/index.wxss b/pages/workBench/components/tenement/components/createTenement/index.wxss new file mode 100644 index 0000000..45f4ed9 --- /dev/null +++ b/pages/workBench/components/tenement/components/createTenement/index.wxss @@ -0,0 +1 @@ +/* pages/workBench/components/tenement/components/createTenement/index.wxss */ \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/kaihu/index.js b/pages/workBench/components/tenement/components/kaihu/index.js new file mode 100644 index 0000000..34326d4 --- /dev/null +++ b/pages/workBench/components/tenement/components/kaihu/index.js @@ -0,0 +1,57 @@ +// pages/workBench/components/tenement/components/kaihu/index.js +import { alertInfo } from "../../../../../../utils/index" + +Component({ + + /** + * 组件的属性列表 + */ + properties: { + park: String, + visible: Boolean, + }, + // observers: { + // 'visible': function(newVisible) { + // this.setData({ + // show: newVisible + // }) + // } + // }, + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + onBuildingFocus() { + const { park } = this.data; + if (!park) { + alertInfo("请先选择园区") + return; + } + this.setData({ + show: true, + title: "建筑", + type: 'building' + }) + }, + onFeeTypeFocus() { + const { park } = this.data; + if (!park) { + alertInfo("请先选择园区") + return; + } + this.setData({ + show: true, + title: "建筑", + type: 'building' + }) + }, + }, + +}) \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/kaihu/index.json b/pages/workBench/components/tenement/components/kaihu/index.json new file mode 100644 index 0000000..f5d5fc8 --- /dev/null +++ b/pages/workBench/components/tenement/components/kaihu/index.json @@ -0,0 +1,10 @@ +{ + "component": true, + "usingComponents": { + "search-select": "/components/searchSelect/index", + "van-field": "@vant/weapp/field/index", + "van-button": "@vant/weapp/button/index", + "navigator": "/components/navigator/index", + "van-dialog": "@vant/weapp/dialog/index" + } +} \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/kaihu/index.wxml b/pages/workBench/components/tenement/components/kaihu/index.wxml new file mode 100644 index 0000000..2afba3b --- /dev/null +++ b/pages/workBench/components/tenement/components/kaihu/index.wxml @@ -0,0 +1,81 @@ + + + + + + + + + + + 选择 + + + + + 选择 + + + + + + \ No newline at end of file diff --git a/pages/workBench/components/tenement/components/kaihu/index.wxss b/pages/workBench/components/tenement/components/kaihu/index.wxss new file mode 100644 index 0000000..d4caef1 --- /dev/null +++ b/pages/workBench/components/tenement/components/kaihu/index.wxss @@ -0,0 +1 @@ +/* pages/workBench/components/tenement/components/kaihu/index.wxss */ \ No newline at end of file diff --git a/pages/workBench/components/tenement/index.js b/pages/workBench/components/tenement/index.js new file mode 100644 index 0000000..9ed03a7 --- /dev/null +++ b/pages/workBench/components/tenement/index.js @@ -0,0 +1,72 @@ +import { alertInfo } from "../../../../utils/index"; + +// pages/workBench/components/tenement/index.js +Component({ + + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + lifetimes: { + ready() { + console.log("this.data", this.data) + } + }, + /** + * 组件的方法列表 + */ + methods: { + onParkFocus(e) { + this.setData({ + show: true, + title: "园区", + type: 'park' + }) + }, + onTenementFocus(e) { + const { park } = this.data; + if (!park) { + alertInfo("请先选择园区") + return; + } + this.setData({ + show: true, + title: "商户", + type: 'tenement' + }) + }, + async init() { + + }, + onConfirm(e) { + const { type, data } = e.detail; + switch(type) { + case "park": + this.setData({ + park: data.id, + parkName: data.name, + show: false, + }) + break; + } + }, + startKh() { + this.setData({ + kaihuVisible: true + }) + // const { park = '', parkName = '', tenement = '', tenementName = '' } = this.data; + // wx.navigateTo({ + // url: `/pages/workBench/components/tenement/components/createTenement/index?park=${park}&tenement=${tenement}&parkName=${parkName}&${tenementName}=${tenementName}`, + // }) + } + } +}) \ No newline at end of file diff --git a/pages/workBench/components/tenement/index.json b/pages/workBench/components/tenement/index.json new file mode 100644 index 0000000..225bd8e --- /dev/null +++ b/pages/workBench/components/tenement/index.json @@ -0,0 +1,10 @@ +{ + "component": true, + "usingComponents": { + "van-field": "@vant/weapp/field/index", + "van-button": "@vant/weapp/button/index", + "search-select": "/components/searchSelect/index", + "van-empty": "@vant/weapp/empty/index", + "kaihu": "./components/kaihu/index" + } +} \ No newline at end of file diff --git a/pages/workBench/components/tenement/index.wxml b/pages/workBench/components/tenement/index.wxml new file mode 100644 index 0000000..c356208 --- /dev/null +++ b/pages/workBench/components/tenement/index.wxml @@ -0,0 +1,100 @@ + + + + + 选择 + + + + + 选择 + + + + + + 绑定电表 + 修改信息 + + 开户 + + + + + + + + + + + + + 电表地址 + SN + 操作 + + + + + + {{ item.tenement.shortName }} + {{ item.money }} + + + 解绑 + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/workBench/components/tenement/index.wxss b/pages/workBench/components/tenement/index.wxss new file mode 100644 index 0000000..5de07ae --- /dev/null +++ b/pages/workBench/components/tenement/index.wxss @@ -0,0 +1 @@ +/* pages/workBench/components/tenement/index.wxss */ \ No newline at end of file diff --git a/pages/workBench/index.js b/pages/workBench/index.js index 4b09d20..e257546 100644 --- a/pages/workBench/index.js +++ b/pages/workBench/index.js @@ -5,7 +5,7 @@ Page({ * 页面的初始数据 */ data: { - active: 0 + active: 3 }, /** @@ -28,7 +28,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + console.log("this,data", this.data) }, /** diff --git a/pages/workBench/index.json b/pages/workBench/index.json index 609219d..c288a2d 100644 --- a/pages/workBench/index.json +++ b/pages/workBench/index.json @@ -5,7 +5,9 @@ "navigator": "/components/navigator/index", "approve": "./components/approve/index", "recharge": "./components/recharge/index", - "record": "./components/record/index" + "record": "./components/record/index", + "tenement": "./components/tenement/index", + "account": "./components/account/index" }, "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/workBench/index.wxml b/pages/workBench/index.wxml index ae5e967..b861d6f 100644 --- a/pages/workBench/index.wxml +++ b/pages/workBench/index.wxml @@ -1,13 +1,16 @@ - - - - + - - + + + + + + + + \ No newline at end of file diff --git a/service/park.js b/service/park.js index ffec4e6..a4b8090 100644 --- a/service/park.js +++ b/service/park.js @@ -10,4 +10,9 @@ export const getParkList = async function({ keyword = "" }) { // 获取未登录的园区列表 export const getLoginParkList = async function({ keyword }) { return await GET(`/wx/getLoginParkList?keyword=${replaceSpecialIcon(keyword)}`); +} + +// 获取建筑列表 +export const getParkBuildingList = async function(pid) { + return await GET(`/vx/park/${pid}/building`); } \ No newline at end of file diff --git a/service/system.js b/service/system.js index 94a2d5f..d8fd557 100644 --- a/service/system.js +++ b/service/system.js @@ -95,3 +95,4 @@ export const redeemCoupons = async function({ id, type }) { export const getCurrentCoupons = async function() { return await GET(`/wx/getCurrentCoupons`); } + diff --git a/service/tenement.js b/service/tenement.js index efdc635..e3f360c 100644 --- a/service/tenement.js +++ b/service/tenement.js @@ -12,7 +12,7 @@ export const getOwnTenementList = async function() { return await GET(`/wx/getOwnTenements`); } -// 获取商户详情 +// 获取商户详情(简易) export const getTenementDetail = async function(id) { return await GET(`/wx/getTenementDetail/${id}`); } @@ -20,4 +20,21 @@ export const getTenementDetail = async function(id) { // 获取商户是否限电 export const getTenementExceptionalCase = async function(pid, tid) { return await GET(`/wx/exceptionalCase/${pid}/${tid}`); -} \ No newline at end of file +} + +// 获取商户详情（b端） +export const getTenementInfoDetail = async function(id) { + return await GET(`/wx/getTenementDetail/${id}`); +} +// 创建商户 +export const createTenement = async function(pid, data) { + return await POST(`/vx/tenement/${pid}`, data) +} +// 修改商户 +export const updateTenement = async function(pid, data) { + return await POST(`/vx/tenement/${pid}`, data) +} +// 解绑电表 +export const unbindMeter = async function(pid, tid, code) { + return await POST(`/tenement/${pid}/${tid}/binding/${code}/unbind`) +} diff --git a/utils/data.js b/utils/data.js index b4c55db..22c17b0 100644 --- a/utils/data.js +++ b/utils/data.js @@ -8,3 +8,5 @@ export const payWays = ["现金", "银行卡", "支付宝", "微信", "云闪 export const getRechargeOperateWay = (num) => { return payWays[num]; } + +export const feeType = ['华昌宝能收费', "物业代收1", "物业代收2", "物业代收线损"] \ No newline at end of file diff --git a/utils/index.js b/utils/index.js index b49eed0..1389446 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" // api = "https://zgd.hbhcbn.com/api3" // api = "https://zgd.hbhcbn.com/wxApi" // api = "http://127.0.0.1:4523/m1/4143821-0-default" diff --git a/utils/system.js b/utils/system.js index c3e0002..433e231 100644 --- a/utils/system.js +++ b/utils/system.js @@ -9,6 +9,9 @@ export const getDot = async () => { return; } const { code, message, data } = await getUnReadApproveNumber(); + if (code !== OK) { + return; + } if (data > 0) { wx.showTabBarRedDot({ index: 2,