up.

z_ele/src/api/xm/member/index.ts

@@ -16,8 +16,6 @@ export async function pageMembers(params: MemberParam) {
   return Promise.reject(new Error(res.data.message));
 }
 
-
-
 /**
  * 查询用户列表
  */

z_ele/src/api/xm/member/model/index.ts

@@ -7,4 +7,6 @@ export interface Member {}
 /**
  * 会员搜索条件
  */
-export interface MemberParam extends PageParam {}
+export interface MemberParam extends PageParam {
+  account?: string;
+}

z_ele/src/views/member/user/components/member-search.vue

@@ -8,19 +8,10 @@
     >
       <el-row :gutter="8">
         <el-col :lg="6" :md="8" :sm="12" :xs="24">
-          <el-form-item label="角色名称">
+          <el-form-item label="会员ID/会员手机号">
             <el-input
               clearable
-              v-model.trim="form.roleName"
-              placeholder="请输入"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :lg="6" :md="8" :sm="12" :xs="24">
-          <el-form-item label="角色标识">
-            <el-input
-              clearable
-              v-model.trim="form.roleCode"
+              v-model.trim="form.account"
               placeholder="请输入"
             />
           </el-form-item>
@@ -38,17 +29,15 @@
 
 <script lang="ts" setup>
   import { useFormData } from '@/utils/use-form-data';
-  import type { RoleParam } from '@/api/system/role/model';
+  import type { MemberParam } from '@/api/xm/member/model';
 
   const emit = defineEmits<{
-    (e: 'search', where?: RoleParam): void;
+    (e: 'search', where?: MemberParam): void;
   }>();
 
   /** 表单数据 */
-  const [form, resetFields] = useFormData<RoleParam>({
-    roleName: '',
-    roleCode: '',
-    comments: ''
+  const [form, resetFields] = useFormData<MemberParam>({
+    account: ''
   });
 
   /** 搜索 */

z_ele/src/views/member/user/index.vue

@@ -43,8 +43,8 @@
   import MemberSearch from './components/member-search.vue';
   import MemberEdit from './components/member-edit.vue';
   import { removeRoles } from '@/api/system/role';
-  import type { Role, RoleParam } from '@/api/system/role/model';
-  import { pageMembers } from '@/api/member/member';
+  import type { Member, MemberParam } from '@/api/xm/member/model';
+  import { pageMembers } from '@/api/xm/member';
 
   defineOptions({ name: 'SystemRole' });
 
@@ -72,12 +72,12 @@
       width: 80
     },
     {
-      prop: 'realname',
-      label: '姓名',
-      width: 80
+      prop: 'channel.name',
+      label: '注册渠道',
+      minWidth: 120
     },
     {
-      prop: 'channel.name',
+      prop: 'realname',
       label: '姓名',
       width: 80
     },
@@ -117,10 +117,10 @@
   ]);
 
   /** 表格选中数据 */
-  const selections = ref<Role[]>([]);
+  const selections = ref<Member[]>([]);
 
   /** 当前编辑数据 */
-  const current = ref<Role | null>(null);
+  const current = ref<Member | null>(null);
 
   /** 是否显示编辑弹窗 */
   const showEdit = ref(false);
@@ -134,25 +134,21 @@
   };
 
   /** 搜索 */
-  const reload = (where?: RoleParam) => {
+  const reload = (where?: MemberParam) => {
     selections.value = [];
     tableRef.value?.reload?.({ page: 1, where });
   };
 
   /** 打开编辑弹窗 */
-  const openEdit = (row?: Role) => {
+  const openEdit = (row?: Member) => {
     current.value = row ?? null;
     showEdit.value = true;
   };
 
-  /** 打开权限分配弹窗 */
-  const openAuth = (row?: Role) => {
-    current.value = row ?? null;
-    showAuth.value = true;
-  };
+
 
   /** 删除单个 */
-  const remove = (row?: Role) => {
+  const remove = (row?: Member) => {
     const rows = row == null ? selections.value : [row];
     if (!rows.length) {
       EleMessage.error({ message: '请至少选择一条数据', plain: true });