From 9142bc1c6a90413067db75372b525c57a178a55b Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Sat, 22 Jan 2022 10:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/AddGird.vue    | 26 ++++++++++++++++++++++-
 src/apps/AppGridManagement/SelectUser.vue |  8 ++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppGridManagement/AddGird.vue b/src/apps/AppGridManagement/AddGird.vue
index a6287389..eeb2a5da 100644
--- a/src/apps/AppGridManagement/AddGird.vue
+++ b/src/apps/AppGridManagement/AddGird.vue
@@ -102,8 +102,32 @@ export default {
       if(!this.form.girdName){
         return this.$u.toast('请输入网格名称')
       }
+
+      var girdMemberManageList = []
+      if(this.form.girdMemberManageList && this.form.girdMemberManageList.length) {
+        girdMemberManageList = this.form.girdMemberManageList.map((item) => {
+          return {
+            wxUserId: item.id,
+            phone: item.mobile,
+            photo: item.avatar,
+            name: item.name
+          }
+        })
+      }
+
+      var girdMemberList = []
+      if(this.form.girdMemberList && this.form.girdMemberList.length) {
+        girdMemberList = this.form.girdMemberList.map((item) => {
+          return {
+            wxUserId: item.id,
+            phone: item.mobile,
+            photo: item.avatar,
+            name: item.name
+          }
+        })
+      }
       
-      this.$http.post(`/app/appgirdinfo/addOrUpdateByEw`, this.form).then((res) => {
+      this.$http.post(`/app/appgirdinfo/addOrUpdateByEw`, {...this.form, girdMemberManageList, girdMemberList}).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('update')
diff --git a/src/apps/AppGridManagement/SelectUser.vue b/src/apps/AppGridManagement/SelectUser.vue
index 0e78c4ac..8933ce77 100644
--- a/src/apps/AppGridManagement/SelectUser.vue
+++ b/src/apps/AppGridManagement/SelectUser.vue
@@ -46,15 +46,21 @@ export default {
   },
   onLoad() {
     this.selectUserList = uni.getStorageSync('selectUserList')
+    this.selectUserList.map((item) => {
+      item.id =item.wxUserId
+      item.mobile = item.phone
+      item.avatar = item.photo
+    })
     this.getList()
   },
   methods: {
     getListInit() {
       this.userList = []
       this.current = 1
+      this.getList()
     },
     getList() {
-      this.$http.post(`/app/appgirdmemberinfo/list?name=${this.name}&current=${this.current}&size=20`).then((res) => {
+      this.$http.post(`/app/wxcp/wxuser/list?name=${this.name}&current=${this.current}&size=20`).then((res) => {
         if (res?.data) {
           res.data.records.map((item) => {
             item.isChecked = false