diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js
index 069b1db..6efd65e 100644
--- a/components/searchSelect/index.js
+++ b/components/searchSelect/index.js
@@ -3,7 +3,7 @@ import { getParkSimpleMeterList } from "../../service/meter"
import { alertInfo } from "../../utils/index";
import request from "../../utils/request"
import { payWays, feeType } from "../../utils/data";
-import { getTenementList } from "../../service/tenement";
+import { getTenementList, getWxTenementList } from "../../service/tenement";
const { OK } = request;
// components/searchSelect/index.js
@@ -17,6 +17,7 @@ Component({
type: String,
show: Boolean,
park: String,
+ isBack: Boolean,
},
observers: {
"show,type": function(newShow, newType) {
@@ -120,8 +121,8 @@ Component({
})
},
async onSearchTenement() {
- const { searchText = "", park } = this.data;
- const { code, message, data = [] } = await getTenementList({keyword: searchText, park});
+ const { searchText = "", park, isBack } = this.data;
+ const { code, message, data = [] } = isBack ? await getWxTenementList({keyword: searchText, park}) : await getTenementList({keyword: searchText, park});
if (code !== OK) {
alertInfo(message)
return
diff --git a/components/searchSelect/index.wxml b/components/searchSelect/index.wxml
index 8e9a2f3..fd94b2e 100644
--- a/components/searchSelect/index.wxml
+++ b/components/searchSelect/index.wxml
@@ -8,7 +8,7 @@
diff --git a/pages/workBench/components/account/components/editModal/index.js b/pages/workBench/components/account/components/editModal/index.js
index 898515d..1eaa7a4 100644
--- a/pages/workBench/components/account/components/editModal/index.js
+++ b/pages/workBench/components/account/components/editModal/index.js
@@ -1,4 +1,5 @@
import { alertInfo, alertSuccess } from "../../../../../../utils/index";
+import { createTenementWxUser } from "../../../../../../service/tenement";
import request from "../../../../../../utils/request"
const { OK } = request
// pages/workBench/components/account/components/editModal/index.js
@@ -11,15 +12,16 @@ Component({
type: String,
title: String,
visible: Boolean,
- onOk: Function,
onCancel: Function,
+ park: String,
+ tenement: String,
},
/**
* 组件的初始数据
*/
data: {
-
+ data: { name: "", phone: "" }
},
/**
@@ -27,24 +29,32 @@ Component({
*/
methods: {
async onSubmit() {
- const { phone, name } = this.data;
- if (!phone) {
+ const { data = {}, tenement, park } = this.data;
+ if (!data.phone) {
alertInfo("请输入手机号")
return
}
- if (!name) {
+ if (!data.name) {
alertInfo("请输入昵称")
return
}
- // const { code, message } = await update()
- // if (code !== OK) {
- // alertInfo(message)
- // return;
- // }
- // alertSuccess("操作成功")
- // if (this.onOk) {
- // this.onOk()
- // }
+
+ const { code, message } = await createTenementWxUser({ ...data, tenement, park })
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
+ alertSuccess("操作成功")
+ this.triggerEvent("ok")
+ },
+ onChange(e) {
+ console.log('e', e)
+ const { name } = e.currentTarget.dataset;
+ const newData = this.data.data;
+ newData[name] = e.detail;
+ this.setData({
+ data: newData,
+ })
}
}
})
\ No newline at end of file
diff --git a/pages/workBench/components/account/components/editModal/index.wxml b/pages/workBench/components/account/components/editModal/index.wxml
index 5a9a1f5..900e421 100644
--- a/pages/workBench/components/account/components/editModal/index.wxml
+++ b/pages/workBench/components/account/components/editModal/index.wxml
@@ -8,21 +8,24 @@
>
diff --git a/pages/workBench/components/account/index.js b/pages/workBench/components/account/index.js
index 7b6173b..81299da 100644
--- a/pages/workBench/components/account/index.js
+++ b/pages/workBench/components/account/index.js
@@ -1,4 +1,9 @@
// pages/workBench/components/account/index.js
+import request from "../../../../utils/request"
+import { getTenementBackInfo, getTenementUsers } from "../../../../service/tenement"
+import { alertInfo } from "../../../../utils/index"
+const { OK } = request
+
Component({
/**
@@ -12,7 +17,8 @@ Component({
* 组件的初始数据
*/
data: {
-
+ list: [],
+ tenementInfo: {},
},
/**
@@ -39,6 +45,7 @@ Component({
})
},
onConfirm(e) {
+ const that = this;
const { type, data } = e.detail;
switch(type) {
case "park":
@@ -53,10 +60,18 @@ Component({
tenement: data.id,
tenementName: data.name,
show: false,
+ }, () => {
+ that.initUserList();
+ that.getTenementInfo();
})
break;
}
},
+ onConcal() {
+ this.setData({
+ show: false,
+ })
+ },
handleDelete(e) {
const {} = e;
wx.showModal({
@@ -73,9 +88,34 @@ Component({
}
})
},
- async init() {
- const { tenementName } = this.data;
- const { code, message, data } = await
+ async getTenementInfo() {
+ const { tenement, park } = this.data;
+ const { code, message, tenement: data } = await getTenementBackInfo(park, tenement)
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
+ this.setData({
+ tenementInfo: data,
+ })
+ },
+ async initUserList() {
+ const { tenementName, park } = this.data;
+ const { code, message, data } = await getTenementUsers({ park, keyword: tenementName });
+ if (code !== OK) {
+ alertInfo(message)
+ return;
+ }
+ this.setData({
+ list: data,
+ })
+ },
+ handleAddSon() {
+ this.setData({
+ visible: true,
+ type: "add",
+ title: "新建子账号"
+ })
}
}
})
\ No newline at end of file
diff --git a/pages/workBench/components/account/index.wxml b/pages/workBench/components/account/index.wxml
index 06804ad..115801a 100644
--- a/pages/workBench/components/account/index.wxml
+++ b/pages/workBench/components/account/index.wxml
@@ -30,30 +30,28 @@
-
+
+ 添加子账号
+ 修改主账号
+
@@ -81,18 +79,25 @@
-
- 添加子账号
- 修改主账号
-
+
+
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages/workBench/components/account/index.wxss b/pages/workBench/components/account/index.wxss
index 80816c6..8a693b1 100644
--- a/pages/workBench/components/account/index.wxss
+++ b/pages/workBench/components/account/index.wxss
@@ -1 +1,5 @@
-/* pages/workBench/components/account/index.wxss */
\ No newline at end of file
+/* pages/workBench/components/account/index.wxss */
+
+.operateBox {
+ margin: 20rpx;
+}
\ No newline at end of file
diff --git a/pages/workBench/components/recharge/index.wxml b/pages/workBench/components/recharge/index.wxml
index 432691f..6a29299 100644
--- a/pages/workBench/components/recharge/index.wxml
+++ b/pages/workBench/components/recharge/index.wxml
@@ -5,6 +5,6 @@
bind:change="handleChange"
/>
-
-
+
+
\ No newline at end of file
diff --git a/pages/workBench/index.js b/pages/workBench/index.js
index 99e26d3..e257546 100644
--- a/pages/workBench/index.js
+++ b/pages/workBench/index.js
@@ -5,7 +5,7 @@ Page({
* 页面的初始数据
*/
data: {
- active: 2
+ active: 3
},
/**
diff --git a/service/tenement.js b/service/tenement.js
index 5f25a96..3401b24 100644
--- a/service/tenement.js
+++ b/service/tenement.js
@@ -7,6 +7,11 @@ export const getTenementList = async function({ park, keyword }) {
return await GET(`/wx/getTenementList?park=${park}&keyword=${replaceSpecialIcon(keyword)}`);
}
+// 后台用户获取园区id模糊搜索商户列表
+export const getWxTenementList = async function({ park, keyword }) {
+ return await GET(`/vx/getTenementList?park=${park}&keyword=${replaceSpecialIcon(keyword)}`);
+}
+
// 获取名下所有的商户
export const getOwnTenementList = async function() {
return await GET(`/wx/getOwnTenements`);
@@ -40,6 +45,16 @@ export const unbindMeter = async function(pid, tid, code) {
}
// 获取b端用户
-export const getTenementUsers = async function(id) {
- return await GET(`/records/getWxUserList`);
-}
\ No newline at end of file
+export const getTenementUsers = async function({ park, keyword }) {
+ return await GET(`/records/getWxUserList?park=${park}&keyword=${keyword}`);
+}
+
+// c端获取指定商户的详细信息
+export const getTenementBackInfo = async (pid, tid) => {
+ return await GET(`/vx/${pid}/${tid}`);
+}
+
+// 新增用户
+export const createTenementWxUser = async function(data) {
+ return await POST(`/wx/createUser`, data)
+}