up.

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

@@ -0,0 +1,101 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { Channel, ChannelParam } from './model';
+
+/**
+ * 分页查询会员
+ */
+export async function pageChannels(params: ChannelParam) {
+  const res = await request.get<ApiResult<PageResult<Channel>>>(
+    '/xm/channel/page',
+    { params }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询用户列表
+ */
+export async function listUsers(params?: ChannelParam) {
+  const res = await request.get<ApiResult<Channel[]>>('/system/user', {
+    params
+  });
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询用户
+ */
+export async function getUser(id: number) {
+  const res = await request.get<ApiResult<Channel>>('/system/user/' + id);
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加用户
+ */
+export async function addUser(data: Channel) {
+  const res = await request.post<ApiResult<unknown>>('/system/user', data);
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改用户
+ */
+export async function updateUser(data: Channel) {
+  const res = await request.put<ApiResult<unknown>>('/system/user', data);
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除用户
+ */
+export async function removeUser(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>('/system/user/' + id);
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除用户
+ */
+export async function removeUsers(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>('/system/user/batch', {
+    data
+  });
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改用户状态
+ */
+export async function updateUserStatus(userId?: number, status?: number) {
+  const res = await request.put<ApiResult<unknown>>('/system/user/status', {
+    userId,
+    status
+  });
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

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

@@ -0,0 +1,12 @@
+import type { PageParam } from '@/api';
+/**
+ * 会员
+ */
+export interface Channel {}
+
+/**
+ * 会员搜索条件
+ */
+export interface ChannelParam extends PageParam {
+  account?: string;
+}

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

@@ -7,7 +7,7 @@ import type { Member, MemberParam } from './model';
  */
 export async function pageMembers(params: MemberParam) {
   const res = await request.get<ApiResult<PageResult<Member>>>(
-    '/member/member/page',
+    '/xm/member/page',
     { params }
   );
   if (res.data.code === 0) {

z_ele/src/views/xm/channel/components/member-edit.vue

@@ -0,0 +1,147 @@
+<!-- 角色编辑弹窗 -->
+<template>
+  <ele-modal
+    form
+    destroy-on-close
+    :width="460"
+    v-model="visible"
+    :title="isUpdate ? '修改角色' : '添加角色'"
+  >
+    <el-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      @submit.prevent=""
+    >
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input
+          clearable
+          :maxlength="20"
+          v-model="form.roleName"
+          placeholder="请输入角色名称"
+        />
+      </el-form-item>
+      <el-form-item label="角色标识" prop="roleCode">
+        <el-input
+          clearable
+          :maxlength="20"
+          v-model="form.roleCode"
+          placeholder="请输入角色标识"
+        />
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input
+          :rows="4"
+          type="textarea"
+          v-model="form.comments"
+          placeholder="请输入备注"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="handleCancel">取消</el-button>
+      <el-button type="primary" :loading="loading" @click="save">
+        保存
+      </el-button>
+    </template>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import type { FormInstance, FormRules } from 'element-plus';
+  import { EleMessage } from 'ele-admin-plus';
+  import { useFormData } from '@/utils/use-form-data';
+  import { addRole, updateRole } from '@/api/system/role';
+  import type { Role } from '@/api/system/role/model';
+
+  const props = defineProps<{
+    /** 修改回显的数据 */
+    data?: Role | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+  }>();
+
+  /** 弹窗是否打开 */
+  const visible = defineModel({ type: Boolean });
+
+  /** 是否是修改 */
+  const isUpdate = ref(false);
+
+  /** 提交状态 */
+  const loading = ref(false);
+
+  /** 表单实例 */
+  const formRef = ref<FormInstance | null>(null);
+
+  /** 表单数据 */
+  const [form, resetFields, assignFields] = useFormData<Role>({
+    roleId: void 0,
+    roleName: '',
+    roleCode: '',
+    comments: ''
+  });
+
+  /** 表单验证规则 */
+  const rules = reactive<FormRules>({
+    roleName: [
+      {
+        required: true,
+        message: '请输入角色名称',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    roleCode: [
+      {
+        required: true,
+        message: '请输入角色标识',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  /** 关闭弹窗 */
+  const handleCancel = () => {
+    visible.value = false;
+  };
+
+  /** 保存编辑 */
+  const save = () => {
+    formRef.value?.validate?.((valid) => {
+      if (!valid) {
+        return;
+      }
+      loading.value = true;
+      const saveOrUpdate = isUpdate.value ? updateRole : addRole;
+      saveOrUpdate(form)
+        .then((msg) => {
+          loading.value = false;
+          EleMessage.success({ message: msg, plain: true });
+          handleCancel();
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          EleMessage.error({ message: e.message, plain: true });
+        });
+    });
+  };
+
+  /** 监听弹窗打开 */
+  watch(visible, () => {
+    if (visible.value) {
+      if (props.data) {
+        assignFields(props.data);
+        isUpdate.value = true;
+      } else {
+        resetFields();
+        isUpdate.value = false;
+      }
+    }
+  });
+</script>

z_ele/src/views/xm/channel/components/member-search.vue

@@ -0,0 +1,93 @@
+<!-- 搜索表单 -->
+<template>
+  <ele-card :body-style="{ paddingBottom: '2px' }">
+    <el-form
+      label-width="82px"
+      @keyup.enter.prevent="search"
+      @submit.prevent=""
+    >
+      <el-row :gutter="8">
+        <el-col :lg="4" :md="8" :sm="12" :xs="24">
+          <el-form-item label="账号">
+            <el-input
+              clearable
+              v-model.trim="form.account"
+              placeholder="请输入(会员ID/手机号/ip)"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :lg="6" :md="18" :sm="17" :xs="24">
+          <el-form-item label="注册时间">
+            <el-date-picker
+              unlink-panels
+              type="datetimerange"
+              v-model="registerTime"
+              range-separator="-"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              class="ele-fluid"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :lg="6" :md="18" :sm="17" :xs="24">
+          <el-form-item label="在线时间">
+            <el-date-picker
+              unlink-panels
+              type="datetimerange"
+              v-model="onlineTime"
+              range-separator="-"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              class="ele-fluid"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :lg="12" :md="8" :sm="24" :xs="24">
+          <el-form-item label-width="16px">
+            <el-button type="primary" @click="search">查询</el-button>
+            <el-button @click="reset">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </ele-card>
+</template>
+
+<script lang="ts" setup>
+  import { useFormData } from '@/utils/use-form-data';
+  import type { MemberParam } from '@/api/xm/member/model';
+  import { ref } from 'vue';
+
+  const emit = defineEmits<{
+    (e: 'search', where?: MemberParam): void;
+  }>();
+
+  /** 表单数据 */
+  const [form, resetFields] = useFormData<MemberParam>({
+    account: ''
+  });
+  const registerTime = ref([]);
+  const onlineTime = ref([]);
+  /** 搜索 */
+  const search = () => {
+    let where: any = { ...form };
+    if (registerTime.value.length == 2 && registerTime.value[0]) {
+      where.registerStartTime = registerTime.value[0];
+      where.registerEndTime = registerTime.value[1];
+    }
+    if (onlineTime.value.length == 2 && onlineTime.value[0]) {
+      where.onlineStartTime = onlineTime.value[0];
+      where.onlineEndTime = onlineTime.value[1];
+    }
+
+    emit('search', where);
+  };
+
+  /**  重置 */
+  const reset = () => {
+    resetFields();
+    search();
+  };
+</script>

z_ele/src/views/xm/channel/index.vue

@@ -0,0 +1,175 @@
+<template>
+  <ele-page>
+    <!-- 搜索表单 -->
+    <member-search @search="reload" />
+    <ele-card :body-style="{ paddingTop: '8px' }">
+      <!-- 表格 -->
+      <ele-pro-table
+        ref="tableRef"
+        row-key="roleId"
+        :columns="columns"
+        :datasource="datasource"
+        :show-overflow-tooltip="true"
+        v-model:selections="selections"
+        :highlight-current-row="true"
+        cache-key="systemRoleTable"
+      >
+        <template #toolbar> </template>
+        <template #action="{ row }">
+          <el-link type="primary" underline="never" @click="openEdit(row)">
+            详情
+          </el-link>
+          <el-divider direction="vertical" />
+          <el-link type="danger" underline="never" @click="remove(row)">
+            注销
+          </el-link>
+        </template>
+      </ele-pro-table>
+    </ele-card>
+    <!-- 编辑弹窗 -->
+    <member-edit v-model="showEdit" :data="current" @done="reload" />
+  </ele-page>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { ElMessageBox } from 'element-plus';
+  import { EleMessage } from 'ele-admin-plus';
+  import type { EleProTable } from 'ele-admin-plus';
+  import type {
+    DatasourceFunction,
+    Columns
+  } from 'ele-admin-plus/es/ele-pro-table/types';
+  import MemberSearch from './components/member-search.vue';
+  import MemberEdit from './components/member-edit.vue';
+  import { removeRoles } from '@/api/system/role';
+  import type { Channel, ChannelParam } from '@/api/xm/channel/model';
+  import { pageChannels } from '@/api/xm/channel';
+
+  defineOptions({ name: 'SystemRole' });
+
+  /** 表格实例 */
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  /** 表格列配置 */
+  const columns = ref<Columns>([
+    {
+      type: 'selection',
+      columnKey: 'selection',
+      width: 50,
+      align: 'center' /* ,
+      fixed: 'left' */
+    },
+    {
+      type: 'index',
+      columnKey: 'index',
+      width: 50,
+      align: 'center'
+    },
+    {
+      prop: 'memberId',
+      label: '会员ID',
+      width: 80
+    },
+    {
+      prop: 'channel.name',
+      label: '注册渠道',
+      minWidth: 120
+    },
+    {
+      prop: 'realname',
+      label: '姓名',
+      width: 80
+    },
+    {
+      prop: 'telephoneMd5',
+      label: '手机号MD5',
+      minWidth: 300
+    },
+    {
+      prop: 'onlineIp',
+      label: '最后在线Ip',
+      width: 170,
+      align: 'center'
+    },
+    {
+      prop: 'onlineTime',
+      label: '最后在线时间',
+      width: 170,
+      align: 'center'
+    },
+    {
+      prop: 'createTime',
+      label: '注册时间',
+      width: 170,
+      align: 'center'
+    },
+    {
+      columnKey: 'action',
+      label: '操作',
+      width: 200,
+      align: 'center' /* ,
+      fixed: 'right' */,
+      slot: 'action',
+      hideInPrint: true,
+      hideInExport: true
+    }
+  ]);
+
+  /** 表格选中数据 */
+  const selections = ref<Channel[]>([]);
+
+  /** 当前编辑数据 */
+  const current = ref<Channel | null>(null);
+
+  /** 是否显示编辑弹窗 */
+  const showEdit = ref(false);
+
+  /** 表格数据源 */
+  const datasource: DatasourceFunction = ({ pages, where, orders }) => {
+    return pageChannels({ ...where, ...orders, ...pages });
+  };
+
+  /** 搜索 */
+  const reload = (where?: ChannelParam) => {
+    selections.value = [];
+    tableRef.value?.reload?.({ page: 1, where });
+  };
+
+  /** 打开编辑弹窗 */
+  const openEdit = (row?: Channel) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /** 删除单个 */
+  const remove = (row?: Channel) => {
+    const rows = row == null ? selections.value : [row];
+    if (!rows.length) {
+      EleMessage.error({ message: '请至少选择一条数据', plain: true });
+      return;
+    }
+    ElMessageBox.confirm(
+      '确定要删除“' + rows.map((d) => d.roleName).join(', ') + '”吗?',
+      '系统提示',
+      { type: 'warning', draggable: true }
+    )
+      .then(() => {
+        const loading = EleMessage.loading({
+          message: '请求中..',
+          plain: true
+        });
+        removeRoles(rows.map((d) => d.roleId))
+          .then((msg) => {
+            loading.close();
+            EleMessage.success({ message: msg, plain: true });
+            reload();
+          })
+          .catch((e) => {
+            loading.close();
+            EleMessage.error({ message: e.message, plain: true });
+          });
+      })
+      .catch(() => {});
+  };
+</script>