diff --git a/src/api/distribution/memberManager.js b/src/api/distribution/memberManager.js
index 0bf426ceca58536ce779452a9d82341736baeb11..4832b55f0e3a510ea8df26f7b50c7b7b6eb58b5b 100644
--- a/src/api/distribution/memberManager.js
+++ b/src/api/distribution/memberManager.js
@@ -1,9 +1,9 @@
  /*
  * @Descripttion:
- * @Author: zhengminjie
+ * @Author:zhengminjie,xiayujia
  * @Date: 2021-05-13 11:27:27
- * @LastEditors: zhengminjie
- * @LastEditTime: 2021-05-13 11:27:28
+ * @LastEditors: xiayujia
+ * @LastEditTime: 2021-06-11 11:27:28
  */
 import request from '@/utils/request'
 
@@ -32,19 +32,32 @@ export function getGroup(groupId){
     })
   }  
 
-//查看成员，获取成员Id
-export function searchMemberId(groupId){
+//查看成员，获取成员列表
+export function searchMember(groupId){
   return request({
     url:'/distribution/personManager/searchMI?groupId='+groupId,
     method: 'get',
   })
 }  
 
-//查看成员，获取成员名
-export function searchMemberName(userId){
+//添加成员
+// export function addMember(data){
+//   return request({
+//     url:'/distribution/personMManager/add',
+//     method: 'post',
+//     data: data
+//   })
+// }  
+
+//删除成员
+export function deleteMember(userName,groupId){
   return request({
-    url:'/distribution/personManager/searchMN?userId='+userId,
-    method: 'get',
+    url:'/distribution/personManager/delete',
+    method: 'post',
+    data: { // 提交数据
+      "username": userName,
+      "groupId":groupId
+    },
   })
 }  
 
diff --git a/src/views/distribution/memberManager/index.vue b/src/views/distribution/memberManager/index.vue
index bb6ddb91af13076b6835511b3c7124d0d25cd83f..439ec82a4e2a4f2a848ea95e6dc32048caa67a9f 100644
--- a/src/views/distribution/memberManager/index.vue
+++ b/src/views/distribution/memberManager/index.vue
@@ -2,8 +2,8 @@
  * @Descripttion:
  * @Author: zhengminjie,xiayujia
  * @Date: 2021-04-05 19:16:43
- * @LastEditors: zhengminjie
- * @LastEditTime: 2021-04-05 19:38:14
+ * @LastEditors: xiayujia
+ * @LastEditTime: 2021-06-12 19:38:14
 -->
 <template>
   <div class="app-container">
@@ -37,18 +37,18 @@
           plain
           size="mini"
           icon="el-icon-circle-plus"
-          @click="addMember=true"
+          @click="addmember=true"
         >添加成员</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-popover
           placement="top"
           width="160"
-          v-model="deletemenber">
+          v-model="deletemember">
           <p>你确定要删除该成员嘛？</p>
           <div style="text-align: right; margin: 0">
-            <el-button size="mini" type="text" @click="deletemenber = false">取消</el-button>
-            <el-button size="mini" type="text" @click="DeleteMenber">确定</el-button>
+            <el-button size="mini" type="text" @click="deletemember = false">取消</el-button>
+            <el-button size="mini" type="text" @click="DeleteMember">确定</el-button>
           </div>
           <el-button
             type="danger"
@@ -217,7 +217,7 @@
 </template>
 
 <script>
-import {selectGroup, getGroup,searchMemberId,searchMemberName,importTemplate,exportMember} from '@/api/distribution/memberManager'
+import {selectGroup, getGroup,searchMember,deleteMember,importTemplate,exportMember} from '@/api/distribution/memberManager'
 import { getToken } from "@/utils/auth";
 
 export default {
@@ -230,6 +230,10 @@ export default {
         loading: true,
         // 选中数组
         ids: [],
+        //删除按钮选中数组
+        deleteids:[],
+        //选中的群组
+        groupids:[],
         // 非多个禁用
         multiple: true,
         // 显示搜索条件
@@ -241,7 +245,7 @@ export default {
           userName:"",
         },
         // 删除成员
-        deletemenber:false,
+        deletemember:false,
          // 导入成员名单
         downloadgroupForm:{},
         // 用户导入参数
@@ -287,9 +291,6 @@ export default {
         value:"",
         //群组id
         groupid:"",
-        userId:{
-         // username:""
-        },
       }
     },
     created(){
@@ -350,22 +351,11 @@ export default {
       },
       //查看成员
       search(){
-        this.userId=Array.from(this.userId);
-        searchMemberId(this.groupid).then(res=>{
+        searchMember(this.groupid).then(res=>{
           this.memberManagerList=[];
-          this.userId=[];
           this.memberManagerList=res.rows;
           let i=0;
           res.rows.forEach(item=>{
-            this.userId[i]=item.userId;
-            this.userId.forEach(userid=>{
-              let i=0;
-              searchMemberName(userid).then(response=>{
-                this.memberManagerList[i].userName=response;
-                console.log(this.memberManagerList[i].userName);
-                i++;
-                });
-            })
             this.memberManagerList[i].groupNum=item.groupNum;
             if(item.userIdentity=="创建者")
             {
@@ -379,20 +369,45 @@ export default {
             {
               this.memberManagerList[i].userIdentity="普通人";
             }
-            i++;
+              i++;
           });
         });
       },
-      SelectionChange(selection){
-        this.addId = selection.map(item => item.groupNum);
-      },
       //添加成员
       AddMember(){
-
+      //   let message = {};
+      //   message.messageType = 3;
+      //   message.messageContent = "已入群";
+      //   //message.content ="成功加入群";
+      //   message.groupNum = this.addMemberForm.groupNum;
+      //   message.userName=this.addMemberForm.userName;
+      //   //console.log(message);
+      //   addMember(message).then(res=>{
+      //     console.log(res);
+      //     this.getList();
+      //     this.addmember = false;
+      //   })
       },
       /** 删除成员操作 */
-      DeleteMenber(){
-        this.deletemenber = false;
+      DeleteMember(rows){
+         let userName = [];
+         let groupId=[];
+        if(rows.userName == undefined){
+          userName = this.deleteids;
+          groupId[0]=this.groupid;
+        }
+        else{
+           userName[0] = rows.userName;
+        }
+         console.log(userName);
+         console.log(typeof userName);
+         console.log(groupId);
+         console.log(typeof groupId);
+         deleteMember(userName,this.groupid).then(res=>{
+           console.log(res);
+           this.getList();
+           this.deletemember = false;
+        })
       },
       /** 配置权限操作 */
       Power(){
@@ -400,6 +415,8 @@ export default {
       },
       // 多选框选中数据
       handleSelectionChange(selection) {
+        this.deleteids=selection.map(item=>item.userName)
+        //this.groupids=selection.map(item=>item.groupNum)
         this.ids = selection.map(item => item.roleId)
         this.multiple = !selection.length
       },