From 6fa5c32319c3255b4b03ebdb101d2a045f6d929a Mon Sep 17 00:00:00 2001
From: Flow <958079825@qq.com>
Date: Mon, 1 Sep 2025 15:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/combo/index.ts            |  47 ++++++
 src/api/order/index.ts            |  52 ++++++
 src/views/combo/ComboForm.vue     | 128 +++++++++++++++
 src/views/combo/index.vue         | 208 ++++++++++++++++++++++++
 src/views/orders/OrderForm.vue    | 139 ++++++++++++++++
 src/views/orders/index.vue        | 261 ++++++++++++++++++++++++++++++
 src/views/person/index.vue        |   4 +-
 src/views/personarchive/index.vue |   4 +-
 8 files changed, 839 insertions(+), 4 deletions(-)
 create mode 100644 src/api/combo/index.ts
 create mode 100644 src/api/order/index.ts
 create mode 100644 src/views/combo/ComboForm.vue
 create mode 100644 src/views/combo/index.vue
 create mode 100644 src/views/orders/OrderForm.vue
 create mode 100644 src/views/orders/index.vue

diff --git a/src/api/combo/index.ts b/src/api/combo/index.ts
new file mode 100644
index 000000000..0bad9ab7a
--- /dev/null
+++ b/src/api/combo/index.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+// 会员套餐 VO
+export interface ComboVO {
+  id: number // 主键ID
+  orgid: number // 机构ID
+  comboname: string // 套餐名称
+  price: string // 套餐价格
+  period: number // 套餐有效期（天）
+  status: number // 状态（0禁用 1启用）
+  description: string // 套餐描述
+  createtime: number // 创建时间（时间戳）
+  updatetime: number // 更新时间（时间戳）
+}
+
+// 会员套餐 API
+export const ComboApi = {
+  // 查询会员套餐分页
+  getComboPage: async (params: any) => {
+    return await request.get({ url: `/system/combo/page`, params })
+  },
+
+  // 查询会员套餐详情
+  getCombo: async (id: number) => {
+    return await request.get({ url: `/system/combo/get?id=` + id })
+  },
+
+  // 新增会员套餐
+  createCombo: async (data: ComboVO) => {
+    return await request.post({ url: `/system/combo/create`, data })
+  },
+
+  // 修改会员套餐
+  updateCombo: async (data: ComboVO) => {
+    return await request.put({ url: `/system/combo/update`, data })
+  },
+
+  // 删除会员套餐
+  deleteCombo: async (id: number) => {
+    return await request.delete({ url: `/system/combo/delete?id=` + id })
+  },
+
+  // 导出会员套餐 Excel
+  exportCombo: async (params) => {
+    return await request.download({ url: `/system/combo/export-excel`, params })
+  },
+}
diff --git a/src/api/order/index.ts b/src/api/order/index.ts
new file mode 100644
index 000000000..7db3091ba
--- /dev/null
+++ b/src/api/order/index.ts
@@ -0,0 +1,52 @@
+import request from '@/config/axios'
+
+// 会员订单 VO
+export interface OrderVO {
+  id: number // 主键ID
+  orgid: number // 组织机构ID
+  userid: number // 用户ID
+  comboid: number // 套餐ID
+  orderno: string // 订单编号
+  originalprice: string // 原价
+  actualprice: string // 实付金额
+  status: number // 订单状态(0待支付 1已支付 2已取消 3已退款)
+  paytype: number // 支付方式(1微信 2支付宝 3银行卡)
+  paytime: number // 支付时间
+  vipstarttime: number // 会员开始时间
+  vipendtime: number // 会员结束时间
+  createtime: number // 创建时间
+  updatetime: number // 更新时间
+}
+
+// 会员订单 API
+export const OrderApi = {
+  // 查询会员订单分页
+  getOrderPage: async (params: any) => {
+    return await request.get({ url: `/system/order/page`, params })
+  },
+
+  // 查询会员订单详情
+  getOrder: async (id: number) => {
+    return await request.get({ url: `/system/order/get?id=` + id })
+  },
+
+  // 新增会员订单
+  createOrder: async (data: OrderVO) => {
+    return await request.post({ url: `/system/order/create`, data })
+  },
+
+  // 修改会员订单
+  updateOrder: async (data: OrderVO) => {
+    return await request.put({ url: `/system/order/update`, data })
+  },
+
+  // 删除会员订单
+  deleteOrder: async (id: number) => {
+    return await request.delete({ url: `/system/order/delete?id=` + id })
+  },
+
+  // 导出会员订单 Excel
+  exportOrder: async (params) => {
+    return await request.download({ url: `/system/order/export-excel`, params })
+  },
+}
diff --git a/src/views/combo/ComboForm.vue b/src/views/combo/ComboForm.vue
new file mode 100644
index 000000000..e2faa59e2
--- /dev/null
+++ b/src/views/combo/ComboForm.vue
@@ -0,0 +1,128 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="套餐名称" prop="comboname">
+        <el-input v-model="formData.comboname" placeholder="请输入套餐名称" />
+      </el-form-item>
+      <el-form-item label="套餐价格" prop="price">
+        <el-input v-model="formData.price" placeholder="请输入套餐价格" />
+      </el-form-item>
+      <el-form-item label="套餐有效期" prop="period">
+        <el-input v-model="formData.period" placeholder="请输入套餐有效期（天）" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio :label="1">启用</el-radio>
+          <el-radio :label="0">禁用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="套餐描述" prop="description">
+        <el-input v-model="formData.description" type="textarea" :rows="6" placeholder="请输入套餐描述"/>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { ComboApi, ComboVO } from '@/api/combo'
+import { getUserProfile } from '@/api/system/user/profile'
+
+/** 会员套餐 表单 */
+defineOptions({ name: 'ComboForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  orgid: undefined,
+  comboname: undefined,
+  price: undefined,
+  period: undefined,
+  status: undefined,
+  description: undefined,
+  createtime: undefined,
+  updatetime: undefined,
+})
+const formRules = reactive({
+  comboname: [{ required: true, message: '套餐名称不能为空', trigger: 'blur' }],
+  price: [{ required: true, message: '套餐价格不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ComboApi.getCombo(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const userProfile = await getUserProfile()
+    formData.value.orgid = userProfile.dept.orgid
+    const data = formData.value as unknown as ComboVO
+    if (formType.value === 'create') {
+      data.createtime = Date.now()
+      await ComboApi.createCombo(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      data.updatetime = Date.now()
+      await ComboApi.updateCombo(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    orgid: undefined,
+    comboname: undefined,
+    price: undefined,
+    period: undefined,
+    status: undefined,
+    description: undefined,
+    createtime: undefined,
+    updatetime: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/combo/index.vue b/src/views/combo/index.vue
new file mode 100644
index 000000000..647696683
--- /dev/null
+++ b/src/views/combo/index.vue
@@ -0,0 +1,208 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="套餐名称" prop="comboname">
+        <el-input
+          v-model="queryParams.comboname"
+          placeholder="请输入套餐名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="启用" value="1" />
+          <el-option label="禁用" value="0" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" width="80">
+        <template #default="scope">
+          {{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="套餐名称" align="center" prop="comboname" />
+      <el-table-column label="套餐价格" align="center" prop="price" />
+      <el-table-column label="套餐有效期（天）" align="center" prop="period" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template #default="scope">
+          <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'">{{ scope.row.status === 1 ? '启用' : '禁用' }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="套餐描述" align="center" prop="description" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createtime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="更新时间"
+        align="center"
+        prop="updatetime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ComboForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ComboApi, ComboVO } from '@/api/combo'
+import ComboForm from './ComboForm.vue'
+
+/** 会员套餐 列表 */
+defineOptions({ name: 'Combo' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ComboVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  orgid: undefined,
+  comboname: undefined,
+  price: undefined,
+  period: undefined,
+  status: undefined,
+  description: undefined,
+  createtime: [],
+  updatetime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ComboApi.getComboPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ComboApi.deleteCombo(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ComboApi.exportCombo(queryParams)
+    download.excel(data, '会员套餐.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/orders/OrderForm.vue b/src/views/orders/OrderForm.vue
new file mode 100644
index 000000000..65dfb99f3
--- /dev/null
+++ b/src/views/orders/OrderForm.vue
@@ -0,0 +1,139 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="订单编号" prop="orderno">
+        <el-input v-model="formData.orderno" placeholder="请输入订单编号" />
+      </el-form-item>
+      <el-form-item label="原价" prop="originalprice">
+        <el-input v-model="formData.originalprice" placeholder="请输入原价" />
+      </el-form-item>
+      <el-form-item label="实付金额" prop="actualprice">
+        <el-input v-model="formData.actualprice" placeholder="请输入实付金额" />
+      </el-form-item>
+      <el-form-item label="订单状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio value="0">待支付</el-radio>
+          <el-radio value="1">已支付</el-radio>
+          <el-radio value="2">已取消</el-radio>
+          <el-radio value="3">已退款</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="支付方式" prop="paytype">
+        <el-radio-group v-model="formData.paytype">
+          <el-radio value="1">微信</el-radio>
+          <el-radio value="2">支付宝</el-radio>
+          <el-radio value="3">银行卡</el-radio>
+          <el-radio value="4">其他</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { OrderApi, OrderVO } from '@/api/order'
+
+/** 会员订单 表单 */
+defineOptions({ name: 'OrderForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  orgid: undefined,
+  userid: undefined,
+  comboid: undefined,
+  orderno: undefined,
+  originalprice: undefined,
+  actualprice: undefined,
+  status: undefined,
+  paytype: undefined,
+  paytime: undefined,
+  vipstarttime: undefined,
+  vipendtime: undefined,
+  createtime: undefined,
+  updatetime: undefined,
+})
+const formRules = reactive({
+  status: [{ required: true, message: '订单状态不能为空', trigger: 'blur' }],
+  paytype: [{ required: true, message: '支付方式不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await OrderApi.getOrder(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as OrderVO
+    if (formType.value === 'create') {
+      await OrderApi.createOrder(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await OrderApi.updateOrder(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    orgid: undefined,
+    userid: undefined,
+    comboid: undefined,
+    orderno: undefined,
+    originalprice: undefined,
+    actualprice: undefined,
+    status: undefined,
+    paytype: undefined,
+    paytime: undefined,
+    vipstarttime: undefined,
+    vipendtime: undefined,
+    createtime: undefined,
+    updatetime: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/orders/index.vue b/src/views/orders/index.vue
new file mode 100644
index 000000000..a3b576f62
--- /dev/null
+++ b/src/views/orders/index.vue
@@ -0,0 +1,261 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="套餐ID" prop="comboid">
+        <el-input
+          v-model="queryParams.comboid"
+          placeholder="请输入套餐ID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="订单编号" prop="orderno">
+        <el-input
+          v-model="queryParams.orderno"
+          placeholder="请输入订单编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="实付金额" prop="actualprice">
+        <el-input
+          v-model="queryParams.actualprice"
+          placeholder="请输入实付金额"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-200px"
+        />
+      </el-form-item>
+      <el-form-item label="订单状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择订单状态"
+          clearable
+          class="!w-200px"
+        >
+          <el-option label="待支付" value="0" />
+          <el-option label="已支付" value="1" />
+          <el-option label="已取消" value="2" />
+          <el-option label="已退款" value="3" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="支付方式" prop="paytype">
+        <el-select
+          v-model="queryParams.paytype"
+          placeholder="请选择支付方式"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="微信" value="1" />
+          <el-option label="支付宝" value="2" />
+          <el-option label="银行卡" value="3" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="支付时间" prop="paytime">
+        <el-date-picker
+          v-model="queryParams.paytime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" width="80">
+        <template #default="{ $index }">
+          {{ (queryParams.pageNo - 1) * queryParams.pageSize + $index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column label="订单编号" align="center" prop="orderno" />
+      <el-table-column label="用户ID" align="center" prop="userid" />
+      <el-table-column label="套餐ID" align="center" prop="comboid" />
+      <el-table-column label="原价" align="center" prop="originalprice" />
+      <el-table-column label="实付金额" align="center" prop="actualprice" />
+      <el-table-column label="订单状态" align="center" prop="status" />
+      <el-table-column label="支付方式" align="center" prop="paytype" />
+      <el-table-column
+        label="支付时间"
+        align="center"
+        prop="paytime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="会员开始时间"
+        align="center"
+        prop="vipstarttime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="会员结束时间"
+        align="center"
+        prop="vipendtime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <OrderForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { OrderApi, OrderVO } from '@/api/order'
+import OrderForm from './OrderForm.vue'
+
+/** 会员订单 列表 */
+defineOptions({ name: 'Order' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<OrderVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  orgid: undefined,
+  userid: undefined,
+  comboid: undefined,
+  orderno: undefined,
+  originalprice: undefined,
+  actualprice: undefined,
+  status: undefined,
+  paytype: undefined,
+  paytime: [],
+  vipstarttime: [],
+  vipendtime: [],
+  createtime: [],
+  updatetime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await OrderApi.getOrderPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await OrderApi.deleteOrder(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await OrderApi.exportOrder(queryParams)
+    download.excel(data, '会员订单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/person/index.vue b/src/views/person/index.vue
index 81e279a31..8f4615395 100644
--- a/src/views/person/index.vue
+++ b/src/views/person/index.vue
@@ -111,8 +111,8 @@
         />
         <el-table-column label="性别" align="center" prop="gender" width="100">
           <template #default="scope">
-            <el-tag :type="scope.row.gender === 0 ? 'success' : 'info'">
-              {{ scope.row.gender === 0 ? '男' : scope.row.gender === 1 ? '女' : '未知' }}
+            <el-tag :type="scope.row.gender === 1 ? 'success' : 'info'">
+              {{ scope.row.gender === 1 ? '男' : scope.row.gender === 2 ? '女' : '未知' }}
             </el-tag>
           </template>
         </el-table-column>
diff --git a/src/views/personarchive/index.vue b/src/views/personarchive/index.vue
index 810e7cf56..cb3747613 100644
--- a/src/views/personarchive/index.vue
+++ b/src/views/personarchive/index.vue
@@ -82,8 +82,8 @@
         <el-table-column label="姓名" align="center" prop="name" />
         <el-table-column label="性别" align="center" prop="gender">
           <template #default="scope">
-            <el-tag v-if="scope.row.gender === 0" type="success">男</el-tag>
-            <el-tag v-else-if="scope.row.gender === 1" type="danger">女</el-tag>
+            <el-tag v-if="scope.row.gender === 1" type="success">男</el-tag>
+            <el-tag v-else-if="scope.row.gender === 2" type="danger">女</el-tag>
             <el-tag v-else type="warning">未知</el-tag>
           </template>
         </el-table-column>