diff --git a/pages/workBench/components/account/index.js b/pages/workBench/components/account/index.js index 992b809..c5982f6 100644 --- a/pages/workBench/components/account/index.js +++ b/pages/workBench/components/account/index.js @@ -1,8 +1,8 @@ // pages/workBench/components/account/index.js import request from "../../../../utils/request" import { getTenementBackInfo, } from "../../../../service/tenement" -import { getBackApproveList, removeUser } from "../../../../service/user" -import { alertInfo, alertSuccess } from "../../../../utils/index" +import { getBackApproveList, removeUser, approveUser } from "../../../../service/user" +import { alertInfo, alertSuccess, wxModal } from "../../../../utils/index" const { OK } = request Component({ @@ -68,6 +68,19 @@ Component({ break; } }, + async setAdmin(e) { + const { id, name } = e.currentTarget.dataset; + const { tenement } = this.data; + await wxModal({ content: `确认要将${name}设置为管理吗?` }) + const { code, message } = await approveUser({ userId: id, type: 2, tenement: tenement }) + if (code !== OK) { + alertInfo(message) + return; + } + alertSuccess("转交成功") + this.initUserList(); + this.getTenementInfo(); + }, onCancel() { this.setData({ show: false, diff --git a/pages/workBench/components/account/index.wxml b/pages/workBench/components/account/index.wxml index 90a4236..a04e003 100644 --- a/pages/workBench/components/account/index.wxml +++ b/pages/workBench/components/account/index.wxml @@ -24,26 +24,44 @@ - - - {{tenementInfo.shortName}} - - {{tenementInfo.fullName}} - + + + + {{tenementInfo.shortName}} + {{tenementInfo.fullName}} + + + - - - 华昌宝能收费 - - 物业代收1 - - 物业代收2 - 物业代收线损 - {{tenementInfo.contact}} {{tenementInfo.phone}} - + + + 华昌宝能收费 + 物业代收1 + 物业代收2 + 物业代收线损 + {{tenementInfo.contact}} {{tenementInfo.phone}} + + + @@ -54,22 +72,34 @@ - - {{ itemIndex + 1 }} - {{ item.WechatUserName }} - {{ item.WechatPhone }} - - - - 移除 + + {{ item.WechatUserName }} + {{ item.WechatPhone }} + + + + + 移除 + + + 设为管理 + + + + 管理员 - 管理员 + diff --git a/pages/workBench/components/account/index.wxss b/pages/workBench/components/account/index.wxss index e5f7686..007d999 100644 --- a/pages/workBench/components/account/index.wxss +++ b/pages/workBench/components/account/index.wxss @@ -28,13 +28,8 @@ } -.tbody { - width: 890rpx; -} -.tbody .tr { - padding: 20rpx; - border-bottom: 1rpx solid #EEEEEE; +.tr { display: flex; align-items: center; flex-wrap: nowrap; @@ -46,6 +41,7 @@ } .primaryTextBtn { color: #1989fa; + display: inline-block; } .customTable { diff --git a/pages/workBench/components/record/index.wxml b/pages/workBench/components/record/index.wxml index daa0e92..9773ff1 100644 --- a/pages/workBench/components/record/index.wxml +++ b/pages/workBench/components/record/index.wxml @@ -35,7 +35,7 @@ {{item.tenement.shortName}} - {{item.tenement.name}} + {{item.tenement.name}} @@ -44,11 +44,11 @@ - 商户电表 + 商户电表 - 公摊电表 + 公摊电表 - 园区电表 + 园区电表 表号:{{item.meterNo}} @@ -57,7 +57,7 @@ - {{item.address}} + {{item.address}} SN:{{item.meterSn}} @@ -67,7 +67,7 @@ - 表字:{{item.amount}} + 表字:{{item.amount}} 余额:{{item.money}} @@ -77,8 +77,8 @@ - 合闸 - 拉闸 + 合闸 + 拉闸 在线 失联 diff --git a/pages/workBench/components/tenement/index.wxml b/pages/workBench/components/tenement/index.wxml index ae1df4d..618c7d3 100644 --- a/pages/workBench/components/tenement/index.wxml +++ b/pages/workBench/components/tenement/index.wxml @@ -39,15 +39,9 @@ - {{tenementInfo.shortName}} + {{tenementInfo.shortName}} {{tenementInfo.fullName}} - - - - - - 华昌宝能收费 物业代收1 @@ -56,6 +50,10 @@ {{tenementInfo.contact}} {{tenementInfo.phone}} + + + + - - + diff --git a/pages/workBench/index.js b/pages/workBench/index.js index d596302..7f64b91 100644 --- a/pages/workBench/index.js +++ b/pages/workBench/index.js @@ -5,7 +5,7 @@ Page({ * 页面的初始数据 */ data: { - active: 1, + active: 0, }, /**