优化网站导航模块

modules/views/bak/account/components/edit.vue

@@ -0,0 +1,293 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="600"
+    :visible="visible"
+    :maskClosable="false"
+    :title="isUpdate ? '编辑场馆账号' : '添加场馆账号'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="账号" name="username">
+        <a-input
+          allow-clear
+          placeholder="请输入登录账号"
+          :disabled="isUpdate"
+          v-model:value="form.username"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          placeholder="请输入手机号码"
+          maxlength="11"
+          :disabled="isUpdate && !isSuperAdmin"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="密码" name="password" v-if="!isUpdate">
+        <a-input
+          allow-clear
+          placeholder="请输入登录密码"
+          :disabled="isUpdate"
+          v-model:value="form.password"
+        />
+      </a-form-item>
+      <a-form-item label="真实姓名" name="realName">
+        <a-input
+          allow-clear
+          placeholder="请输入真实姓名"
+          v-model:value="form.realName"
+        />
+      </a-form-item>
+      <a-form-item label="选择角色" name="roles">
+        <role-select v-model:value="form.roles" />
+      </a-form-item>
+      <a-form-item label="可管理场馆" name="merchantId">
+        <MerchantSelect v-model:value="merchants" />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch, computed } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject } from 'ele-admin-pro';
+  import { addUser, updateUser } from '@/api/system/user';
+  import { User } from '@/api/system/user/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance, RuleObject } from 'ant-design-vue/es/form';
+  import RoleSelect from './role-select.vue';
+  import MerchantSelect from './merchant-select.vue';
+  import { getMerchantId } from '@/utils/common';
+  import { getMerchantName } from '@/utils/merchant';
+  import { useUserStore } from '@/store/modules/user';
+  import { Merchant } from '@/api/shop/merchant/model';
+  import { listMerchant } from '@/api/shop/merchant';
+
+  const userStore = useUserStore();
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+  // 当前用户信息
+  const loginUser = computed(() => userStore.info ?? {});
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: User | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  // const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+  const isSuperAdmin = ref<boolean>(false);
+  const merchants = ref<Merchant[]>([]);
+
+  // 用户信息
+  const form = reactive<User>({
+    type: undefined,
+    userId: undefined,
+    username: '',
+    nickname: '',
+    realName: '',
+    companyName: '',
+    merchants: '',
+    merchantId: getMerchantId(),
+    merchantName: getMerchantName(),
+    sex: undefined,
+    roles: [],
+    roleId: undefined,
+    roleName: undefined,
+    email: '',
+    phone: '',
+    mobile: '',
+    password: '',
+    introduction: '',
+    organizationId: undefined,
+    birthday: '',
+    idCard: '',
+    comments: '',
+    gradeName: '',
+    isAdmin: true,
+    gradeId: undefined
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    merchantAccountName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写场馆账号名称',
+        trigger: 'blur'
+      }
+    ],
+    // merchantId: [
+    //   {
+    //     required: true,
+    //     type: 'string',
+    //     message: '请选择场馆',
+    //     trigger: 'blur'
+    //   }
+    // ],
+    roles: [
+      {
+        required: true,
+        type: 'string',
+        message: '请选择角色',
+        trigger: 'blur',
+        validator: async (_rule: RuleObject) => {
+          if (form.roles?.length == 0) {
+            return Promise.reject('请选择角色');
+          }
+          return Promise.resolve();
+        }
+      }
+    ],
+    username: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写登录账号',
+        trigger: 'blur'
+      }
+    ],
+    phone: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写手机号码',
+        trigger: 'blur'
+      }
+    ],
+    password: [
+      {
+        required: true,
+        type: 'string',
+        message: '请输入登录密码',
+        trigger: 'blur'
+      }
+    ],
+    realName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写真实姓名',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  /* 搜索 */
+  const chooseMerchantId = (item) => {
+    form.merchantId = item.merchantId;
+    form.merchantName = item.merchantName;
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form,
+          merchants: merchants.value?.map((d) => d.merchantId).join(',')
+        };
+        if (getMerchantId()) {
+          form.merchantId = getMerchantId();
+          form.merchantName = getMerchantName();
+        }
+        const saveOrUpdate = isUpdate.value ? updateUser : addUser;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        merchants.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if (props.data.merchants) {
+            listMerchant({ merchantIds: props.data.merchants }).then((list) => {
+              merchants.value = list;
+            });
+          }
+          // if (props.data.comments) {
+          //   listMerchant({ merchantCodes: props.data.comments }).then(
+          //     (list) => {
+          //       merchants.value = list;
+          //     }
+          //   );
+          // }
+          isUpdate.value = true;
+        } else {
+          resetFields();
+          isUpdate.value = false;
+        }
+        const superAdmin = loginUser.value.roles?.filter(
+          (d) => d.roleCode == 'superAdmin'
+        );
+        // 是否超级管理员
+        if (superAdmin && superAdmin.length > 0) {
+          isSuperAdmin.value = true;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/account/components/merchant-select.vue

@@ -0,0 +1,73 @@
+<!-- 角色选择下拉框 -->
+<template>
+  <a-select
+    allow-clear
+    mode="multiple"
+    :value="merchantIds"
+    :placeholder="placeholder"
+    @update:value="updateValue"
+    @blur="onBlur"
+  >
+    <a-select-option
+      v-for="item in data"
+      :key="item.merchantId"
+      :value="item.merchantId"
+    >
+      {{ item.merchantName }}
+    </a-select-option>
+  </a-select>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import { Merchant } from '@/api/shop/merchant/model';
+  import { listMerchant } from '@/api/shop/merchant';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value: Merchant[]): void;
+    (e: 'blur'): void;
+  }>();
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的商户
+      value?: Merchant[];
+      //
+      placeholder?: string;
+    }>(),
+    {
+      placeholder: '请选择场馆'
+    }
+  );
+
+  // 选中的角色id
+  const merchantIds = computed(() =>
+    props.value?.map((d) => d.merchantId as number)
+  );
+
+  // 角色数据
+  const data = ref<Merchant[]>([]);
+
+  /* 更新选中数据 */
+  const updateValue = (value: number[]) => {
+    emit(
+      'update:value',
+      value.map((v) => ({ merchantId: v }))
+    );
+  };
+
+  /* 获取角色数据 */
+  listMerchant({})
+    .then((list) => {
+      data.value = list;
+    })
+    .catch((e) => {
+      message.error(e.message);
+    });
+
+  /* 失去焦点 */
+  const onBlur = () => {
+    emit('blur');
+  };
+</script>

modules/views/bak/account/components/role-select.vue

@@ -0,0 +1,73 @@
+<!-- 角色选择下拉框 -->
+<template>
+  <a-select
+    allow-clear
+    mode="multiple"
+    :value="roleIds"
+    :placeholder="placeholder"
+    @update:value="updateValue"
+    @blur="onBlur"
+  >
+    <a-select-option
+      v-for="item in data"
+      :key="item.roleId"
+      :value="item.roleId"
+    >
+      {{ item.roleName }}
+    </a-select-option>
+  </a-select>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import { listRoles } from '@/api/system/role';
+  import type { Role } from '@/api/system/role/model';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value: Role[]): void;
+    (e: 'blur'): void;
+  }>();
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      value?: Role[];
+      //
+      placeholder?: string;
+    }>(),
+    {
+      placeholder: '请选择角色'
+    }
+  );
+
+  // 选中的角色id
+  const roleIds = computed(() => props.value?.map((d) => d.roleId as number));
+
+  // 角色数据
+  const data = ref<Role[]>([]);
+
+  /* 更新选中数据 */
+  const updateValue = (value: number[]) => {
+    emit(
+      'update:value',
+      value.map((v) => ({ roleId: v }))
+    );
+  };
+
+  /* 获取角色数据 */
+  listRoles()
+    .then((list) => {
+      data.value = list.filter(
+        (d) => d.roleCode == 'merchant' || d.roleCode == 'merchantClerk'
+      );
+    })
+    .catch((e) => {
+      message.error(e.message);
+    });
+
+  /* 失去焦点 */
+  const onBlur = () => {
+    emit('blur');
+  };
+</script>

modules/views/bak/account/components/search.vue

@@ -0,0 +1,70 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <!--    <a-button type="primary" class="ele-btn-icon" @click="add">-->
+    <!--      <template #icon>-->
+    <!--        <PlusOutlined />-->
+    <!--      </template>-->
+    <!--      <span>添加</span>-->
+    <!--    </a-button>-->
+    <a-input-search
+      allow-clear
+      placeholder="请输入关键词"
+      v-model:value="where.keywords"
+      @pressEnter="search"
+      @search="search"
+    />
+    <!--    <a-button @click="reset">重置</a-button>-->
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import { watch } from 'vue';
+  import useSearch from '@/utils/use-search';
+  import { UserParam } from '@/api/system/user/model';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: UserParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  // 表单数据
+  const { where, resetFields } = useSearch<UserParam>({
+    userId: undefined,
+    username: undefined,
+    phone: undefined,
+    realName: undefined,
+    keywords: undefined
+  });
+
+  const search = () => {
+    emit('search', where);
+  };
+
+  /*  重置 */
+  const reset = () => {
+    resetFields();
+    search();
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/account/index.vue

@@ -0,0 +1,241 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card title="管理员列表" :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="id"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-else-if="column.key === 'roles'">
+              <a-tag
+                v-for="item in record.roles"
+                :key="item.roleId"
+                color="blue"
+              >
+                {{ item.roleName }}
+              </a-tag>
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space v-if="record.username != 'admin'">
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <Edit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import Edit from './components/edit.vue';
+  import { pageUsers, removeUser, removeUsers } from '@/api/system/user';
+  import type { User, UserParam } from '@/api/system/user/model';
+  import { getMerchantId } from '@/utils/common';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<User[]>([]);
+  // 当前编辑数据
+  const current = ref<User | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    where.isAdmin = true;
+    where.merchantId = getMerchantId();
+    return pageUsers({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+      width: 90
+    },
+    {
+      title: '手机号码',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center'
+    },
+    {
+      title: '真实姓名',
+      dataIndex: 'realName',
+      key: 'realName',
+      align: 'center'
+    },
+    {
+      title: '角色',
+      dataIndex: 'roles',
+      key: 'roles',
+      align: 'center'
+    },
+    // {
+    //   title: '可管理场馆',
+    //   dataIndex: 'merchantName',
+    //   key: 'merchantName',
+    //   align: 'center'
+    // },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: UserParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: User) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: User) => {
+    const hide = message.loading('请求中..', 0);
+    removeUser(row.userId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeUsers(selection.value.map((d) => d.userId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: User) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'User'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/bookingCashier/components/bookingCashierEdit.vue

@@ -0,0 +1,299 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑收银' : '添加收银'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="类型 0商城 1外卖" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入类型 0商城 1外卖"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="唯一标识" name="code">
+        <a-input
+          allow-clear
+          placeholder="请输入唯一标识"
+          v-model:value="form.code"
+        />
+      </a-form-item>
+      <a-form-item label="商品ID" name="goodsId">
+        <a-input
+          allow-clear
+          placeholder="请输入商品ID"
+          v-model:value="form.goodsId"
+        />
+      </a-form-item>
+      <a-form-item label="商品名称" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入商品名称"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="商品规格" name="spec">
+        <a-input
+          allow-clear
+          placeholder="请输入商品规格"
+          v-model:value="form.spec"
+        />
+      </a-form-item>
+      <a-form-item label="商品价格" name="price">
+        <a-input
+          allow-clear
+          placeholder="请输入商品价格"
+          v-model:value="form.price"
+        />
+      </a-form-item>
+      <a-form-item label="商品数量" name="cartNum">
+        <a-input
+          allow-clear
+          placeholder="请输入商品数量"
+          v-model:value="form.cartNum"
+        />
+      </a-form-item>
+      <a-form-item label="单商品合计" name="totalPrice">
+        <a-input
+          allow-clear
+          placeholder="请输入单商品合计"
+          v-model:value="form.totalPrice"
+        />
+      </a-form-item>
+      <a-form-item label="0 = 未购买 1 = 已购买" name="isPay">
+        <a-input
+          allow-clear
+          placeholder="请输入0 = 未购买 1 = 已购买"
+          v-model:value="form.isPay"
+        />
+      </a-form-item>
+      <a-form-item label="是否为立即购买" name="isNew">
+        <a-input
+          allow-clear
+          placeholder="请输入是否为立即购买"
+          v-model:value="form.isNew"
+        />
+      </a-form-item>
+      <a-form-item label="是否选中" name="selected">
+        <a-input
+          allow-clear
+          placeholder="请输入是否选中"
+          v-model:value="form.selected"
+        />
+      </a-form-item>
+      <a-form-item label="商户ID" name="merchantId">
+        <a-input
+          allow-clear
+          placeholder="请输入商户ID"
+          v-model:value="form.merchantId"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="用户ID" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户ID"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="收银员ID" name="cashierId">
+        <a-input
+          allow-clear
+          placeholder="请输入收银员ID"
+          v-model:value="form.cashierId"
+        />
+      </a-form-item>
+      <a-form-item label="分组取单" name="groupId">
+        <a-input
+          allow-clear
+          placeholder="请输入分组取单"
+          v-model:value="form.groupId"
+        />
+      </a-form-item>
+      <a-form-item label="修改时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入修改时间"
+          v-model:value="form.updateTime"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addBookingCashier, updateBookingCashier } from '@/api/booking/bookingCashier';
+  import { BookingCashier } from '@/api/booking/bookingCashier/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: BookingCashier | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<BookingCashier>({
+    id: undefined,
+    type: undefined,
+    code: undefined,
+    goodsId: undefined,
+    name: undefined,
+    spec: undefined,
+    price: undefined,
+    cartNum: undefined,
+    totalPrice: undefined,
+    isPay: undefined,
+    isNew: undefined,
+    selected: undefined,
+    merchantId: undefined,
+    comments: undefined,
+    userId: undefined,
+    cashierId: undefined,
+    groupId: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    bookingCashierId: undefined,
+    bookingCashierName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    bookingCashierName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写收银名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateBookingCashier : addBookingCashier;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/bookingCashier/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/bookingCashier/index.vue

@@ -0,0 +1,317 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="bookingCashierId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <BookingCashierEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import BookingCashierEdit from './components/bookingCashierEdit.vue';
+  import { pageBookingCashier, removeBookingCashier, removeBatchBookingCashier } from '@/api/booking/bookingCashier';
+  import type { BookingCashier, BookingCashierParam } from '@/api/booking/bookingCashier/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<BookingCashier[]>([]);
+  // 当前编辑数据
+  const current = ref<BookingCashier | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageBookingCashier({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '收银单ID',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '类型 0商城 1外卖',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+    },
+    {
+      title: '唯一标识',
+      dataIndex: 'code',
+      key: 'code',
+      align: 'center',
+    },
+    {
+      title: '商品ID',
+      dataIndex: 'goodsId',
+      key: 'goodsId',
+      align: 'center',
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '商品规格',
+      dataIndex: 'spec',
+      key: 'spec',
+      align: 'center',
+    },
+    {
+      title: '商品价格',
+      dataIndex: 'price',
+      key: 'price',
+      align: 'center',
+    },
+    {
+      title: '商品数量',
+      dataIndex: 'cartNum',
+      key: 'cartNum',
+      align: 'center',
+    },
+    {
+      title: '单商品合计',
+      dataIndex: 'totalPrice',
+      key: 'totalPrice',
+      align: 'center',
+    },
+    {
+      title: '0 = 未购买 1 = 已购买',
+      dataIndex: 'isPay',
+      key: 'isPay',
+      align: 'center',
+    },
+    {
+      title: '是否为立即购买',
+      dataIndex: 'isNew',
+      key: 'isNew',
+      align: 'center',
+    },
+    {
+      title: '是否选中',
+      dataIndex: 'selected',
+      key: 'selected',
+      align: 'center',
+    },
+    {
+      title: '商户ID',
+      dataIndex: 'merchantId',
+      key: 'merchantId',
+      align: 'center',
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center',
+    },
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+    },
+    {
+      title: '收银员ID',
+      dataIndex: 'cashierId',
+      key: 'cashierId',
+      align: 'center',
+    },
+    {
+      title: '分组取单',
+      dataIndex: 'groupId',
+      key: 'groupId',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: BookingCashierParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: BookingCashier) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: BookingCashier) => {
+    const hide = message.loading('请求中..', 0);
+    removeBookingCashier(row.bookingCashierId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchBookingCashier(selection.value.map((d) => d.bookingCashierId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: BookingCashier) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'BookingCashier'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/cardDict/components/dict-edit.vue

@@ -0,0 +1,178 @@
+<!-- 分类编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="460"
+    :visible="visible"
+    :confirm-loading="loading"
+    :title="isUpdate ? '修改类型' : '添加类型'"
+    :body-style="{ paddingBottom: '8px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 5, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="标识" name="dictCode">
+        <a-input
+          allow-clear
+          :maxlength="20"
+          disabled
+          placeholder="请输入分类标识"
+          v-model:value="form.dictCode"
+        />
+      </a-form-item>
+      <a-form-item label="类型名称" name="dictDataName">
+        <a-input
+          allow-clear
+          :maxlength="20"
+          placeholder="请输入类型名称"
+          v-model:value="form.dictDataName"
+        />
+      </a-form-item>
+      <a-form-item label="排序" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="99999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入备注"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import type { FormInstance, Rule } from 'ant-design-vue/es/form';
+  import { storeToRefs } from 'pinia';
+  import { useThemeStore } from '@/store/modules/theme';
+  import useFormData from '@/utils/use-form-data';
+  import { addDictData, updateDictData } from '@/api/system/dict-data';
+  import { DictData } from '@/api/system/dict-data/model';
+  import { removeSiteInfoCache } from '@/api/cms/website';
+
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: DictData | null;
+    // 字典ID
+    dictId?: number | 0;
+  }>();
+
+  //
+  const formRef = ref<FormInstance | null>(null);
+
+  // 是否是修改
+  const isUpdate = ref(false);
+
+  // 提交状态
+  const loading = ref(false);
+
+  // 表单数据
+  const { form, resetFields, assignFields } = useFormData<DictData>({
+    dictId: undefined,
+    dictDataId: undefined,
+    dictDataName: '',
+    dictCode: 'cardPlanId',
+    dictDataCode: '',
+    sortNumber: 100,
+    comments: ''
+  });
+
+  // 表单验证规则
+  const rules = reactive<Record<string, Rule[]>>({
+    dictDataCode: [
+      {
+        required: true,
+        message: '请输入分类名称',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    dictCode: [
+      {
+        required: true,
+        message: '请输入分类标识',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const saveOrUpdate = isUpdate.value ? updateDictData : addDictData;
+        form.dictDataCode = form.dictDataName;
+        form.dictId = props.dictId;
+        saveOrUpdate(form)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            // 清除字典缓存
+            removeSiteInfoCache(form.dictCode + ':' + form.tenantId);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          assignFields(props.data);
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+        formRef.value?.clearValidate();
+      }
+    }
+  );
+</script>

modules/views/bak/cardDict/index.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 表格 -->
+      <ele-pro-table
+        ref="tableRef"
+        row-key="dictDataId"
+        :columns="columns"
+        :datasource="datasource"
+        :customRow="customRow"
+        :scroll="{ x: 800 }"
+        cache-key="proSystemRoleTable"
+      >
+        <template #toolbar>
+          <a-space>
+            <a-button type="primary" class="ele-btn-icon" @click="openEdit()">
+              <template #icon>
+                <plus-outlined />
+              </template>
+              <span>新建</span>
+            </a-button>
+          </a-space>
+        </template>
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'action'">
+            <a-space>
+              <a @click="openEdit(record)">修改</a>
+              <a-divider type="vertical" />
+              <a-popconfirm
+                placement="topRight"
+                title="确定要删除此分类吗？"
+                @confirm="remove(record)"
+              >
+                <a class="ele-text-danger">删除</a>
+              </a-popconfirm>
+            </a-space>
+          </template>
+        </template>
+      </ele-pro-table>
+    </a-card>
+    <!-- 编辑弹窗 -->
+    <dict-edit
+      v-model:visible="showEdit"
+      :dictId="dictId"
+      :data="current"
+      @done="reload"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro/es';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import { messageLoading } from 'ele-admin-pro/es';
+  import DictEdit from './components/dict-edit.vue';
+  import { pageDictData, removeDictData } from '@/api/system/dict-data';
+  import { DictParam } from '@/api/system/dict/model';
+  import { DictData } from '@/api/system/dict-data/model';
+  import { addDict, listDictionaries } from '@/api/system/dict';
+  import { Dictionary } from '@/api/system/dictionary/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+  const dictId = ref(0);
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'dictDataId',
+      width: 80
+    },
+    {
+      title: '类型名称',
+      dataIndex: 'dictDataName',
+      showSorterTooltip: false
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      sorter: true,
+      showSorterTooltip: false
+    },
+    {
+      title: '排序号',
+      width: 180,
+      align: 'center',
+      dataIndex: 'sortNumber'
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      align: 'center'
+    }
+  ]);
+
+  // 表格选中数据
+  const selection = ref<DictData[]>([]);
+
+  // 当前编辑数据
+  const current = ref<Dictionary | null>(null);
+
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({ page, limit, where, orders }) => {
+    where.dictCode = 'cardPlanId';
+    return pageDictData({ ...where, ...orders, page, limit });
+  };
+
+  /* 搜索 */
+  const reload = (where?: DictParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ page: 1, where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: DictData) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: DictData) => {
+    const hide = messageLoading('请求中..', 0);
+    removeDictData(row.dictDataId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  // 初始化字典
+  const loadDict = () => {
+    listDictionaries({ dictCode: 'cardPlanId' }).then(async (data) => {
+      if (data?.length == 0) {
+        await addDict({ dictCode: 'cardPlanId', dictName: '会员卡类型' });
+      }
+      await listDictionaries({ dictCode: 'cardPlanId' }).then((list) => {
+        list?.map((d) => {
+          dictId.value = Number(d.dictId);
+        });
+      });
+    });
+  };
+
+  loadDict();
+
+  /* 自定义行属性 */
+  const customRow = (record: DictData) => {
+    return {
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'CardPlanDict'
+  };
+</script>

modules/views/bak/cashier/components/cashier.vue

@@ -0,0 +1,190 @@
+<template>
+  <a-card
+    :title="`收银员：${loginUser?.realName}`"
+    :bordered="false"
+    :body-style="{ minHeight: '60vh', width: '380px', padding: '0' }"
+    :head-style="{ className: 'bg-gray-500' }"
+  >
+    <template #extra>
+      <a-button danger @click="removeAll" size="small">整单取消</a-button>
+    </template>
+    <div class="goods-list overflow-x-hidden px-3 h-[600px]">
+      <a-empty v-if="cashier?.totalNums === 0" :image="simpleImage" />
+      <a-spin :spinning="spinning">
+        <template v-for="(item, index) in cashier?.cashiers" :key="index">
+          <div class="goods-item py-4 flex">
+            <div class="goods-image" v-if="item.image">
+              <a-avatar :src="item.image" shape="square" :size="42" />
+            </div>
+            <div class="goods-info w-full ml-2">
+              <div class="goods-bar flex justify-between">
+                <div class="goods-name flex-1">{{ item.name }}</div>
+              </div>
+              <div class="spec text-gray-400">{{ item.spec }}</div>
+              <div class="goods-price flex justify-between items-center">
+                <div class="flex">
+                  <div class="price text-red-500">￥{{ item.price }}</div>
+                  <div class="total-num ml-5 text-gray-400"
+                    >x {{ item.cartNum }}</div
+                  >
+                </div>
+                <div class="add flex items-center text-gray-500">
+                  <MinusCircleOutlined class="text-xl" @click="subNum(item)" />
+                  <div class="block text-center px-3">{{ item.cartNum }}</div>
+                  <PlusCircleOutlined class="text-xl" @click="addNum(item)" />
+                </div>
+              </div>
+            </div>
+            <div class="total-nums"> </div>
+          </div>
+          <a-divider dashed />
+        </template>
+      </a-spin>
+    </div>
+    <template #actions>
+      <div class="flex flex-col">
+        <div class="text-left pb-4 pl-4 text-gray-500"
+          >共计 {{ cashier.totalNums }} 件，已优惠：￥0.00
+        </div>
+        <div class="flex justify-between px-2">
+          <a-button size="large" class="w-full mx-1" @click="getListByGroup"
+            >取单</a-button
+          >
+          <a-button size="large" class="w-full mx-1" @click="onPack"
+            >挂单</a-button
+          >
+          <a-button
+            type="primary"
+            class="w-full mx-1"
+            size="large"
+            @click="onPay"
+            >收款￥{{ formatNumber(cashier.totalPrice) }}
+          </a-button>
+        </div>
+      </div>
+    </template>
+  </a-card>
+</template>
+
+<script lang="ts" setup>
+  import {
+    DeleteOutlined,
+    PlusCircleOutlined,
+    MinusCircleOutlined,
+    ExclamationCircleOutlined
+  } from '@ant-design/icons-vue';
+  import { ref, watch, createVNode } from 'vue';
+  import { Cashier, CashierVo } from '@/api/shop/cashier/model';
+  import { User } from '@/api/system/user/model';
+  import { formatNumber } from 'ele-admin-pro/es';
+  import {
+    subCartNum,
+    addCartNum,
+    removeBatchCashier,
+    removeCashier,
+    packCashier
+  } from '@/api/shop/cashier';
+  import { Empty, Modal, message } from 'ant-design-vue';
+  const simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
+
+  const props = withDefaults(
+    defineProps<{
+      value?: string;
+      placeholder?: string;
+      loginUser?: User;
+      cashier?: CashierVo;
+      count?: number;
+      spinning?: boolean;
+    }>(),
+    {
+      placeholder: undefined
+    }
+  );
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'reload'): void;
+    (e: 'group'): void;
+    (e: 'pay'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  const cashiers = ref<Cashier[]>([]);
+
+  /* 打开编辑弹窗 */
+  const onPay = () => {
+    emit('pay');
+  };
+
+  const subNum = (row: Cashier) => {
+    if (row.cartNum === 1) {
+      Modal.confirm({
+        title: '提示',
+        content: '确定要删除该商品吗?',
+        icon: createVNode(ExclamationCircleOutlined),
+        maskClosable: true,
+        onOk: () => {
+          const hide = message.loading('请求中..', 0);
+          removeCashier(row?.id)
+            .then((msg) => {
+              hide();
+              message.success(msg);
+              emit('reload');
+            })
+            .catch((e) => {
+              hide();
+              message.error(e.message);
+            });
+        }
+      });
+      return false;
+    }
+    subCartNum(row).then(() => {
+      emit('reload');
+    });
+  };
+
+  const addNum = (row: Cashier) => {
+    addCartNum(row).then(() => {
+      emit('reload');
+    });
+  };
+
+  const removeAll = () => {
+    const ids = props.cashier?.cashiers?.map((d) => d.id);
+    if (ids) {
+      removeBatchCashier(ids)
+        .then(() => {})
+        .finally(() => {
+          emit('reload');
+        });
+    }
+  };
+
+  // 取单
+  const getListByGroup = () => {
+    emit('group');
+  };
+
+  // 挂单
+  const onPack = () => {
+    cashiers.value =
+      props.cashier?.cashiers?.map((d) => {
+        return {
+          id: d.id,
+          groupId: Number(d.groupId) + 1
+        };
+      }) || [];
+    if (cashiers.value.length === 0) {
+      return false;
+    }
+    packCashier(cashiers.value).then((res) => {
+      emit('reload');
+    });
+  };
+
+  watch(
+    () => props.count,
+    () => {}
+  );
+</script>

modules/views/bak/cashier/components/goods.vue

@@ -0,0 +1,252 @@
+<template>
+  <a-card
+    class="w-full relative"
+    :bordered="false"
+    :body-style="{ padding: '16px' }"
+  >
+    <a-spin :spinning="spinning">
+      <div class="flex leading-7 mb-6">
+        <div class="w-[202px] text-gray-500">选择场馆：</div>
+        <div class="list">
+          <a-radio-group v-model:value="where.merchantId" button-style="solid">
+            <a-radio-button
+              v-for="(item, index) in category"
+              :key="index"
+              :value="item.merchantId"
+              @click="onMerchant(item)"
+              >{{ item.merchantName }}</a-radio-button
+            >
+          </a-radio-group>
+        </div>
+      </div>
+
+      <div class="flex leading-7 mb-6">
+        <div class="w-[138px] text-gray-500">预定日期：</div>
+        <div class="list">
+          <a-radio-group v-model:value="where.dateTime" button-style="solid">
+            <a-radio-button
+              v-for="(item, index) in next7day"
+              :key="index"
+              :value="item.dateTime"
+              >{{ item.label }}</a-radio-button
+            >
+          </a-radio-group>
+        </div>
+      </div>
+      <!--      <div class="flex leading-7 mb-6">-->
+      <!--        <div class="w-[138px] text-gray-500">选择时段：</div>-->
+      <!--        <div class="list">-->
+      <!--          <a-radio-group v-model:value="where.timePeriod">-->
+      <!--            <a-radio-button-->
+      <!--              v-for="(item, index) in periods"-->
+      <!--              :key="index"-->
+      <!--              :value="item.merchantId"-->
+      <!--              @click="onMerchant(item)"-->
+      <!--              >{{ item.timePeriod }}</a-radio-button-->
+      <!--            >-->
+      <!--          </a-radio-group>-->
+      <!--        </div>-->
+      <!--      </div>-->
+      <div class="flex leading-7 mb-6">
+        <div class="w-[138px] text-gray-500">选择场地：</div>
+        <div class="list flex-1">
+          <template v-for="(item, index) in periodList" :key="index">
+            <div class="time-period leading-7 text-gray-500 mb-2">
+              <a-tag color="blue">
+                <template #icon>
+                  <ClockCircleOutlined />
+                </template>
+                {{ item.timePeriod }}</a-tag
+              >
+            </div>
+            <div class="field-list flex flex-wrap mb-2">
+              <a-button
+                class="w-[140px]"
+                v-for="(field, fieldIndex) in item.fieldList"
+                :key="fieldIndex"
+                :disabled="field.sold"
+                @click="add(field, item.timePeriod)"
+              >
+                <div class="flex justify-between">
+                  <text>{{ field.fieldName }}</text>
+                  <text>￥{{ item.price }}</text>
+                </div>
+              </a-button>
+            </div>
+          </template>
+          <!--          <div class="h-20 flex items-center m-auto w-full justify-center">-->
+          <!--            <a-pagination-->
+          <!--              v-model:current="page"-->
+          <!--              :total="count"-->
+          <!--              show-less-items-->
+          <!--              @change="reload"-->
+          <!--            />-->
+          <!--          </div>-->
+        </div>
+      </div>
+    </a-spin>
+    <!-- 编辑弹窗 -->
+    <SpecForm
+      v-model:visible="showSpecForm"
+      :data="current"
+      @done="addSpecField"
+    />
+  </a-card>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import {
+    ShoppingCartOutlined,
+    ClockCircleOutlined
+  } from '@ant-design/icons-vue';
+  import SpecForm from './specForm.vue';
+  import { useRouter } from 'vue-router';
+  import { message } from 'ant-design-vue';
+  import { User } from '@/api/system/user/model';
+  import { listMerchant } from '@/api/shop/merchant';
+  import { getNext7day, getServerTime } from '@/api/layout';
+  import { getWeek } from '@/utils/common';
+  import { listPeriod, pagePeriod } from '@/api/booking/period';
+  import { Period, PeriodParam } from '@/api/booking/period/model';
+  import { Merchant } from '@/api/shop/merchant/model';
+  import { Field } from '@/api/booking/field/model';
+  import { addCashier } from '@/api/shop/cashier';
+
+  const { currentRoute } = useRouter();
+
+  withDefaults(
+    defineProps<{
+      value?: string;
+      placeholder?: string;
+      loginUser?: User;
+    }>(),
+    {
+      placeholder: undefined
+    }
+  );
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'reload'): void;
+  }>();
+
+  // 搜索表单
+  const where = reactive<PeriodParam>({
+    merchantId: undefined,
+    merchantName: undefined,
+    dateTime: undefined,
+    week: undefined,
+    half: 0,
+    isStatus: 0,
+    startTime: undefined,
+    timePeriod: undefined
+  });
+
+  // 加载中状态
+  const spinning = ref<boolean>(true);
+  // 当前编辑数据
+  const current = ref<Field | null>(null);
+  const form = ref<Field>({});
+  const category = ref<Merchant[]>([]);
+  const periods = ref<Period[]>([]);
+  const periodList = ref<Period[] | null>();
+  const specs = ref<string>();
+  const showSpecForm = ref<boolean>(false);
+  const next7day = ref<any[]>();
+
+  /* 打开编辑弹窗 */
+  const openSpecForm = (row?: Field) => {
+    current.value = row ?? null;
+    showSpecForm.value = true;
+  };
+
+  const add = (row?: Field, timePeriod?: string) => {
+    if (row?.merchantId == 3028) {
+      form.value = row;
+      form.value.cartNum = 1;
+      openSpecForm(row);
+      return false;
+    }
+    console.log(row);
+    addCashier({
+      goodsId: row?.fieldId,
+      name: `${where.merchantName} ${row?.fieldName}`,
+      price: row?.price,
+      spec: `${where.dateTime} ${getWeek(where.week)} ${timePeriod}`,
+      cartNum: 1,
+      isNew: true,
+      selected: true,
+      merchantId: row?.merchantId
+    })
+      .then((res) => {
+        console.log(res);
+        emit('reload');
+      })
+      .catch(() => {
+        message.error('该场地已有人预定');
+      });
+  };
+
+  const addSpecField = () => {
+    emit('reload');
+  };
+
+  const onMerchant = (e) => {
+    where.merchantId = e.merchantId;
+    reload();
+  };
+
+  const reload = async () => {
+    spinning.value = true;
+    await getNext7day().then((list) => {
+      next7day.value = list.map((d: any, i) => {
+        if (where.dateTime == undefined) {
+          where.dateTime = d.dateTime;
+        }
+        if (where.week == undefined) {
+          where.week = d.week;
+        }
+        d.label = `${getWeek(d.week)}(${d.date})`;
+        return d;
+      });
+    });
+    await listMerchant({}).then((list) => {
+      category.value = list;
+      if (where.merchantId == undefined) {
+        where.merchantId = list[0].merchantId;
+        where.merchantName = list[0].merchantName;
+      }
+    });
+    await getServerTime().then((res) => {
+      if (where.merchantId != 3028) {
+        where.startTime = res.hourMinute;
+      }
+    });
+    // await pagePeriod({ merchantId: where.merchantId }).then((res) => {
+    //   if (res?.list) {
+    //     periods.value = res.list;
+    //   }
+    // });
+    await listPeriod(where)
+      .then((list) => {
+        periodList.value = list;
+      })
+      .catch(() => {
+        periodList.value = [];
+      })
+      .finally(() => {
+        spinning.value = false;
+      });
+  };
+
+  reload();
+
+  watch(currentRoute, () => {}, { immediate: true });
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'PeriodField'
+  };
+</script>

modules/views/bak/cashier/components/group.vue

@@ -0,0 +1,155 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="1000"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :footer="null"
+    :title="isUpdate ? '取单' : '取单'"
+    :body-style="{
+      paddingTop: '10px',
+      paddingBottom: '38px',
+      backgroundColor: '#f3f3f3'
+    }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-space direction="vertical" class="w-full">
+      <div v-for="(item, index) in groups" :key="index">
+        <a-card
+          :title="`订单总价: ￥${formatNumber(item.totalPrice)}`"
+          :body-style="{ padding: '10px' }"
+        >
+          <div class="flex flex-wrap">
+            <div v-for="(v, i) in item.cashiers" :key="i" class="flex m-2">
+              <div class="item flex flex-col bg-gray-50 p-3 w-[215px]">
+                <text>{{ v.goodsName }}</text>
+                <text class="text-gray-400">规格：{{ v.spec }}</text>
+                <text class="text-gray-400">数量：{{ v.cartNum }}</text>
+                <text>小计：{{ v.totalPrice }}</text>
+              </div>
+            </div>
+          </div>
+          <!--          <div class="comments p-2 text-gray-400">-->
+          <!--            {{ item.comments }}-->
+          <!--          </div>-->
+          <template #actions>
+            <div class="text-left px-3">
+              <a-space>
+                <a-button type="primary" @click="getCashier(item.groupId)"
+                  >取单</a-button
+                >
+                <a-button danger type="primary" @click="remove(item.groupId)"
+                  >删除</a-button
+                >
+                <!--                <a-button>备注</a-button>-->
+              </a-space>
+            </div>
+          </template>
+        </a-card>
+      </div>
+    </a-space>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, watch } from 'vue';
+  import { message } from 'ant-design-vue';
+  import { addMpMenu, updateMpMenu } from '@/api/cms/mp-menu';
+  import { MpMenu } from '@/api/cms/mp-menu/model';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { getByGroup, listByGroupId, removeByGroup } from '@/api/shop/cashier';
+  import { formatNumber } from 'ele-admin-pro/es';
+  import { CashierVo } from '@/api/shop/cashier/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 类型 0服务 1订单
+    type?: number;
+    // 页面ID
+    pageId?: number;
+    // 修改回显的数据
+    data?: MpMenu | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  const pageId = ref(0);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  //
+  const groups = ref<CashierVo[]>();
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  const getCashier = (groupId: number) => {
+    getByGroup(groupId).then(() => {
+      updateVisible(false);
+      emit('done');
+    });
+  };
+
+  const remove = (groupId: number) => {
+    removeByGroup(groupId).then(() => {
+      reload();
+    });
+  };
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          pageId: pageId.value
+        };
+        const saveOrUpdate = isUpdate.value ? updateMpMenu : addMpMenu;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  const reload = () => {
+    listByGroupId({}).then((data) => {
+      groups.value = data;
+    });
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        reload();
+      }
+    }
+  );
+</script>

modules/views/bak/cashier/components/pay.vue

@@ -0,0 +1,262 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="1000"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '支付结算' : '支付结算'"
+    okText="确定收款"
+    :ok-button-props="{ disabled: !user }"
+    :body-style="{
+      padding: '0',
+      paddingBottom: '0',
+      backgroundColor: '#f3f3f3'
+    }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <!--    {{ form }}-->
+    <div class="flex justify-between py-3 px-4 columns-3 gap-3">
+      <div class="payment flex flex-col bg-white px-4 py-2">
+        <div class="title text-gray-500 leading-10">请选择支付方式</div>
+        <template v-for="(item, index) in payments" :key="index">
+          <div
+            class="item border-2 border-solid px-3 py-1 flex items-center mb-2 cursor-pointer"
+            :class="
+              form.type === item.type
+                ? 'active border-red-300'
+                : 'border-gray-200'
+            "
+            @click="onType(item)"
+          >
+            <a-avatar :src="item.image" />
+            <text class="pl-1">{{ item.name }}</text>
+          </div>
+        </template>
+      </div>
+      <div class="settlement flex flex-col bg-white px-4 py-2 flex-1">
+        <div class="title text-gray-500 leading-10">结算信息</div>
+        <div class="comments">
+          <a-textarea
+            :rows="4"
+            :maxlength="200"
+            placeholder="备注信息"
+            v-model:value="form.comments"
+          />
+        </div>
+        <div class="discount flex mt-3">
+          <div class="item w-1/2">
+            折扣(折)
+            <div class="input">
+              <a-input-number
+                allow-clear
+                min="0"
+                max="10"
+                placeholder="请输入折扣"
+                style="width: 200px"
+                v-model:value="form.discount"
+                @input="onDiscount"
+              />
+            </div>
+          </div>
+          <div class="item w-1/2">
+            立减
+            <div class="input">
+              <a-input-number
+                allow-clear
+                placeholder="请输入立减金额"
+                style="width: 200px"
+                v-model:value="form.reducePrice"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="discount flex mt-8 items-center h-20 leading-10">
+          <div class="item w-1/2"> 优惠金额：￥0.00</div>
+          <div class="item w-1/2 text-xl">
+            实付金额：￥<span class="text-red-500 text-2xl">{{
+              formatNumber(data.totalPrice)
+            }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="user-bar flex flex-col bg-white px-4 py-2">
+        <div class="title text-gray-500 leading-10">会员信息</div>
+        <div class="user-info text-center" v-if="!user">
+          <a-empty :description="`当前为游客`" class="text-gray-300" />
+          <SelectUserByButton @done="selectUser" />
+        </div>
+        <view class="tox-user" v-if="user">
+          <div class="mb-2 flex justify-between items-center">
+            <div class="avatar">
+              <a-avatar :src="user.avatar" :size="40" />
+              <text class="ml-1 text-gray-500">{{ user.nickname }}</text>
+            </div>
+            <CloseOutlined @click="removeUser" />
+          </div>
+          <div
+            class="border-dashed py-1 px-2 border-gray-300 text-gray-500 mt-2"
+            >名称：{{ user.realName }}
+          </div>
+          <div
+            class="border-dashed py-1 px-2 border-gray-300 text-gray-500 mt-2"
+            >手机号：{{ user.mobile || '未绑定' }}
+          </div>
+          <div
+            class="border-dashed py-1 px-2 border-gray-300 text-gray-500 mt-2"
+            >可用余额：{{ user.balance }}
+          </div>
+          <div
+            class="border-dashed py-1 px-2 border-gray-300 text-gray-500 mt-2"
+            >可用积分：{{ user.points }}
+          </div>
+        </view>
+      </div>
+    </div>
+    <UserForm v-model:visible="showUserForm" :type="type" @done="reload" />
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { CloseOutlined } from '@ant-design/icons-vue';
+  import { ref, watch, reactive } from 'vue';
+  import { message } from 'ant-design-vue';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { formatNumber } from 'ele-admin-pro/es';
+  import { listPayment } from '@/api/system/payment';
+  import { Payment } from '@/api/system/payment/model';
+  import { User } from '@/api/system/user/model';
+  import { Cashier } from '@/api/shop/cashier/model';
+  import { addOrder, updateOrder } from '@/api/shop/order';
+  import { Order } from '@/api/shop/order/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 类型 0服务 1订单
+    type?: number;
+    // 修改回显的数据
+    data?: Cashier | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 用户信息
+  const form = reactive<Order>({
+    // ID
+    // 类型 0商城 1外卖
+    type: 4,
+    // 唯一标识
+    // 商品价格
+    price: undefined,
+    // 单商品合计
+    totalPrice: undefined,
+    // 商户ID
+    merchantId: undefined,
+    // 用户ID
+    userId: undefined,
+    // 租户id
+    tenantId: undefined,
+    // 创建时间
+    createTime: undefined,
+    // 修改时间
+    updateTime: undefined
+  });
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const disabled = ref<boolean>(true);
+  const payments = ref<Payment[]>();
+  const showUserForm = ref<boolean>(false);
+  const user = ref<User | null>();
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  const selectUser = (item: User) => {
+    user.value = item;
+  };
+
+  const onType = (item: Payment) => {
+    form.type = item.type;
+  };
+
+  const removeUser = () => {
+    user.value = null;
+  };
+
+  /* 保存编辑 */
+  const save = () => {
+    loading.value = true;
+    const formData = {
+      ...form
+    };
+    const saveOrUpdate = isUpdate.value ? updateOrder : addOrder;
+    saveOrUpdate(formData)
+      .then((msg) => {
+        loading.value = false;
+        message.success(msg);
+        updateVisible(false);
+        emit('done');
+      })
+      .catch((e) => {
+        loading.value = false;
+        message.error(e.message);
+      });
+  };
+
+  const reload = () => {
+    listPayment({}).then((data) => {
+      payments.value = data;
+    });
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        reload();
+      }
+    }
+  );
+</script>
+<style lang="less" scoped>
+  .active {
+    position: relative;
+    border: 2px solid #007cec;
+    &:before {
+      content: '';
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      border: 11px solid #007cec;
+      border-top-color: transparent;
+      border-left-color: transparent;
+    }
+    &:after {
+      content: '';
+      width: 4px;
+      height: 8px;
+      position: absolute;
+      right: 3px;
+      bottom: 4px;
+      border: 1px solid #fff;
+      border-top-color: transparent;
+      border-left-color: transparent;
+      transform: rotate(45deg);
+    }
+  }
+</style>

modules/views/bak/cashier/components/search.vue

@@ -0,0 +1,52 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" class="flex-wrap mb-5">
+    <a-input-search
+      allow-clear
+      size="large"
+      style="width: 400px"
+      placeholder="商品名称"
+      v-model:value="where.goodsName"
+      @pressEnter="handleSearch"
+      @search="handleSearch"
+    />
+    <a-button @click="handleSearch" size="large">搜索</a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { watch } from 'vue';
+  import useSearch from '@/utils/use-search';
+  import { GoodsParam } from '@/api/shop/goods/model';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GoodsParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 表单数据
+  const { where } = useSearch<GoodsParam>({
+    goodsId: undefined,
+    goodsName: undefined,
+    keywords: undefined
+  });
+
+  const handleSearch = () => {
+    emit('search', where);
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/cashier/components/specForm.vue

@@ -0,0 +1,235 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '选择场地' : '选择场地'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    {{ form }}
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="名称" name="goodsName">
+        {{ form.name }}
+      </a-form-item>
+      <a-form-item label="价格" name="price">
+        <div class="text-red-500">￥{{ formatNumber(form.price) }}</div>
+      </a-form-item>
+      <a-form-item
+        label="购买数量"
+        name="cartNum"
+        v-if="data.merchantId == 3028"
+      >
+        <a-input-number
+          :min="1"
+          :max="9999"
+          placeholder="请输入排序号"
+          v-model:value="form.cartNum"
+          @pressEnter="save"
+        />
+      </a-form-item>
+      <a-form-item v-if="form.specs === 1" label="规格" name="spec">
+        <template v-for="(item, index) in form?.goodsSpecValue" :key="index">
+          <div class="flex flex-col">
+            <span class="font-bold leading-8 text-gray-400">{{
+              item.value
+            }}</span>
+            <a-radio-group v-model:value="form.goodsSpecValue[index].spec">
+              <template v-for="(v, i) in item.detail" :key="i">
+                <a-radio-button :value="v">{{ v }}</a-radio-button>
+              </template>
+            </a-radio-group>
+          </div>
+        </template>
+      </a-form-item>
+      <a-form-item v-if="data.merchantId == 3028" label="规格" name="spec">
+        <template v-for="(item, index) in form?.goodsSpecValue" :key="index">
+          <div class="flex flex-col">
+            <span class="font-bold leading-8 text-gray-400">{{
+              item.value
+            }}</span>
+            <a-radio-group v-model:value="form.goodsSpecValue[index].spec">
+              <template v-for="(v, i) in item.detail" :key="i">
+                <a-radio-button :value="v">{{ v }}</a-radio-button>
+              </template>
+            </a-radio-group>
+          </div>
+        </template>
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject } from 'ele-admin-pro';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { Cashier } from '@/api/shop/cashier/model';
+  import { formatNumber } from 'ele-admin-pro/es';
+  import { addCashier, updateCashier } from '@/api/shop/cashier';
+  import { Field } from '@/api/booking/field/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 类型 0服务 1订单
+    type?: number;
+    // 修改回显的数据
+    data?: Field | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+  const spec = ref<string>();
+
+  // 用户信息
+  const form = reactive<Cashier>({
+    // ID
+    id: undefined,
+    // 类型 0商城 1外卖
+    type: undefined,
+    // 唯一标识
+    code: undefined,
+    // 商品ID
+    goodsId: undefined,
+    // 商品名称
+    goodsName: undefined,
+    // 商品封面图
+    image: undefined,
+    // 商品规格
+    spec: undefined,
+    // 商品价格
+    price: undefined,
+    // 商品数量
+    cartNum: undefined,
+    // 单商品合计
+    totalPrice: undefined,
+    // 0 = 未购买 1 = 已购买
+    isPay: undefined,
+    // 是否为立即购买
+    isNew: undefined,
+    // 是否选中
+    selected: undefined,
+    // 商户ID
+    merchantId: undefined,
+    // 用户ID
+    userId: undefined,
+    // 收银员ID
+    cashierId: undefined,
+    // 收银单分组ID
+    groupId: undefined,
+    // 租户id
+    tenantId: undefined,
+    // 创建时间
+    createTime: undefined,
+    // 修改时间
+    updateTime: undefined,
+    // 是否多规格
+    specs: undefined,
+    // 商品规格数据
+    goodsSpecValue: []
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({});
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        if (form.specs === 1) {
+          const text = form.goodsSpecValue.map((d) => d.spec).join(',');
+          if (text === ',') {
+            message.error('请选择规格');
+            return false;
+          }
+          spec.value = text;
+        }
+        console.log('>>>>>3');
+        const formData = {
+          ...form,
+          goodsId: props.data?.fieldId,
+          name: props.data?.fieldName,
+          spec: spec.value
+        };
+        const saveOrUpdate = isUpdate.value ? updateCashier : addCashier;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        spec.value = '';
+        isUpdate.value = !!props.data?.fieldId;
+        if (props.type) {
+          form.type = props.type;
+        }
+        if (props.data) {
+          assignObject(form, props.data);
+          form.name = props.data.fieldName;
+          form.cartNum = 1;
+        }
+      } else {
+        resetFields();
+      }
+    }
+  );
+</script>

modules/views/bak/cashier/index.vue

@@ -0,0 +1,73 @@
+<template>
+  <a-page-header :title="`收银台`" @back="() => $router.go(-1)">
+    <div class="flex gap-5">
+      <!-- 载入购物车 -->
+      <Cart
+        :spinning="spinning"
+        :loginUser="loginUser"
+        :cashier="cashier"
+        :count="cashier?.totalNums"
+        @group="openGroupForm"
+        @reload="reload"
+        @pay="onPay"
+      />
+      <!-- 商品搜索 -->
+      <Goods :loginUser="loginUser" @reload="reload" />
+      <!-- 取单 -->
+      <GroupForm v-model:visible="showCashierForm" @done="reload" />
+      <!-- 支付结算 -->
+      <Pay v-model:visible="showPayForm" :data="cashier" @done="reload" />
+    </div>
+  </a-page-header>
+</template>
+
+<script lang="ts" setup>
+  import { computed, ref, watch } from 'vue';
+  import GroupForm from './components/group.vue';
+  import Cart from './components/cashier.vue';
+  import Goods from './components/goods.vue';
+  import Pay from './components/pay.vue';
+  import * as CashierApi from '@/api/shop/cashier';
+  import { useUserStore } from '@/store/modules/user';
+  import { CashierVo } from '@/api/shop/cashier/model';
+
+  // 当前用户信息
+  const userStore = useUserStore();
+  const loginUser = computed(() => userStore.info ?? {});
+  const cashier = ref<CashierVo>({});
+
+  // 加载中状态
+  const spinning = ref<boolean>(true);
+  const showCashierForm = ref<boolean>(false);
+  const showPayForm = ref<boolean>(false);
+
+  const openGroupForm = () => {
+    showCashierForm.value = true;
+  };
+
+  const onPay = () => {
+    showPayForm.value = true;
+  };
+
+  /* 加载数据 */
+  const reload = () => {
+    spinning.value = true;
+    CashierApi.listCashier({ groupId: 0 })
+      .then((data) => {
+        if (data) {
+          cashier.value = data;
+        }
+      })
+      .finally(() => {
+        spinning.value = false;
+      });
+  };
+
+  watch(
+    () => {},
+    () => {
+      reload();
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/category/components/category-edit.vue

@@ -0,0 +1,300 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="620"
+    :visible="visible"
+    :confirm-loading="loading"
+    :title="isUpdate ? '修改分类' : '新建分类'"
+    :body-style="{ paddingBottom: '8px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 4, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 18, sm: 20, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-row :gutter="16">
+        <a-col
+          v-bind="styleResponsive ? { md: 24, sm: 24, xs: 24 } : { span: 12 }"
+        >
+          <a-form-item label="上级分类" name="parentId">
+            <a-tree-select
+              allow-clear
+              :tree-data="categoryList"
+              tree-default-expand-all
+              placeholder="请选择上级分类"
+              :value="form.parentId || undefined"
+              :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
+              @update:value="(value?: number) => (form.parentId = value)"
+            />
+          </a-form-item>
+          <a-form-item label="分类名称" name="title">
+            <a-input
+              allow-clear
+              placeholder="请输入分类名称"
+              v-model:value="form.title"
+              @pressEnter="save"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col
+          v-bind="styleResponsive ? { md: 24, sm: 24, xs: 24 } : { span: 12 }"
+        >
+          <a-form-item label="排序号" name="sortNumber">
+            <a-input-number
+              :min="0"
+              :max="99999"
+              class="ele-fluid"
+              placeholder="请输入排序号"
+              v-model:value="form.sortNumber"
+            />
+          </a-form-item>
+          <a-form-item label="是否展示">
+            <a-switch
+              checked-children="是"
+              un-checked-children="否"
+              :checked="form.status === 0"
+              @update:checked="updateHideValue"
+            />
+          </a-form-item>
+          <a-form-item label="分类图标" name="image" extra="尺寸180*180">
+            <SelectFile
+              :placeholder="`请选择图片`"
+              :limit="1"
+              :data="images"
+              @done="chooseFile"
+              @del="onDeleteItem"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <div style="margin-bottom: 22px">
+        <a-divider />
+      </div>
+      <a-form-item
+        label="备注"
+        name="comments"
+        :label-col="
+          styleResponsive ? { md: 3, sm: 4, xs: 24 } : { flex: '90px' }
+        "
+        :wrapper-col="
+          styleResponsive ? { md: 21, sm: 20, xs: 24 } : { flex: '1' }
+        "
+      >
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入备注信息"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import type { FormInstance, Rule } from 'ant-design-vue/es/form';
+  import { storeToRefs } from 'pinia';
+  import { useThemeStore } from '@/store/modules/theme';
+  import useFormData from '@/utils/use-form-data';
+  import { GoodsCategory } from '@/api/shop/goodsCategory/model';
+  import {
+    addGoodsCategory,
+    updateGoodsCategory
+  } from '@/api/shop/goodsCategory';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+  // 已上传数据
+  const images = ref<ItemType[]>([]);
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: GoodsCategory | null;
+    // 上级分类id
+    parentId?: number;
+    // 全部分类数据
+    categoryList: GoodsCategory[];
+  }>();
+
+  //
+  const formRef = ref<FormInstance | null>(null);
+
+  // 是否是修改
+  const isUpdate = ref(false);
+
+  // 提交状态
+  const loading = ref(false);
+
+  // 表单数据
+  const { form, resetFields, assignFields } = useFormData<GoodsCategory>({
+    categoryId: undefined,
+    title: '',
+    parentId: undefined,
+    image: '',
+    status: 0,
+    sortNumber: 100
+  });
+
+  // 表单验证规则
+  const rules = reactive<Record<string, Rule[]>>({
+    title: [
+      {
+        required: true,
+        message: '请输入分类名称',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    sortNumber: [
+      {
+        required: true,
+        message: '请输入排序号',
+        type: 'number',
+        trigger: 'blur'
+      }
+    ],
+    meta: [
+      {
+        type: 'string',
+        validator: async (_rule: Rule, value: string) => {
+          if (value) {
+            const msg = '请输入正确的JSON格式';
+            try {
+              const obj = JSON.parse(value);
+              if (typeof obj !== 'object' || obj === null) {
+                return Promise.reject(msg);
+              }
+            } catch (_e) {
+              return Promise.reject(msg);
+            }
+          }
+          return Promise.resolve();
+        },
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseFile = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const categoryForm = {
+          ...form,
+          // menuType 对应的值与后端不一致在前端处理
+          // menuType: form.menuType === 2 ? 1 : 0,
+          parentId: form.parentId || 0
+        };
+        const saveOrUpdate = isUpdate.value
+          ? updateGoodsCategory
+          : addGoodsCategory;
+        saveOrUpdate(categoryForm)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  const updateHideValue = (value: boolean) => {
+    form.status = value ? 0 : 1;
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          assignFields({
+            ...props.data,
+            parentId:
+              props.data.parentId === 0 ? undefined : props.data.parentId
+          });
+          images.value = [];
+          if (props.data.image) {
+            images.value.push({
+              uid: `${props.data.categoryId}`,
+              url: props.data.image,
+              status: 'done'
+            });
+          }
+          isUpdate.value = true;
+        } else {
+          images.value = [];
+          form.parentId = props.parentId;
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+        formRef.value?.clearValidate();
+      }
+    }
+  );
+</script>
+
+<script lang="ts">
+  import * as icons from '@/layout/menu-icons';
+
+  export default {
+    components: icons,
+    data() {
+      return {
+        iconData: [
+          {
+            title: '已引入的图标',
+            icons: Object.keys(icons)
+          }
+        ]
+      };
+    }
+  };
+</script>

modules/views/bak/category/index.vue

@@ -0,0 +1,406 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 表格 -->
+      <ele-pro-table
+        ref="tableRef"
+        row-key="categoryId"
+        :columns="columns"
+        :datasource="datasource"
+        :parse-data="parseData"
+        :need-page="false"
+        :customRow="customRow"
+        :expand-icon-column-index="1"
+        :expanded-row-keys="expandedRowKeys"
+        :scroll="{ x: 1200 }"
+        cache-key="proGoodsCategoryTable"
+        @done="onDone"
+        @expand="onExpand"
+      >
+        <template #toolbar>
+          <a-space>
+            <a-button type="primary" class="ele-btn-icon" @click="openEdit()">
+              <template #icon>
+                <plus-outlined />
+              </template>
+              <span>新建</span>
+            </a-button>
+            <a-button type="dashed" class="ele-btn-icon" @click="expandAll">
+              展开全部
+            </a-button>
+            <a-button type="dashed" class="ele-btn-icon" @click="foldAll">
+              折叠全部
+            </a-button>
+            <!-- 搜索表单 -->
+            <a-input-search
+              allow-clear
+              v-model:value="searchText"
+              placeholder="请输入搜索关键词"
+              @search="reload"
+              @pressEnter="reload"
+            />
+          </a-space>
+        </template>
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'path'">
+            <span class="ele-text-placeholder">{{ record.path }}</span>
+          </template>
+          <template v-if="column.key === 'component'">
+            <span class="ele-text-placeholder">{{ record.component }}</span>
+          </template>
+          <template v-if="column.key === 'type'">
+            <a-tag v-if="isExternalLink(record.path)" color="red">外链</a-tag>
+            <a-tag v-else-if="isExternalLink(record.component)" color="orange">
+              内链
+            </a-tag>
+            <a-tag v-else-if="isDirectory(record)" color="blue">目录</a-tag>
+            <a-tag v-else-if="record.type === 0">列表</a-tag>
+            <a-tag v-else-if="record.type === 1" color="purple">页面</a-tag>
+            <a-tag v-else-if="record.type === 2" color="orange">链接</a-tag>
+          </template>
+          <template v-else-if="column.key === 'title'">
+            <a-avatar
+              :size="26"
+              shape="square"
+              :src="`${record.image}`"
+              style="margin-right: 10px"
+              v-if="record.image"
+            />
+            <a @click="openPreview(`/goods/search?categoryId=${record.categoryId}`)">{{
+              record.title
+            }}</a>
+          </template>
+          <template v-if="column.key === 'showIndex'">
+            <a-space @click="onShowIndex(record)">
+              <span v-if="record.showIndex === 1" class="ele-text-success"
+                ><CheckOutlined
+              /></span>
+              <span v-else class="ele-text-placeholder"><CloseOutlined /></span>
+            </a-space>
+          </template>
+          <template v-if="column.key === 'recommend'">
+            <a-space @click="onRecommend(record)">
+              <span v-if="record.recommend === 1" class="ele-text-success"
+                ><CheckOutlined
+              /></span>
+              <span v-else class="ele-text-placeholder"><CloseOutlined /></span>
+            </a-space>
+          </template>
+          <template v-if="column.key === 'status'">
+            <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+            <a-tag v-if="record.status === 1" color="orange">隐藏</a-tag>
+          </template>
+          <template v-else-if="column.key === 'action'">
+            <a-space>
+              <a @click="openEdit(null, record.categoryId)">添加</a>
+              <a-divider type="vertical" />
+              <a @click="moveUp(record)">上移<ArrowUpOutlined /></a>
+              <a-divider type="vertical" />
+              <a @click="openEdit(record)">修改</a>
+              <a-divider type="vertical" />
+              <a-popconfirm
+                placement="topRight"
+                title="确定要删除此分类吗？"
+                @confirm="remove(record)"
+              >
+                <a class="ele-text-danger">删除</a>
+              </a-popconfirm>
+            </a-space>
+          </template>
+        </template>
+      </ele-pro-table>
+    </a-card>
+    <!-- 编辑弹窗 -->
+    <category-edit
+      v-model:visible="showEdit"
+      :data="current"
+      :parent-id="parentId"
+      :category-list="categoryData"
+      @done="reload"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import {
+    ArrowUpOutlined,
+    PlusOutlined,
+    CheckOutlined,
+    CloseOutlined
+  } from '@ant-design/icons-vue';
+  import type {
+    DatasourceFunction,
+    ColumnItem,
+    EleProTableDone
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import {
+    messageLoading,
+    toDateString,
+    isExternalLink,
+    toTreeData,
+    eachTreeData
+  } from 'ele-admin-pro/es';
+  import type { EleProTable } from 'ele-admin-pro/es';
+  import CategoryEdit from './components/category-edit.vue';
+  import {
+    listGoodsCategory,
+    removeGoodsCategory,
+    updateGoodsCategory
+  } from '@/api/shop/goodsCategory';
+  import type {
+    GoodsCategory,
+    GoodsCategoryParam
+  } from '@/api/shop/goodsCategory/model';
+  import { openNew, openPreview } from '@/utils/common';
+  import { getSiteInfo } from '@/api/layout';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'categoryId',
+      width: 80
+    },
+    {
+      title: '分类名称',
+      dataIndex: 'title',
+      key: 'title',
+      showSorterTooltip: false,
+      ellipsis: true
+    },
+    // {
+    //   title: '路由地址',
+    //   dataIndex: 'path',
+    //   key: 'path'
+    // },
+    // {
+    //   title: '组件路径',
+    //   dataIndex: 'component',
+    //   key: 'component'
+    // },
+    // {
+    //   title: '类型',
+    //   dataIndex: 'type',
+    //   key: 'type',
+    //   align: 'center',
+    //   width: 120
+    // },
+    {
+      title: '首页显示',
+      dataIndex: 'showIndex',
+      key: 'showIndex',
+      align: 'center',
+      width: 120,
+      hideInTable: false
+    },
+    {
+      title: '推荐',
+      dataIndex: 'recommend',
+      key: 'recommend',
+      align: 'center',
+      width: 120,
+      hideInTable: false
+    },
+    {
+      title: '排序',
+      dataIndex: 'sortNumber',
+      align: 'center',
+      width: 120,
+      showSorterTooltip: false
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      width: 120,
+      showSorterTooltip: false,
+      customRender: ({ text }) => ['显示', '隐藏'][text]
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      showSorterTooltip: false,
+      ellipsis: true,
+      width: 180,
+      customRender: ({ text }) => toDateString(text)
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 200,
+      align: 'center'
+    }
+  ]);
+
+  // 当前编辑数据
+  const current = ref<GoodsCategory | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 上级分类id
+  const parentId = ref<number>();
+  // 分类数据
+  const categoryData = ref<GoodsCategory[]>([]);
+  // 表格展开的行
+  const expandedRowKeys = ref<number[]>([]);
+  const searchText = ref('');
+  const tenantId = ref<number>();
+  const domain = ref<string>();
+
+  getSiteInfo().then((data) => {
+    tenantId.value = data.tenantId;
+    domain.value = data.domain;
+  });
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({ where }) => {
+    where.title = searchText.value;
+    return listGoodsCategory({ ...where });
+  };
+
+  const linkTo = (item: GoodsCategory) => {
+    if (item.children) {
+      return false;
+    }
+    const url = `http://${tenantId.value}.${domain.value}${item.path}`;
+    return openNew(url.replace(':id', String(item.categoryId)));
+  };
+
+  // 上移
+  const moveUp = (row?: GoodsCategory) => {
+    updateGoodsCategory({
+      categoryId: row?.categoryId,
+      sortNumber: Number(row?.sortNumber) - 1
+    }).then((msg) => {
+      message.success(msg);
+      reload();
+    });
+  };
+
+  /* 数据转为树形结构 */
+  const parseData = (data: GoodsCategory[]) => {
+    return toTreeData({
+      data: data.map((d) => {
+        return { ...d, key: d.categoryId, value: d.categoryId };
+      }),
+      idField: 'categoryId',
+      parentIdField: 'parentId'
+    });
+  };
+
+  /* 表格渲染完成回调 */
+  const onDone: EleProTableDone<GoodsCategory> = ({ data }) => {
+    categoryData.value = data;
+  };
+
+  /* 刷新表格 */
+  const reload = (where?: GoodsCategoryParam) => {
+    tableRef?.value?.reload({ where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: GoodsCategory | null, id?: number) => {
+    current.value = row ?? null;
+    parentId.value = id;
+    showEdit.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: GoodsCategory) => {
+    if (row.children?.length) {
+      message.error('请先删除子节点');
+      return;
+    }
+    const hide = messageLoading('请求中..', 0);
+    removeGoodsCategory(row.categoryId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 展开全部 */
+  const expandAll = () => {
+    let keys: number[] = [];
+    eachTreeData(categoryData.value, (d) => {
+      if (d.children && d.children.length && d.categoryId) {
+        keys.push(d.categoryId);
+      }
+    });
+    expandedRowKeys.value = keys;
+  };
+
+  /* 折叠全部 */
+  const foldAll = () => {
+    expandedRowKeys.value = [];
+  };
+
+  /* 点击展开图标时触发 */
+  const onExpand = (expanded: boolean, record: GoodsCategory) => {
+    if (expanded) {
+      expandedRowKeys.value = [
+        ...expandedRowKeys.value,
+        record.categoryId as number
+      ];
+    } else {
+      expandedRowKeys.value = expandedRowKeys.value.filter(
+        (d) => d !== record.categoryId
+      );
+    }
+  };
+
+  /* 判断是否是目录 */
+  const isDirectory = (d: GoodsCategory) => {
+    return !!d.children?.length;
+  };
+
+  const onShowIndex = (row: GoodsCategory) => {
+    updateGoodsCategory({
+      ...row,
+      showIndex: row.showIndex == 1 ? 0 : 1
+    }).then((msg) => {
+      message.success(msg);
+      reload();
+    });
+  };
+
+  const onRecommend = (row: GoodsCategory) => {
+    updateGoodsCategory({
+      ...row,
+      recommend: row.recommend == 1 ? 0 : 1
+    }).then((msg) => {
+      message.success(msg);
+      reload();
+    });
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: GoodsCategory) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'GoodsCategory'
+  };
+</script>

modules/views/bak/category/preview/index.vue

@@ -0,0 +1,124 @@
+<template>
+  <a-card :title="title" class="ele-body">
+    <a-list item-layout="vertical" :pagination="pagination" :data-source="list">
+      <template #renderItem="{ item }">
+        <a-list-item key="item.title">
+          <template #actions>
+            <span v-for="{ icon, text } in actions" :key="icon">
+              <component :is="icon" style="margin-right: 8px" />
+              {{ text }}
+            </span>
+          </template>
+          <template #extra>
+            <img
+              width="100"
+              height="100"
+              alt="logo"
+              v-if="item.image"
+              :src="item.image"
+            />
+          </template>
+          <a-list-item-meta :description="item.title">
+            <template #title>
+              <a @click="openNew('/cms/article/' + item.articleId)">{{
+                item.title
+              }}</a>
+            </template>
+          </a-list-item-meta>
+        </a-list-item>
+      </template>
+    </a-list>
+  </a-card>
+</template>
+
+<script lang="ts" setup>
+  import { ref, unref, watch } from 'vue';
+  import { useRouter } from 'vue-router';
+  import { setPageTabTitle } from '@/utils/page-tab-util';
+  import { pageArticle } from '@/api/cms/article';
+  import { Article } from '@/api/cms/article/model';
+  import { getArticleCategory } from '@/api/cms/category';
+  import { ArticleCategory } from '@/api/cms/category/model';
+
+  import {
+    StarOutlined,
+    LikeOutlined,
+    MessageOutlined
+  } from '@ant-design/icons-vue';
+  import { openNew } from '@/utils/common';
+  const { currentRoute } = useRouter();
+  const title = ref<string>('');
+  const categoryId = ref(0);
+  const category = ref<ArticleCategory | any>();
+  const list = ref<Article[]>([]);
+  const spinning = ref(true);
+  const page = ref(1);
+
+  const pagination = {
+    onChange: (index: number) => {
+      page.value = index;
+      reload();
+    },
+    total: 10,
+    pageSize: 10
+  };
+
+  const actions: Record<string, any>[] = [
+    { icon: StarOutlined, text: '156' },
+    { icon: LikeOutlined, text: '156' },
+    { icon: MessageOutlined, text: '2' }
+  ];
+
+  /**
+   * 加载数据
+   */
+  const reload = () => {
+    // 加载文章分类
+    getArticleCategory(categoryId.value).then((data) => {
+      category.value = data;
+      // 修改页签标题
+      if (data.title) {
+        title.value = data.title;
+        setPageTabTitle(data.title);
+      }
+    });
+    // 加载文章列表
+    pageArticle({ categoryId: categoryId.value, page: page.value }).then(
+      (data) => {
+        if (data?.list) {
+          pagination.total = data.count;
+          list.value = data.list;
+        }
+        spinning.value = false;
+      }
+    );
+  };
+
+  watch(
+    currentRoute,
+    (route) => {
+      const { params } = unref(route);
+      const { id } = params;
+      if (id) {
+        categoryId.value = Number(id);
+        reload();
+      }
+    },
+    { immediate: true }
+  );
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'ArticleCategoryPreview'
+  };
+</script>
+<style>
+  body {
+    background: #f0f2f5;
+  }
+  .ele-body {
+    margin: 0 auto;
+    max-width: 1000px;
+  }
+</style>

modules/views/bak/course/components/courseEdit.vue

@@ -0,0 +1,304 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑课程管理' : '添加课程管理'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="课程名称" name="lessonName">
+        <a-input
+          allow-clear
+          placeholder="请输入课程名称"
+          v-model:value="form.lessonName"
+        />
+      </a-form-item>
+        <a-form-item
+          label="封面图"
+          name="image">
+          <SelectFile
+            :placeholder="`请选择图片`"
+            :limit="1"
+            :data="images"
+            @done="chooseImage"
+            @del="onDeleteItem"
+          />
+        </a-form-item>
+      <a-form-item label="分类ID" name="categoryId">
+        <a-input
+          allow-clear
+          placeholder="请输入分类ID"
+          v-model:value="form.categoryId"
+        />
+      </a-form-item>
+      <a-form-item label="课程价格" name="price">
+        <a-input
+          allow-clear
+          placeholder="请输入课程价格"
+          v-model:value="form.price"
+        />
+      </a-form-item>
+      <a-form-item label="老师ID" name="teacherId">
+        <a-input
+          allow-clear
+          placeholder="请输入老师ID"
+          v-model:value="form.teacherId"
+        />
+      </a-form-item>
+      <a-form-item label="上课时间" name="startTime">
+        <a-input
+          allow-clear
+          placeholder="请输入上课时间"
+          v-model:value="form.startTime"
+        />
+      </a-form-item>
+      <a-form-item label="课时" name="classPeriod">
+        <a-input
+          allow-clear
+          placeholder="请输入课时"
+          v-model:value="form.classPeriod"
+        />
+      </a-form-item>
+      <a-form-item label="报名人数上限" name="maxNumber">
+        <a-input
+          allow-clear
+          placeholder="请输入报名人数上限"
+          v-model:value="form.maxNumber"
+        />
+      </a-form-item>
+      <a-form-item label="上课地点" name="address">
+        <a-input
+          allow-clear
+          placeholder="请输入上课地点"
+          v-model:value="form.address"
+        />
+      </a-form-item>
+      <a-form-item label="详细介绍" name="content">
+        <a-input
+          allow-clear
+          placeholder="请输入详细介绍"
+          v-model:value="form.content"
+        />
+      </a-form-item>
+      <a-form-item label="课程相册" name="files">
+        <a-input
+          allow-clear
+          placeholder="请输入课程相册"
+          v-model:value="form.files"
+        />
+      </a-form-item>
+      <a-form-item label="年龄限制" name="ageLimit">
+        <a-input
+          allow-clear
+          placeholder="请输入年龄限制"
+          v-model:value="form.ageLimit"
+        />
+      </a-form-item>
+      <a-form-item label="报名时间" name="bmTime">
+        <a-input
+          allow-clear
+          placeholder="请输入报名时间"
+          v-model:value="form.bmTime"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="商户ID" name="merchantId">
+        <a-input
+          allow-clear
+          placeholder="请输入商户ID"
+          v-model:value="form.merchantId"
+        />
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addCourse, updateCourse } from '@/api/booking/course';
+  import { Course } from '@/api/booking/course/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Course | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Course>({
+    lessonId: undefined,
+    lessonName: undefined,
+    image: undefined,
+    categoryId: undefined,
+    price: undefined,
+    teacherId: undefined,
+    startTime: undefined,
+    classPeriod: undefined,
+    maxNumber: undefined,
+    address: undefined,
+    content: undefined,
+    files: undefined,
+    ageLimit: undefined,
+    bmTime: undefined,
+    comments: undefined,
+    merchantId: undefined,
+    status: undefined,
+    sortNumber: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    courseId: undefined,
+    courseName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    courseName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写课程管理名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateCourse : addCourse;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/course/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/course/index.vue

@@ -0,0 +1,321 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="courseId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <CourseEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import CourseEdit from './components/courseEdit.vue';
+  import {
+    pageCourse,
+    removeCourse,
+    removeBatchCourse
+  } from '@/api/booking_____/course';
+  import type { Course, CourseParam } from '@/api/booking_____/course/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Course[]>([]);
+  // 当前编辑数据
+  const current = ref<Course | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageCourse({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'lessonId',
+      key: 'lessonId',
+      align: 'center',
+      width: 90
+    },
+    {
+      title: '课程名称',
+      dataIndex: 'lessonName',
+      key: 'lessonName',
+      align: 'center'
+    },
+    {
+      title: '封面图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center'
+    },
+    {
+      title: '分类ID',
+      dataIndex: 'categoryId',
+      key: 'categoryId',
+      align: 'center'
+    },
+    {
+      title: '课程价格',
+      dataIndex: 'price',
+      key: 'price',
+      align: 'center'
+    },
+    {
+      title: '老师ID',
+      dataIndex: 'teacherId',
+      key: 'teacherId',
+      align: 'center'
+    },
+    {
+      title: '上课时间',
+      dataIndex: 'startTime',
+      key: 'startTime',
+      align: 'center'
+    },
+    {
+      title: '课时',
+      dataIndex: 'classPeriod',
+      key: 'classPeriod',
+      align: 'center'
+    },
+    {
+      title: '报名人数上限',
+      dataIndex: 'maxNumber',
+      key: 'maxNumber',
+      align: 'center'
+    },
+    {
+      title: '上课地点',
+      dataIndex: 'address',
+      key: 'address',
+      align: 'center'
+    },
+    {
+      title: '详细介绍',
+      dataIndex: 'content',
+      key: 'content',
+      align: 'center'
+    },
+    {
+      title: '课程相册',
+      dataIndex: 'files',
+      key: 'files',
+      align: 'center'
+    },
+    {
+      title: '年龄限制',
+      dataIndex: 'ageLimit',
+      key: 'ageLimit',
+      align: 'center'
+    },
+    {
+      title: '报名时间',
+      dataIndex: 'bmTime',
+      key: 'bmTime',
+      align: 'center'
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center'
+    },
+    {
+      title: '商户ID',
+      dataIndex: 'merchantId',
+      key: 'merchantId',
+      align: 'center'
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center'
+    },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: CourseParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Course) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Course) => {
+    const hide = message.loading('请求中..', 0);
+    removeCourse(row.courseId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchCourse(selection.value.map((d) => d.courseId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Course) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Course'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/courseCategory/components/courseCategoryEdit.vue

@@ -0,0 +1,248 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑课程分类' : '添加课程分类'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="分类名称" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入分类名称"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="分类标识" name="code">
+        <a-input
+          allow-clear
+          placeholder="请输入分类标识"
+          v-model:value="form.code"
+        />
+      </a-form-item>
+        <a-form-item
+          label="分类图片"
+          name="image">
+          <SelectFile
+            :placeholder="`请选择图片`"
+            :limit="1"
+            :data="images"
+            @done="chooseImage"
+            @del="onDeleteItem"
+          />
+        </a-form-item>
+      <a-form-item label="上级分类ID" name="parentId">
+        <a-input
+          allow-clear
+          placeholder="请输入上级分类ID"
+          v-model:value="form.parentId"
+        />
+      </a-form-item>
+      <a-form-item label="排序(数字越小越靠前)" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="是否推荐" name="recommend">
+        <a-input
+          allow-clear
+          placeholder="请输入是否推荐"
+          v-model:value="form.recommend"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0正常, 1禁用" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="是否删除, 0否, 1是" name="deleted">
+        <a-input
+          allow-clear
+          placeholder="请输入是否删除, 0否, 1是"
+          v-model:value="form.deleted"
+        />
+      </a-form-item>
+      <a-form-item label="修改时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入修改时间"
+          v-model:value="form.updateTime"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addCourseCategory, updateCourseCategory } from '@/api/booking/courseCategory';
+  import { CourseCategory } from '@/api/booking/courseCategory/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: CourseCategory | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<CourseCategory>({
+    id: undefined,
+    name: undefined,
+    code: undefined,
+    image: undefined,
+    parentId: undefined,
+    sortNumber: undefined,
+    comments: undefined,
+    recommend: undefined,
+    status: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    courseCategoryId: undefined,
+    courseCategoryName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    courseCategoryName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写课程分类名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateCourseCategory : addCourseCategory;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/courseCategory/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/courseCategory/index.vue

@@ -0,0 +1,288 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="courseCategoryId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <CourseCategoryEdit
+        v-model:visible="showEdit"
+        :data="current"
+        @done="reload"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import CourseCategoryEdit from './components/courseCategoryEdit.vue';
+  import {
+    pageCourseCategory,
+    removeCourseCategory,
+    removeBatchCourseCategory
+  } from '@/api/booking_____/courseCategory';
+  import type {
+    CourseCategory,
+    CourseCategoryParam
+  } from '@/api/booking_____/courseCategory/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<CourseCategory[]>([]);
+  // 当前编辑数据
+  const current = ref<CourseCategory | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageCourseCategory({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '商品分类ID',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90
+    },
+    {
+      title: '分类名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center'
+    },
+    {
+      title: '分类标识',
+      dataIndex: 'code',
+      key: 'code',
+      align: 'center'
+    },
+    {
+      title: '分类图片',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center'
+    },
+    {
+      title: '上级分类ID',
+      dataIndex: 'parentId',
+      key: 'parentId',
+      align: 'center'
+    },
+    {
+      title: '排序(数字越小越靠前)',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center'
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center'
+    },
+    {
+      title: '是否推荐',
+      dataIndex: 'recommend',
+      key: 'recommend',
+      align: 'center'
+    },
+    {
+      title: '状态, 0正常, 1禁用',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center'
+    },
+    {
+      title: '是否删除, 0否, 1是',
+      dataIndex: 'deleted',
+      key: 'deleted',
+      align: 'center'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center'
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: CourseCategoryParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: CourseCategory) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: CourseCategory) => {
+    const hide = message.loading('请求中..', 0);
+    removeCourseCategory(row.courseCategoryId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchCourseCategory(
+          selection.value.map((d) => d.courseCategoryId)
+        )
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: CourseCategory) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'CourseCategory'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/data/components/SelectMerchant/index.vue

@@ -0,0 +1,62 @@
+<!-- 选择下拉框 -->
+<template>
+  <a-select
+    :allow-clear="true"
+    :show-search="true"
+    optionFilterProp="label"
+    :options="options"
+    :value="value"
+    :placeholder="placeholder"
+    @update:value="updateValue"
+    :style="`width: 200px`"
+    @blur="onBlur"
+  />
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { Merchant } from '@/api/shop/merchant/model';
+  import { listMerchant } from '@/api/shop/merchant';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value: string, item: any): void;
+    (e: 'blur'): void;
+  }>();
+
+  const props = withDefaults(
+    defineProps<{
+      value?: any;
+      type?: any;
+      placeholder?: string;
+      dictCode?: string;
+    }>(),
+    {
+      placeholder: '请选择场馆'
+    }
+  );
+
+  // 字典数据
+  const options = ref<Merchant[]>([]);
+
+  /* 更新选中数据 */
+  const updateValue = (value: string) => {
+    const item = options.value?.find((d) => d.merchantName == value);
+    emit('update:value', value, item);
+  };
+  /* 失去焦点 */
+  const onBlur = () => {
+    emit('blur');
+  };
+
+  const reload = () => {
+    listMerchant({}).then((list) => {
+      options.value = list.map((d) => {
+        d.label = d.merchantName;
+        d.value = d.merchantCode;
+        return d;
+      });
+    });
+  };
+
+  reload();
+</script>

modules/views/bak/data/components/orderEdit.vue

@@ -0,0 +1,459 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="1000"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑订单' : '添加订单'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="订单编号" name="orderNo">
+        <a-input
+          allow-clear
+          placeholder="请输入订单编号"
+          :disabled="true"
+          v-model:value="form.orderNo"
+        />
+      </a-form-item>
+      <a-form-item label="微信支付订单号" name="transactionId">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入微信支付订单号"
+          v-model:value="form.transactionId"
+        />
+      </a-form-item>
+      <a-form-item label="微信退款订单号" name="refundOrder">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入微信退款订单号"
+          v-model:value="form.refundOrder"
+        />
+      </a-form-item>
+      <a-form-item label="商户ID" name="merchantId">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入商户ID"
+          v-model:value="form.merchantId"
+        />
+      </a-form-item>
+      <a-form-item label="使用的优惠券id" name="couponId">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入使用的优惠券id"
+          v-model:value="form.couponId"
+        />
+      </a-form-item>
+      <a-form-item label="使用的会员卡id" name="cardId">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入使用的会员卡id"
+          v-model:value="form.cardId"
+        />
+      </a-form-item>
+      <a-form-item label="IC卡号" name="icCard">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入IC卡号"
+          v-model:value="form.icCard"
+        />
+      </a-form-item>
+      <a-form-item label="真实姓名" name="realName">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入真实姓名"
+          v-model:value="form.realName"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入手机号码"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="订单总额" name="totalPrice">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入订单总额"
+          v-model:value="form.totalPrice"
+        />
+      </a-form-item>
+      <a-form-item label="减少的金额" name="reducePrice">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格"
+          v-model:value="form.reducePrice"
+        />
+      </a-form-item>
+      <a-form-item label="实际付款" name="payPrice">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入实际付款"
+          v-model:value="form.payPrice"
+        />
+      </a-form-item>
+      <!--      <a-form-item label="用于统计" name="price">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入用于统计"-->
+      <!--          v-model:value="form.price"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="价钱，用于积分赠送" name="money">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入价钱，用于积分赠送"-->
+      <!--          v-model:value="form.money"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <a-form-item label="退款金额" name="refundMoney" v-if="form.refundMoney">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入退款金额"
+          v-model:value="form.refundMoney"
+        />
+      </a-form-item>
+      <!--      <a-form-item label="教练价格" name="coachPrice">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入教练价格"-->
+      <!--          v-model:value="form.coachPrice"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="教练id" name="coachId">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入教练id"-->
+      <!--          v-model:value="form.coachId"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <a-form-item label="支付方式" name="payType">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入支付方式 0余额支付, 1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡"
+          v-model:value="form.payType"
+        />
+      </a-form-item>
+      <a-form-item label="支付状态" name="payStatus">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入0未付款，1已付款"
+          v-model:value="form.payStatus"
+        />
+      </a-form-item>
+      <a-form-item label="订单状态" name="orderStatus">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款"
+          v-model:value="form.orderStatus"
+        />
+      </a-form-item>
+      <a-form-item label="优惠类型" name="couponType">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡"
+          v-model:value="form.couponType"
+        />
+      </a-form-item>
+      <a-form-item label="优惠说明" name="couponDesc">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入优惠说明"
+          v-model:value="form.couponDesc"
+        />
+      </a-form-item>
+      <!--      <a-form-item-->
+      <!--        label="二维码地址，保存订单号，支付成功后才生成"-->
+      <!--        name="qrcode"-->
+      <!--      >-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入二维码地址，保存订单号，支付成功后才生成"-->
+      <!--          v-model:value="form.qrcode"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="vip月卡年卡、ic月卡年卡回退次数" name="returnNum">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入vip月卡年卡、ic月卡年卡回退次数"-->
+      <!--          v-model:value="form.returnNum"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="vip充值回退金额" name="returnMoney">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入vip充值回退金额"-->
+      <!--          v-model:value="form.returnMoney"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <a-form-item label="预约详情开始时间数组" name="startTime">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入预约详情开始时间数组"
+          v-model:value="form.startTime"
+        />
+      </a-form-item>
+      <a-form-item label="是否已开具发票" name="isInvoice">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入是否已开具发票：0未开发票，1已开发票，2不能开具发票"
+          v-model:value="form.isInvoice"
+        />
+      </a-form-item>
+      <a-form-item label="支付时间" name="payTime">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入支付时间"
+          v-model:value="form.payTime"
+        />
+      </a-form-item>
+      <a-form-item label="退款时间" name="refundTime">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入退款时间"
+          v-model:value="form.refundTime"
+        />
+      </a-form-item>
+      <a-form-item label="申请退款时间" name="refundApplyTime">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入申请退款时间"
+          v-model:value="form.refundApplyTime"
+        />
+      </a-form-item>
+      <a-form-item label="对账情况" name="checkBill">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入对账情况：0=未对账；1=已对账；3=已对账，金额对不上；4=未查询到该订单"
+          v-model:value="form.checkBill"
+        />
+      </a-form-item>
+      <a-form-item label="订单是否已结算" name="isSettled">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入订单是否已结算(0未结算 1已结算)"
+          v-model:value="form.isSettled"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          :disabled="true"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addOrder, updateOrder } from '@/api/shop/order';
+  import { Order } from '@/api/shop/order/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Order | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Order>({
+    orderId: undefined,
+    orderNo: undefined,
+    transactionId: undefined,
+    refundOrder: undefined,
+    merchantId: undefined,
+    couponId: undefined,
+    cardId: undefined,
+    adminId: undefined,
+    confirmId: undefined,
+    icCard: undefined,
+    realName: undefined,
+    phone: undefined,
+    totalPrice: undefined,
+    reducePrice: undefined,
+    payPrice: undefined,
+    price: undefined,
+    money: undefined,
+    refundMoney: undefined,
+    coachPrice: undefined,
+    coachId: undefined,
+    payType: undefined,
+    payStatus: undefined,
+    orderStatus: undefined,
+    couponType: undefined,
+    couponDesc: undefined,
+    qrcode: undefined,
+    returnNum: undefined,
+    returnMoney: undefined,
+    startTime: undefined,
+    isInvoice: undefined,
+    payTime: undefined,
+    refundTime: undefined,
+    refundApplyTime: undefined,
+    checkBill: undefined,
+    isSettled: undefined,
+    version: undefined,
+    userId: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    updateTime: undefined,
+    createTime: undefined,
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    orderName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写订单名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateOrder : addOrder;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if (props.data.image) {
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            });
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/data/components/orderInfo.vue

@@ -0,0 +1,439 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="`80%`"
+    :visible="visible"
+    :confirm-loading="loading"
+    :maxable="maxAble"
+    :title="isUpdate ? '编辑订单' : '订单详情'"
+    :body-style="{ paddingBottom: '8px', background: '#f3f3f3' }"
+    @update:visible="updateVisible"
+    :maskClosable="false"
+    :footer="null"
+    @ok="save"
+  >
+    <a-card class="order-card" :bordered="false">
+      <a-descriptions title="基本信息" :column="3">
+        <a-descriptions-item
+          label="订单号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.orderId }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单编号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.orderNo }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单状态"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <a-tag v-if="form.orderStatus == 0">未使用</a-tag>
+          <a-tag v-if="form.orderStatus == 1">已付款</a-tag>
+          <a-tag v-if="form.orderStatus == 2">已取消</a-tag>
+          <a-tag v-if="form.orderStatus == 3">已取消</a-tag>
+          <a-tag v-if="form.orderStatus == 4">退款申请中</a-tag>
+          <a-tag v-if="form.orderStatus == 5">退款被拒绝</a-tag>
+          <a-tag v-if="form.orderStatus == 6">退款成功</a-tag>
+          <a-tag v-if="form.orderStatus == 7">客户端申请退款</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="买家信息"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.realName }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="手机号码"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.phone }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="交易流水号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.transactionId }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单总金额"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          ￥{{ form.totalPrice }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="实付金额"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          ￥{{ form.payPrice }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="减少金额"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          ￥{{ form.reducePrice }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="支付方式"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <template v-if="form.payStatus == 1">
+            <a-tag v-if="form.payType == 1">微信支付</a-tag>
+            <a-tag v-if="form.payType == 2">积分</a-tag>
+            <a-tag v-if="form.payType == 3">支付宝</a-tag>
+            <a-tag v-if="form.payType == 4">现金</a-tag>
+            <a-tag v-if="form.payType == 5">POS机</a-tag>
+            <a-tag v-if="form.payType == 6">VIP月卡</a-tag>
+            <a-tag v-if="form.payType == 7">formVIP年卡</a-tag>
+            <a-tag v-if="form.payType == 8">formVIP次卡</a-tag>
+            <a-tag v-if="form.payType == 9">formIC月卡</a-tag>
+            <a-tag v-if="form.payType == 10">formIC年卡</a-tag>
+            <a-tag v-if="form.payType == 11">formIC次卡</a-tag>
+            <a-tag v-if="form.payType == 12">form免费</a-tag>
+            <a-tag v-if="form.payType == 13">formVIP充值卡</a-tag>
+            <a-tag v-if="form.payType == 14">formIC充值卡</a-tag>
+            <a-tag v-if="form.payType == 15">form积分支付</a-tag>
+            <a-tag v-if="form.payType == 16">formVIP季卡</a-tag>
+            <a-tag v-if="form.payType == 17">formIC季卡</a-tag>
+          </template>
+          <template v-else>
+            <span></span>
+          </template>
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="支付状态"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <a-tag v-if="form.payStatus == 1" color="green"
+            ><CheckOutlined class="tag-icon" />已付款</a-tag
+          >
+          <a-tag v-if="form.payStatus == 0" color="error"
+            ><CloseOutlined class="tag-icon" />未付款</a-tag
+          >
+          <a-tag v-if="form.payStatus == 3" color="cyan"
+            ><CoffeeOutlined class="tag-icon" />未付款,占场中</a-tag
+          >
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="付款时间"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.payTime }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="下单时间"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.createTime }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="信息备注"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.comments }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-card>
+    <a-card class="order-card" :bordered="false">
+      <a-spin :spinning="loading">
+        <a-table
+          :data-source="form.orderInfoList"
+          :columns="columns"
+          :pagination="false"
+        >
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'action'">
+              <SelectBookingField
+                :merchantId="record.merchantId"
+                :timePeriod="record.timePeriod"
+                :week="week"
+                :id="record.id"
+                v-if="form.payStatus == 1 && form.orderStatus == 0"
+                @done="reload"
+              />
+            </template>
+          </template>
+        </a-table>
+      </a-spin>
+    </a-card>
+  </ele-modal>
+  <!-- 换场地 -->
+  <!--  <SelectField-->
+  <!--    v-model:visible="showField"-->
+  <!--    :orderId="form.orderId"-->
+  <!--    :data="current"-->
+  <!--    :week="week"-->
+  <!--    @done="reload"-->
+  <!--  />-->
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form } from 'ant-design-vue';
+  import { assignObject } from 'ele-admin-pro';
+  import { Order, OrderParam } from '@/api/shop/order/model';
+  import { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
+  import {
+    CheckOutlined,
+    CloseOutlined,
+    CoffeeOutlined
+  } from '@ant-design/icons-vue';
+  import SelectField from './SelectField.vue';
+  import { Field } from '@/api/booking/field/model';
+  import useSearch from '@/utils/use-search';
+
+  const useForm = Form.useForm;
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Order | null;
+    week?: string;
+  }>();
+
+  export interface step {
+    title?: String | undefined;
+    subTitle?: String | undefined;
+    description?: String | undefined;
+  }
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  // 是否显示最大化切换按钮
+  const maxAble = ref(true);
+  const showField = ref(false);
+  // 当前编辑数据
+  const current = ref<Field | null>(null);
+
+  // 步骤条
+  const steps = ref<step[]>([
+    {
+      title: '报餐',
+      description: undefined
+    },
+    {
+      title: '付款',
+      description: undefined
+    },
+    {
+      title: '发餐',
+      description: undefined
+    },
+    {
+      title: '取餐',
+      description: undefined
+    },
+    {
+      title: '完成',
+      description: undefined
+    }
+  ]);
+  const active = ref(2);
+
+  const emit = defineEmits<{
+    (e: 'done', where?: OrderParam): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 订单信息
+  const form = reactive<Order>({
+    orderId: undefined,
+    orderNo: undefined,
+    transactionId: undefined,
+    refundOrder: undefined,
+    merchantId: undefined,
+    couponId: undefined,
+    cardId: undefined,
+    adminId: undefined,
+    confirmId: undefined,
+    icCard: undefined,
+    realName: undefined,
+    phone: undefined,
+    totalPrice: undefined,
+    reducePrice: undefined,
+    payPrice: undefined,
+    price: undefined,
+    money: undefined,
+    refundMoney: undefined,
+    coachPrice: undefined,
+    coachId: undefined,
+    payType: undefined,
+    payStatus: undefined,
+    orderStatus: undefined,
+    couponType: undefined,
+    couponDesc: undefined,
+    qrcode: undefined,
+    returnNum: undefined,
+    returnMoney: undefined,
+    startTime: undefined,
+    isInvoice: undefined,
+    payTime: undefined,
+    refundTime: undefined,
+    refundApplyTime: undefined,
+    checkBill: undefined,
+    isSettled: undefined,
+    version: undefined,
+    userId: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    updateTime: undefined,
+    createTime: undefined,
+    status: 0,
+    comments: '',
+    sortNumber: 100,
+    orderInfoList: []
+  });
+
+  // 请求状态
+  const loading = ref(true);
+
+  const { resetFields } = useForm(form);
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '场馆名称',
+      dataIndex: 'merchantName',
+      key: 'merchantName'
+    },
+    {
+      title: '场地',
+      dataIndex: 'fieldName'
+    },
+    {
+      title: '预定信息',
+      dataIndex: 'comments',
+      key: 'comments'
+    },
+    {
+      title: '金额',
+      dataIndex: 'price',
+      customRender: ({ text }) => '￥' + text
+    },
+    {
+      title: '操作',
+      align: 'center',
+      dataIndex: 'action',
+      key: 'action'
+    }
+  ]);
+
+  /* 制作步骤条 */
+  const loadSteps = (order) => {
+    steps.value = [];
+    steps.value.push({
+      title: '下单'
+    });
+    steps.value.push({
+      title: '付款'
+    });
+    steps.value.push({
+      title: '发货'
+    });
+    steps.value.push({
+      title: '收货'
+    });
+    steps.value.push({
+      title: '完成'
+    });
+
+    // 下单
+    if (order.payStatus == 10) {
+      active.value = 0;
+      steps.value[0].description = order.createTime;
+    }
+    // 付款
+    if (order.payStatus == 20) {
+      active.value = 1;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+    }
+    // 发货
+    if (order.payStatus == 20 && order.deliveryStatus == 20) {
+      active.value = 2;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+      steps.value[2].description = order.deliveryTime;
+    }
+    // 收货
+    if (order.payStatus == 20 && order.receiptStatus == 20) {
+      active.value = 3;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+      steps.value[2].description = order.deliveryTime;
+      steps.value[3].description = order.receiptTime;
+    }
+    // 完成
+    if (order.payStatus == 20 && order.orderStatus == 30) {
+      active.value = 4;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+      steps.value[2].description = order.deliveryTime;
+      steps.value[3].description = order.receiptTime;
+    }
+    // 已取消
+    if (order.orderStatus == 20) {
+      active.value = 4;
+    }
+  };
+
+  const openEdit = (row?: Field) => {
+    current.value = row ?? null;
+    showField.value = true;
+  };
+  // const getOrderInfo = () => {
+  //   const orderId = props.data?.orderId;
+  //   listOrderInfo({ orderId }).then((data) => {
+  //     orderInfo.value = data.filter((d) => d.totalNum > 0);
+  //   });
+  // };
+
+  const reload = (where) => {
+    updateVisible(false);
+    emit('done', where);
+  };
+
+  /* 保存编辑 */
+  const save = () => {};
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          loading.value = false;
+          assignObject(form, props.data);
+          loadSteps(props.data);
+        }
+      } else {
+        resetFields();
+      }
+    }
+  );
+</script>
+<style lang="less" scoped>
+  .order-card {
+    margin-bottom: 20px;
+  }
+  .ant-form-item {
+    margin-bottom: 5px;
+  }
+  .order-info {
+    display: flex;
+    .info {
+      padding-left: 5px;
+      display: flex;
+      flex-direction: column;
+    }
+  }
+  .tag-icon {
+    padding-right: 6px;
+  }
+</style>

modules/views/bak/data/components/search.vue

@@ -0,0 +1,141 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <SelectMerchantDown
+      v-if="!getMerchantId()"
+      :placeholder="`选择场馆`"
+      class="input-item"
+      v-model:value="where.merchantId"
+      @change="search"
+    />
+    <a-date-picker
+      placeholder="按天筛选"
+      value-format="YYYY-MM-DD"
+      v-model:value="where.dateTime"
+      @change="search"
+    />
+    <a-button @click="reset">刷新</a-button>
+    <!--    <a-radio-group v-model:value="where.keywords" @change="search">-->
+    <!--      <template v-for="(item, index) in next7day" :key="index">-->
+    <!--        <a-radio-button value="0"-->
+    <!--          >{{ item.date }} {{ getWeek(item.week) }}</a-radio-button-->
+    <!--        >-->
+    <!--      </template>-->
+    <!--    </a-radio-group>-->
+  </a-space>
+  <ele-modal
+    :width="500"
+    :visible="showQrcode"
+    :maskClosable="false"
+    title="使用微信扫一扫完成支付"
+    :body-style="{ paddingBottom: '28px' }"
+    @cancel="closeQrcode"
+    @ok="closeQrcode"
+  >
+    <div class="qrcode">
+      <ele-qr-code-svg v-if="text" :value="text" :size="200" />
+      <div class="ele-text-secondary">使用微信扫一扫完成支付</div>
+    </div>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, watch } from 'vue';
+  import useSearch from '@/utils/use-search';
+  import { OrderParam } from '@/api/shop/order/model';
+  import { getNativeCode } from '@/api/system/payment';
+  import { getNext7day, getServerTime } from '@/api/layout';
+  import { getMerchantId } from '@/utils/common';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  interface serverTime {
+    today?: string;
+  }
+
+  interface dateItem {
+    date?: string;
+    week?: string;
+  }
+
+  const emit = defineEmits<{
+    (e: 'search', where?: OrderParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 表单数据
+  const { where, resetFields } = useSearch<OrderParam>({
+    dateTime: '',
+    isStatus: 0,
+    merchantCode: undefined,
+    week: 0,
+    merchantId: getMerchantId()
+  });
+
+  /* 搜索 */
+  const search = () => {
+    emit('search', where);
+  };
+
+  /*  重置 */
+  const reset = () => {
+    emit('search', where);
+  };
+
+  // 二维码内容
+  const text = ref('');
+  const showQrcode = ref(false);
+  const next7day = ref<dateItem[]>([]);
+  const serverTime = ref<serverTime>({});
+
+  const closeQrcode = () => {
+    showQrcode.value = !showQrcode.value;
+  };
+
+  const getCode = () => {
+    getNativeCode({}).then((data) => {
+      text.value = String(data);
+      showQrcode.value = true;
+    });
+  };
+
+  const reload = () => {
+    getNext7day().then((res) => {
+      next7day.value = res;
+      where.week = res[0].week;
+    });
+    getServerTime().then((res) => {
+      serverTime.value = res;
+      where.dateTime = res.today;
+      where.merchantId = getMerchantId();
+      // where.merchantCode = '37';
+      where.isStatus = 0;
+      emit('search', where);
+    });
+  };
+
+  reload();
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
+
+<style lang="less" scoped>
+  .qrcode {
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+    padding: 40px 0;
+  }
+</style>

modules/views/bak/data/index.vue

@@ -0,0 +1,440 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <search
+          @search="reload"
+          :selection="selection"
+          @add="openEdit"
+          @remove="removeBatch"
+          @batchMove="openMove"
+        />
+      </a-card>
+      <template v-for="(item, index) in periodList" :key="index">
+        <div class="checkout-body">
+          <view class="period-item">
+            <view class="period ele-text-primary">{{ item.timePeriod }}</view>
+            <view class="field-list">
+              <template v-for="(field, index2) in item.fieldList" :key="index2">
+                <view
+                  class="field"
+                  :class="isActive(field)"
+                  style="cursor: pointer"
+                  @click="openEdit(field)"
+                >
+                  <text class="field-name">{{ field.fieldName }}</text>
+                  <text class="price">{{ item.price }}元</text>
+                </view>
+              </template>
+            </view>
+          </view>
+        </div>
+      </template>
+      <!-- 编辑弹窗 -->
+      <OrderInfo
+        v-model:visible="showEdit"
+        :data="current"
+        :week="week"
+        @done="reload"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import {
+    ExclamationCircleOutlined,
+    CheckOutlined,
+    CloseOutlined,
+    ClockCircleOutlined,
+    IdcardOutlined,
+    WechatOutlined,
+    CoffeeOutlined,
+    AlipayCircleOutlined
+  } from '@ant-design/icons-vue';
+  import { EleProTable, messageLoading, toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import OrderInfo from './components/orderInfo.vue';
+  import {
+    pageOrder,
+    removeOrder,
+    removeBatchOrder
+  } from '@/api/booking/order';
+  import type { Order } from '@/api/booking/order/model';
+  import { formatNumber } from 'ele-admin-pro/es';
+  import { Period, PeriodParam } from '@/api/booking/period/model';
+  import { listPeriod } from '@/api/booking/period';
+  import { Field } from '@/api/booking/field/model';
+  import { getOrder } from '@/api/booking/order';
+  import { reloadPageTab } from '@/utils/page-tab-util';
+  import { getMerchantId } from '@/utils/common';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Order[]>([]);
+  // 当前编辑数据
+  const current = ref<Order | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  const week = ref<any>(0);
+  // 加载状态
+  const loading = ref(true);
+  const periodList = ref<Period[]>([]);
+  const merchantId = ref(0);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    where.type = 1;
+    where.merchantId = getMerchantId();
+    return pageOrder({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '订单号',
+      dataIndex: 'orderId',
+      key: 'orderId',
+      width: 90
+    },
+    {
+      title: '姓名',
+      dataIndex: 'realName',
+      key: 'realName',
+      align: 'center'
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: '总额',
+      dataIndex: 'totalPrice',
+      key: 'totalPrice',
+      align: 'center',
+      customRender: ({ text }) => `￥${formatNumber(text)}`
+    },
+    {
+      title: '减少金额',
+      dataIndex: 'reducePrice',
+      key: 'reducePrice',
+      align: 'center',
+      customRender: ({ text }) => `￥${formatNumber(text)}`
+    },
+    {
+      title: '实付金额',
+      dataIndex: 'payPrice',
+      key: 'payPrice',
+      align: 'center',
+      customRender: ({ text }) => `￥${formatNumber(text)}`
+    },
+    {
+      title: '支付方式',
+      dataIndex: 'payType',
+      key: 'payType',
+      align: 'center'
+    },
+    {
+      title: '付款状态',
+      dataIndex: 'payStatus',
+      key: 'payStatus',
+      align: 'center'
+    },
+    {
+      title: '付款时间',
+      dataIndex: 'payTime',
+      key: 'payTime',
+      align: 'center',
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
+    },
+    {
+      title: '订单状态',
+      dataIndex: 'orderStatus',
+      key: 'orderStatus',
+      align: 'center'
+    },
+    {
+      title: '优惠类型',
+      dataIndex: 'couponType',
+      key: 'couponType',
+      align: 'center'
+    },
+    {
+      title: '是否已开票',
+      dataIndex: 'isInvoice',
+      key: 'isInvoice',
+      align: 'center'
+    },
+    {
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+      customRender: ({ text }) =>
+        ['商城订单', '客户预定', '俱乐部训练场', '活动订场'][text]
+    },
+    // {
+    //   title: '申请退款时间',
+    //   dataIndex: 'refundApplyTime',
+    //   key: 'refundApplyTime',
+    //   align: 'center',
+    //   customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
+    // },
+    // {
+    //   title: '备注',
+    //   dataIndex: 'comments',
+    //   key: 'comments',
+    //   align: 'center'
+    // },
+    {
+      title: '操作',
+      key: 'action',
+      width: 120,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: PeriodParam) => {
+    const hide = messageLoading('请求中..', 0);
+    week.value = where?.week;
+    listPeriod(where)
+      .then((list) => {
+        if (list) {
+          hide();
+          periodList.value = list;
+        }
+      })
+      .catch((err) => {
+        message.error('该场馆没有添加时间段，或预约时间已过');
+        hide();
+      });
+    // selection.value = [];
+    // tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Field) => {
+    const orderId = Number(row?.orderId);
+    if (periodList.value.length == 0) {
+      console.log('sssssss');
+      return message.error('该场馆没有添加时间段，或预约时间已过');
+    }
+    if (orderId > 0) {
+      getOrder(orderId)
+        .then((res) => {
+          console.log(res);
+          current.value = res ?? null;
+          showEdit.value = true;
+        })
+        .catch((err) => {
+          message.error(err.message);
+        });
+    }
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  const isActive = (item) => {
+    if (item.sold) {
+      if (item.isHalf == 1) {
+        return 'web-bg-warning';
+      }
+      return 'web-bg-info';
+    }
+    // if (index) {
+    //
+    // }
+  };
+  const onField = (item) => {};
+
+  /* 删除单个 */
+  const remove = (row: Order) => {
+    const hide = message.loading('请求中..', 0);
+    removeOrder(row.orderId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchOrder(selection.value.map((d) => d.orderId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  // const query = (where: PeriodParam) => {
+  //   loading.value = true;
+  // };
+
+  /* 自定义行属性 */
+  const customRow = (record: Order) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+</script>
+
+<script lang="ts">
+  import * as MenuIcons from '@/layout/menu-icons';
+  export default {
+    name: 'Order',
+    components: MenuIcons
+  };
+</script>
+<style lang="less" scoped>
+  .tag-icon {
+    padding-right: 6px;
+  }
+  .checkout-body {
+    padding: 10px 0;
+
+    .period-item {
+      margin: 16px 0;
+
+      .period {
+        line-height: 2em;
+        padding-left: 6px;
+        font-size: 16px;
+      }
+
+      .field-list {
+        display: flex;
+        flex-wrap: wrap;
+
+        .web-bg-info {
+          background-color: #909399 !important;
+          color: #ffffff !important;
+        }
+
+        .web-bg-success {
+          color: #2ba91c !important;
+          border: 1px solid #2ba91c !important;
+        }
+
+        .web-bg-warning {
+          // background-color: #c9e294 !important;
+        }
+
+        .active {
+          &:before {
+            border-radius: 0 0 6px 0;
+            content: '';
+            position: absolute;
+            right: 0;
+            bottom: 0;
+            border: 12px solid #2ba91c;
+            border-top-color: transparent;
+            border-left-color: transparent;
+          }
+
+          &:after {
+            content: '';
+            width: 5px;
+            height: 10px;
+            position: absolute;
+            right: 3px;
+            bottom: 4px;
+            border: 1px solid #fff;
+            border-top-color: transparent;
+            border-left-color: transparent;
+            transform: rotate(45deg);
+            border-radius: 2px;
+          }
+        }
+
+        .field {
+          width: 59px;
+          height: 59px;
+          margin: 5px;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          border-radius: 8px;
+          line-height: 1.3em;
+          position: relative;
+          color: #333333;
+          background-color: #ffffff;
+          border: 1px solid #808080;
+
+          .field-name {
+            font-size: 12px;
+            text-align: center;
+          }
+
+          .price {
+            font-size: 14px;
+          }
+        }
+      }
+    }
+  }
+</style>

modules/views/bak/export/components/orderEdit.vue

@@ -0,0 +1,459 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="1000"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑订单' : '添加订单'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="订单编号" name="orderNo">
+        <a-input
+          allow-clear
+          placeholder="请输入订单编号"
+          :disabled="true"
+          v-model:value="form.orderNo"
+        />
+      </a-form-item>
+      <a-form-item label="微信支付订单号" name="transactionId">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入微信支付订单号"
+          v-model:value="form.transactionId"
+        />
+      </a-form-item>
+      <a-form-item label="微信退款订单号" name="refundOrder">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入微信退款订单号"
+          v-model:value="form.refundOrder"
+        />
+      </a-form-item>
+      <a-form-item label="商户ID" name="merchantId">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入商户ID"
+          v-model:value="form.merchantId"
+        />
+      </a-form-item>
+      <a-form-item label="使用的优惠券id" name="couponId">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入使用的优惠券id"
+          v-model:value="form.couponId"
+        />
+      </a-form-item>
+      <a-form-item label="使用的会员卡id" name="cardId">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入使用的会员卡id"
+          v-model:value="form.cardId"
+        />
+      </a-form-item>
+      <a-form-item label="IC卡号" name="icCard">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入IC卡号"
+          v-model:value="form.icCard"
+        />
+      </a-form-item>
+      <a-form-item label="真实姓名" name="realName">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入真实姓名"
+          v-model:value="form.realName"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入手机号码"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="订单总额" name="totalPrice">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入订单总额"
+          v-model:value="form.totalPrice"
+        />
+      </a-form-item>
+      <a-form-item label="减少的金额" name="reducePrice">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格"
+          v-model:value="form.reducePrice"
+        />
+      </a-form-item>
+      <a-form-item label="实际付款" name="payPrice">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入实际付款"
+          v-model:value="form.payPrice"
+        />
+      </a-form-item>
+      <!--      <a-form-item label="用于统计" name="price">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入用于统计"-->
+      <!--          v-model:value="form.price"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="价钱，用于积分赠送" name="money">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入价钱，用于积分赠送"-->
+      <!--          v-model:value="form.money"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <a-form-item label="退款金额" name="refundMoney" v-if="form.refundMoney">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入退款金额"
+          v-model:value="form.refundMoney"
+        />
+      </a-form-item>
+      <!--      <a-form-item label="教练价格" name="coachPrice">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入教练价格"-->
+      <!--          v-model:value="form.coachPrice"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="教练id" name="coachId">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入教练id"-->
+      <!--          v-model:value="form.coachId"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <a-form-item label="支付方式" name="payType">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入支付方式 0余额支付, 1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡"
+          v-model:value="form.payType"
+        />
+      </a-form-item>
+      <a-form-item label="支付状态" name="payStatus">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入0未付款，1已付款"
+          v-model:value="form.payStatus"
+        />
+      </a-form-item>
+      <a-form-item label="订单状态" name="orderStatus">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款"
+          v-model:value="form.orderStatus"
+        />
+      </a-form-item>
+      <a-form-item label="优惠类型" name="couponType">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡"
+          v-model:value="form.couponType"
+        />
+      </a-form-item>
+      <a-form-item label="优惠说明" name="couponDesc">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入优惠说明"
+          v-model:value="form.couponDesc"
+        />
+      </a-form-item>
+      <!--      <a-form-item-->
+      <!--        label="二维码地址，保存订单号，支付成功后才生成"-->
+      <!--        name="qrcode"-->
+      <!--      >-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入二维码地址，保存订单号，支付成功后才生成"-->
+      <!--          v-model:value="form.qrcode"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="vip月卡年卡、ic月卡年卡回退次数" name="returnNum">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入vip月卡年卡、ic月卡年卡回退次数"-->
+      <!--          v-model:value="form.returnNum"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <!--      <a-form-item label="vip充值回退金额" name="returnMoney">-->
+      <!--        <a-input-->
+      <!--          allow-clear-->
+      <!--          placeholder="请输入vip充值回退金额"-->
+      <!--          v-model:value="form.returnMoney"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <a-form-item label="预约详情开始时间数组" name="startTime">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入预约详情开始时间数组"
+          v-model:value="form.startTime"
+        />
+      </a-form-item>
+      <a-form-item label="是否已开具发票" name="isInvoice">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入是否已开具发票：0未开发票，1已开发票，2不能开具发票"
+          v-model:value="form.isInvoice"
+        />
+      </a-form-item>
+      <a-form-item label="支付时间" name="payTime">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入支付时间"
+          v-model:value="form.payTime"
+        />
+      </a-form-item>
+      <a-form-item label="退款时间" name="refundTime">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入退款时间"
+          v-model:value="form.refundTime"
+        />
+      </a-form-item>
+      <a-form-item label="申请退款时间" name="refundApplyTime">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入申请退款时间"
+          v-model:value="form.refundApplyTime"
+        />
+      </a-form-item>
+      <a-form-item label="对账情况" name="checkBill">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入对账情况：0=未对账；1=已对账；3=已对账，金额对不上；4=未查询到该订单"
+          v-model:value="form.checkBill"
+        />
+      </a-form-item>
+      <a-form-item label="订单是否已结算" name="isSettled">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入订单是否已结算(0未结算 1已结算)"
+          v-model:value="form.isSettled"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          :disabled="true"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addOrder, updateOrder } from '@/api/shop/order';
+  import { Order } from '@/api/shop/order/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Order | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Order>({
+    orderId: undefined,
+    orderNo: undefined,
+    transactionId: undefined,
+    refundOrder: undefined,
+    merchantId: undefined,
+    couponId: undefined,
+    cardId: undefined,
+    adminId: undefined,
+    confirmId: undefined,
+    icCard: undefined,
+    realName: undefined,
+    phone: undefined,
+    totalPrice: undefined,
+    reducePrice: undefined,
+    payPrice: undefined,
+    price: undefined,
+    money: undefined,
+    refundMoney: undefined,
+    coachPrice: undefined,
+    coachId: undefined,
+    payType: undefined,
+    payStatus: undefined,
+    orderStatus: undefined,
+    couponType: undefined,
+    couponDesc: undefined,
+    qrcode: undefined,
+    returnNum: undefined,
+    returnMoney: undefined,
+    startTime: undefined,
+    isInvoice: undefined,
+    payTime: undefined,
+    refundTime: undefined,
+    refundApplyTime: undefined,
+    checkBill: undefined,
+    isSettled: undefined,
+    version: undefined,
+    userId: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    updateTime: undefined,
+    createTime: undefined,
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    orderName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写订单名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateOrder : addOrder;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if (props.data.image) {
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            });
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/export/components/orderInfo.vue

@@ -0,0 +1,401 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="`80%`"
+    :visible="visible"
+    :confirm-loading="loading"
+    :maxable="maxAble"
+    :title="isUpdate ? '编辑订单' : '订单详情'"
+    :body-style="{ paddingBottom: '8px', background: '#f3f3f3' }"
+    @update:visible="updateVisible"
+    :maskClosable="false"
+    :footer="null"
+    @ok="save"
+  >
+    <a-card class="order-card" :bordered="false">
+      <a-descriptions title="基本信息" :column="3">
+        <a-descriptions-item
+          label="订单号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.orderId }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单编号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.orderNo }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单状态"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <a-tag v-if="form.orderStatus == 0">未使用</a-tag>
+          <a-tag v-if="form.orderStatus == 1">已付款</a-tag>
+          <a-tag v-if="form.orderStatus == 3">已取消</a-tag>
+          <a-tag v-if="form.orderStatus == 4">退款申请中</a-tag>
+          <a-tag v-if="form.orderStatus == 5">退款被拒绝</a-tag>
+          <a-tag v-if="form.orderStatus == 6">退款成功</a-tag>
+          <a-tag v-if="form.orderStatus == 7">客户端申请退款</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="买家信息"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.realName }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="手机号码"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.phone }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="交易流水号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.transactionId }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单总金额"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          ￥{{ form.totalPrice }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="实付金额"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          ￥{{ form.payPrice }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="减少金额"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          ￥{{ form.reducePrice }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="支付方式"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <template v-if="form.payStatus == 1">
+            <a-tag v-if="form.payType == 0">余额支付</a-tag>
+            <a-tag v-if="form.payType == 1">微信支付</a-tag>
+            <a-tag v-if="form.payType == 2">积分</a-tag>
+            <a-tag v-if="form.payType == 3">支付宝</a-tag>
+            <a-tag v-if="form.payType == 4">现金</a-tag>
+            <a-tag v-if="form.payType == 5">POS机</a-tag>
+            <a-tag v-if="form.payType == 6">VIP月卡</a-tag>
+            <a-tag v-if="form.payType == 7">formVIP年卡</a-tag>
+            <a-tag v-if="form.payType == 8">formVIP次卡</a-tag>
+            <a-tag v-if="form.payType == 9">formIC月卡</a-tag>
+            <a-tag v-if="form.payType == 10">formIC年卡</a-tag>
+            <a-tag v-if="form.payType == 11">formIC次卡</a-tag>
+            <a-tag v-if="form.payType == 12">form免费</a-tag>
+            <a-tag v-if="form.payType == 13">formVIP充值卡</a-tag>
+            <a-tag v-if="form.payType == 14">formIC充值卡</a-tag>
+            <a-tag v-if="form.payType == 15">form积分支付</a-tag>
+            <a-tag v-if="form.payType == 16">formVIP季卡</a-tag>
+            <a-tag v-if="form.payType == 17">formIC季卡</a-tag>
+          </template>
+          <template v-else>
+            <span></span>
+          </template>
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="支付状态"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <a-tag v-if="form.payStatus == 1" color="green"
+            ><CheckOutlined class="tag-icon" />已付款</a-tag
+          >
+          <a-tag v-if="form.payStatus == 0" color="error"
+            ><CloseOutlined class="tag-icon" />未付款</a-tag
+          >
+          <a-tag v-if="form.payStatus == 3" color="cyan"
+            ><CoffeeOutlined class="tag-icon" />未付款,占场中</a-tag
+          >
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="付款时间"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.payTime }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="下单时间"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.createTime }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="信息备注"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.comments }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-card>
+    <a-card class="order-card" :bordered="false">
+      <a-spin :spinning="loading">
+        <a-table
+          :data-source="form.orderInfoList"
+          :columns="columns"
+          :pagination="false"
+        />
+      </a-spin>
+    </a-card>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from "ant-design-vue";
+  import { assignObject } from 'ele-admin-pro';
+  import { Order } from '@/api/shop/order/model';
+  import { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
+  import {
+    CheckOutlined,
+    CloseOutlined,
+    CoffeeOutlined
+  } from '@ant-design/icons-vue';
+  import { pageOrderInfo } from '@/api/shop/orderInfo';
+
+  const useForm = Form.useForm;
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Order | null;
+  }>();
+
+  export interface step {
+    title?: String | undefined;
+    subTitle?: String | undefined;
+    description?: String | undefined;
+  }
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  // 是否显示最大化切换按钮
+  const maxAble = ref(true);
+
+  // 步骤条
+  const steps = ref<step[]>([
+    {
+      title: '报餐',
+      description: undefined
+    },
+    {
+      title: '付款',
+      description: undefined
+    },
+    {
+      title: '发餐',
+      description: undefined
+    },
+    {
+      title: '取餐',
+      description: undefined
+    },
+    {
+      title: '完成',
+      description: undefined
+    }
+  ]);
+  const active = ref(2);
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 订单信息
+  const form = reactive<Order>({
+    orderId: undefined,
+    orderNo: undefined,
+    transactionId: undefined,
+    refundOrder: undefined,
+    merchantId: undefined,
+    couponId: undefined,
+    cardId: undefined,
+    adminId: undefined,
+    confirmId: undefined,
+    icCard: undefined,
+    realName: undefined,
+    phone: undefined,
+    totalPrice: undefined,
+    reducePrice: undefined,
+    payPrice: undefined,
+    price: undefined,
+    money: undefined,
+    refundMoney: undefined,
+    coachPrice: undefined,
+    coachId: undefined,
+    payType: undefined,
+    payStatus: undefined,
+    orderStatus: undefined,
+    couponType: undefined,
+    couponDesc: undefined,
+    qrcode: undefined,
+    returnNum: undefined,
+    returnMoney: undefined,
+    startTime: undefined,
+    isInvoice: undefined,
+    payTime: undefined,
+    refundTime: undefined,
+    refundApplyTime: undefined,
+    checkBill: undefined,
+    isSettled: undefined,
+    version: undefined,
+    userId: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    updateTime: undefined,
+    createTime: undefined,
+    status: 0,
+    comments: '',
+    sortNumber: 100,
+    orderInfoList: []
+  });
+
+  // 请求状态
+  const loading = ref(true);
+
+  const { resetFields } = useForm(form);
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '场馆名称',
+      dataIndex: 'merchantName',
+      key: 'merchantName'
+    },
+    {
+      title: '场地',
+      dataIndex: 'fieldName'
+    },
+    {
+      title: '预定信息',
+      dataIndex: 'comments',
+      key: 'comments'
+    },
+    {
+      title: '金额',
+      dataIndex: 'price',
+      customRender: ({ text }) => '￥' + text
+    }
+  ]);
+
+  /* 制作步骤条 */
+  const loadSteps = (order) => {
+    steps.value = [];
+    steps.value.push({
+      title: '下单'
+    });
+    steps.value.push({
+      title: '付款'
+    });
+    steps.value.push({
+      title: '发货'
+    });
+    steps.value.push({
+      title: '收货'
+    });
+    steps.value.push({
+      title: '完成'
+    });
+
+    // 下单
+    if (order.payStatus == 10) {
+      active.value = 0;
+      steps.value[0].description = order.createTime;
+    }
+    // 付款
+    if (order.payStatus == 20) {
+      active.value = 1;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+    }
+    // 发货
+    if (order.payStatus == 20 && order.deliveryStatus == 20) {
+      active.value = 2;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+      steps.value[2].description = order.deliveryTime;
+    }
+    // 收货
+    if (order.payStatus == 20 && order.receiptStatus == 20) {
+      active.value = 3;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+      steps.value[2].description = order.deliveryTime;
+      steps.value[3].description = order.receiptTime;
+    }
+    // 完成
+    if (order.payStatus == 20 && order.orderStatus == 30) {
+      active.value = 4;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+      steps.value[2].description = order.deliveryTime;
+      steps.value[3].description = order.receiptTime;
+    }
+    // 已取消
+    if (order.orderStatus == 20) {
+      active.value = 4;
+    }
+  };
+
+  // const getOrderInfo = () => {
+  //   const orderId = props.data?.orderId;
+  //   listOrderInfo({ orderId }).then((data) => {
+  //     orderInfo.value = data.filter((d) => d.totalNum > 0);
+  //   });
+  // };
+
+  /* 保存编辑 */
+  const save = () => {};
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          loading.value = true;
+          assignObject(form, props.data);
+          pageOrderInfo({ orderId: form.orderId }).then((res) => {
+            form.orderInfoList = res?.list;
+            loading.value = false;
+          });
+          loadSteps(props.data);
+        }
+      } else {
+        resetFields();
+      }
+    }
+  );
+</script>
+<style lang="less" scoped>
+  .order-card {
+    margin-bottom: 20px;
+  }
+  .ant-form-item {
+    margin-bottom: 5px;
+  }
+  .order-info {
+    display: flex;
+    .info {
+      padding-left: 5px;
+      display: flex;
+      flex-direction: column;
+    }
+  }
+  .tag-icon {
+    padding-right: 6px;
+  }
+</style>

modules/views/bak/export/components/search.vue

@@ -0,0 +1,198 @@
+<!-- 搜索表单 -->
+<template>
+  <div class="search">
+    <a-space class="flex items-center" :size="10" style="flex-wrap: wrap">
+      <span class="text-gray-400">付款状态</span>
+      <a-radio-group v-model:value="where.payStatus" @change="search">
+        <a-radio-button :value="0">未付款</a-radio-button>
+        <a-radio-button :value="1">已付款</a-radio-button>
+      </a-radio-group>
+      <span class="text-gray-400">付款方式</span>
+      <a-radio-group v-model:value="where.payType" @change="search">
+        <a-radio-button :value="4">现金</a-radio-button>
+        <a-radio-button :value="0">余额支付</a-radio-button>
+        <a-radio-button :value="1">微信支付</a-radio-button>
+        <a-radio-button :value="2">会员卡</a-radio-button>
+      </a-radio-group>
+      <span class="text-gray-400">订单状态</span>
+      <a-radio-group v-model:value="where.orderStatus" @change="search">
+        <a-radio-button :value="0">未使用</a-radio-button>
+        <a-radio-button :value="1">已完成</a-radio-button>
+        <a-radio-button :value="2">已取消</a-radio-button>
+        <a-radio-button :value="4">退款中</a-radio-button>
+        <a-radio-button :value="5">退款被拒</a-radio-button>
+        <a-radio-button :value="6">退款成功</a-radio-button>
+      </a-radio-group>
+      <span class="text-gray-400">开票状态</span>
+      <a-radio-group v-model:value="where.isInvoice" @change="search">
+        <a-radio-button :value="0">未开票</a-radio-button>
+        <a-radio-button :value="1">已开票</a-radio-button>
+        <a-radio-button :value="2">不能开票</a-radio-button>
+      </a-radio-group>
+    </a-space>
+    <a-space :size="10" class="mt-5" style="flex-wrap: wrap">
+      <SelectMerchant
+        :placeholder="`选择场馆`"
+        class="input-item"
+        v-model:value="where.merchantName"
+        @done="chooseMerchantId"
+      />
+      <a-range-picker
+        v-model:value="dateRange"
+        @change="search"
+        value-format="YYYY-MM-DD"
+        class="ele-fluid"
+      />
+      <a-input-search
+        allow-clear
+        placeholder="请输入订单号|编号|手机号"
+        v-model:value="where.keywords"
+        @pressEnter="search"
+        @search="search"
+        style="width: 380px"
+      />
+      <a-button @click="reset">重置</a-button>
+      <a-button class="ele-btn-icon" :disabled="loading" @click="handleExport">
+        <template #icon>
+          <download-outlined />
+        </template>
+        <span>导出订单</span>
+      </a-button>
+    </a-space>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import useSearch from '@/utils/use-search';
+  import { ref, watch } from 'vue';
+  import { OrderGoodsParam } from '@/api/order/goods/model';
+  import { utils, writeFile } from 'xlsx';
+  import { message } from 'ant-design-vue';
+  import { Merchant } from '@/api/shop/merchant/model';
+  import { listOrder } from '@/api/booking/order';
+  import { Order, OrderParam } from '@/api/shop/order/model';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: OrderGoodsParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'advanced'): void;
+  }>();
+
+  // 表单数据
+  const { where, resetFields } = useSearch<OrderParam>({
+    type: 1,
+    createTimeStart: undefined,
+    createTimeEnd: undefined,
+    categoryId: undefined,
+    week: undefined,
+    keywords: undefined
+  });
+  // 请求状态
+  const loading = ref(false);
+  // 日期范围选择
+  const dateRange = ref<[string, string]>(['', '']);
+  const orders = ref<Order[] | any[]>();
+  const xlsFileName = ref<string>();
+
+  /* 搜索 */
+  const search = () => {
+    const [d1, d2] = dateRange.value ?? [];
+    xlsFileName.value = `${d1}至${d2}`;
+    where.createTimeStart = d1 ? d1 + ' 00:00:00' : undefined;
+    where.createTimeEnd = d2 ? d2 + ' 00:00:00' : undefined;
+    emit('search', {
+      ...where
+    });
+  };
+
+  const chooseMerchantId = (data: Merchant) => {
+    where.merchantId = data.merchantId;
+    where.merchantName = data.merchantName;
+    search();
+  };
+
+  /*  重置 */
+  const reset = () => {
+    resetFields();
+    search();
+  };
+
+  // 导出
+  const handleExport = async () => {
+    loading.value = true;
+    const array: (string | number)[][] = [
+      [
+        '订单号',
+        '订单编号',
+        '姓名',
+        '电话号码',
+        '订单信息',
+        '消费金额',
+        '实付金额',
+        '下单日期'
+      ]
+    ];
+    await listOrder(where)
+      .then((list) => {
+        orders.value = list;
+        orders.value?.forEach((d: Order) => {
+          array.push([
+            `${d.orderId}`,
+            `${d.orderNo}`,
+            `${d.realName}`,
+            `${d.phone}`,
+            `${d.comments}`,
+            `${d.totalPrice}`,
+            `${d.payPrice}`,
+            `${d.createTime}`
+          ]);
+        });
+        const sheetName = `订单数据导出`;
+        const workbook = {
+          SheetNames: [sheetName],
+          Sheets: {}
+        };
+        const sheet = utils.aoa_to_sheet(array);
+        workbook.Sheets[sheetName] = sheet;
+        // 设置列宽
+        sheet['!cols'] = [
+          { wch: 10 },
+          { wch: 10 },
+          { wch: 10 },
+          { wch: 10 },
+          { wch: 20 },
+          { wch: 40 },
+          { wch: 10 }
+        ];
+        message.loading('正在导出...');
+        setTimeout(() => {
+          writeFile(
+            workbook,
+            `${
+              where.createTimeEnd ? xlsFileName.value + '_' : ''
+            }${sheetName}.xlsx`
+          );
+          loading.value = false;
+        }, 2000);
+      })
+      .catch((msg) => {
+        message.error(msg);
+        loading.value = false;
+      })
+      .finally(() => {});
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/export/index.bak.vue

@@ -0,0 +1,288 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card title="财务报表" :bordered="false">
+        <!-- 表格 -->
+        <ele-pro-table
+          ref="tableRef"
+          row-key="userId"
+          :columns="columns"
+          :datasource="datasource"
+          :parse-data="parseData"
+          v-model:selection="selection"
+          tool-class="ele-toolbar-form"
+          :scroll="{ x: 1200 }"
+          class="sys-org-table"
+          :striped="true"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              :export-data="exportData"
+              @done="handleExport"
+            />
+          </template>
+          <template #bodyCell="{ column, record, index }">
+            <template v-if="column.key === 'lunchPost'">
+              <div v-if="index === 0">
+                <div>{{ record.lunchPost }}</div>
+                <div>{{ record.gear10 }}/{{ record.gear20 }}</div>
+              </div>
+            </template>
+            <template v-if="column.key === 'lunchSign'">
+              <div v-if="index === 0">
+                <div>{{ record.lunchSign }}</div>
+                <div>{{ record.signGear10 }}/{{ record.signGear20 }}</div>
+              </div>
+            </template>
+            <template v-if="column.key === 'createTime'">
+              {{ record.createTime }}
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import Search from './components/search.vue';
+  import { listOrderExport } from '@/api/booking/orderExport';
+  import type {
+    OrderExport,
+    OrderExportParam
+  } from '@/api/booking/orderExport/model';
+  import ExcelJS from 'exceljs';
+  import { EleProTable, toDateString } from 'ele-admin-pro';
+  import {
+    ColumnItem,
+    DatasourceFunction
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+
+  defineProps<{
+    activeKey?: boolean;
+    data?: any;
+  }>();
+
+  // 表格选中数据
+  const selection = ref<OrderExport[]>([]);
+  const exportData = ref<OrderExport[]>([]);
+  const exportTitle = ref<string>(`贵港资源报餐人员统计`);
+
+  /* 导出数据 */
+  const parseData = (data: OrderExport[]) => {
+    exportData.value = data;
+    return data;
+  };
+
+  // 导出
+  const handleExport = async () => {
+    // 创建工作簿
+    const workbook = new ExcelJS.Workbook();
+    // 添加工作表
+    const sheet = workbook.addWorksheet(exportTitle.value, {
+      headerFooter: { firstHeader: 'Hello Exceljs' }
+    });
+    const style: ExcelJS.Style = {
+      alignment: { horizontal: 'center' }
+    };
+    sheet.columns = [
+      { header: '部门', key: 'organizationName', style, width: 30 },
+      { header: '编号', key: 'userId', style, width: 20 },
+      { header: '姓名', key: 'nickname', style, width: 20 },
+      { header: '早餐报餐次数', key: 'breakfastPost', style, width: 20 },
+      { header: '早餐签到次数', key: 'breakfastSign', style, width: 20 },
+      {
+        header: '午餐报餐次数(食堂/领物)',
+        key: 'lunchPostText',
+        style,
+        width: 20
+      },
+      {
+        header: '午餐签到次数(食堂/领物)',
+        key: 'lunchSignText',
+        style,
+        width: 20
+      },
+      { header: '晚餐报餐次数', key: 'dinnerPost', style, width: 20 },
+      { header: '晚餐签到次数', key: 'dinnerSign', style, width: 20 },
+      { header: '消费金额', key: 'expendMoney', style, width: 20 }
+    ];
+    sheet.addRows(exportData.value);
+    sheet.insertRow(1, [exportTitle.value]);
+    const a1 = sheet.getCell(1, 1);
+
+    a1.style = {
+      alignment: { horizontal: 'center' },
+      font: {
+        bold: true,
+        size: 26
+      }
+    };
+    sheet.mergeCells('A1:J1');
+    // sheet.getRow(2).fill = {
+    //   type: 'pattern',
+    //   pattern: 'darkTrellis',
+    //   fgColor: { argb: '92d050' },
+    //   bgColor: { argb: '92d050' }
+    // };
+    // 写入 buffer
+    const buffer = await workbook.xlsx.writeBuffer();
+    let blob = new Blob([buffer]);
+    var aEle = document.createElement('a'); // 创建a标签
+    aEle.download = exportTitle.value + '.xlsx'; // 设置下载文件的文件名
+    aEle.href = URL.createObjectURL(blob);
+    aEle.click(); // 设置点击事件
+  };
+
+  // const reload = (where) => {
+  //   title.value.deliveryTimeStart = where.deliveryTimeStart;
+  //   title.value.deliveryTimeEnd = where.deliveryTimeEnd;
+  //
+  //   listOrderExport(where).then((data) => {
+  //     exportData.value = data;
+  //   });
+  // };
+  // reload({});
+
+  /* 搜索 */
+  const reload = (where?: OrderExportParam) => {
+    exportTitle.value = `贵港资源${toDateString(
+      where?.deliveryTimeStart,
+      'yyyy-MM-dd'
+    )} 至 ${toDateString(where?.deliveryTimeEnd, 'yyyy-MM-dd')}报餐人员统计`;
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    // 搜索条件
+    if (filters.payStatus) {
+      where.payStatus = filters.payStatus;
+    }
+    if (filters.deliveryStatus) {
+      where.deliveryStatus = filters.deliveryStatus;
+    }
+    // 默认查询今天
+    // where.deliveryTime = toDateString(new Date(), 'YYYY-MM-dd 00:00:00');
+    return listOrderExport({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      key: 'index',
+      width: 48,
+      align: 'center',
+      fixed: 'left',
+      hideInSetting: true,
+      hideInTable: true,
+      customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
+    },
+    {
+      title: '场馆名称',
+      dataIndex: 'organizationName',
+      key: 'organizationName'
+    },
+    {
+      title: '下单时间',
+      dataIndex: 'createTime',
+      key: 'createTime'
+    },
+    {
+      title: '单位',
+      dataIndex: 'realName',
+      key: 'realName'
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone'
+    },
+    {
+      title: '实际转账单位/个人',
+      dataIndex: 'phone',
+      key: 'phone'
+    },
+    {
+      title: '价格',
+      dataIndex: 'price',
+      align: 'center'
+    },
+    {
+      title: '积分',
+      dataIndex: 'price',
+      align: 'center'
+    },
+    {
+      title: '支付方式',
+      dataIndex: 'breakfastSign',
+      align: 'center'
+    },
+    {
+      title: '会员/散客',
+      dataIndex: 'lunchPost',
+      key: 'lunchPost',
+      align: 'center'
+    },
+    {
+      title: '预付卡号',
+      dataIndex: 'expendMoney',
+      align: 'center'
+    },
+    {
+      title: '预付卡到期时间',
+      dataIndex: 'expendMoney',
+      align: 'center'
+    },
+    {
+      title: '备注',
+      dataIndex: 'expendMoney',
+      align: 'center'
+    }
+  ]);
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'OrderExportIndex'
+  };
+</script>
+
+<style lang="less" scoped>
+  p {
+    line-height: 0.8;
+  }
+  .sys-org-table :deep(.ant-table-body) {
+    overflow: auto !important;
+    overflow: overlay !important;
+  }
+
+  .sys-org-table :deep(.ant-table-pagination.ant-pagination) {
+    padding: 0 4px;
+    margin-bottom: 0;
+  }
+  .price-edit {
+    padding-right: 5px;
+  }
+  .comments {
+    max-width: 200px;
+  }
+</style>

modules/views/bak/export/index.vue

@@ -0,0 +1,419 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="orderId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          :scroll="{ x: 800 }"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'payType'">
+              <template v-if="record.payStatus == 1">
+                <a-tag v-if="record.payType == 0">余额支付</a-tag>
+                <a-tag v-if="record.payType == 1"
+                  ><WechatOutlined class="tag-icon" />微信支付</a-tag
+                >
+                <a-tag v-if="record.payType == 2">积分</a-tag>
+                <a-tag v-if="record.payType == 3"
+                  ><AlipayCircleOutlined class="tag-icon" />支付宝</a-tag
+                >
+                <a-tag v-if="record.payType == 4"
+                  ><IdcardOutlined class="tag-icon" />现金</a-tag
+                >
+                <a-tag v-if="record.payType == 5"
+                  ><IdcardOutlined class="tag-icon" />POS机</a-tag
+                >
+                <a-tag v-if="record.payType == 6"
+                  ><IdcardOutlined class="tag-icon" />VIP月卡</a-tag
+                >
+                <a-tag v-if="record.payType == 7"
+                  ><IdcardOutlined class="tag-icon" />VIP年卡</a-tag
+                >
+                <a-tag v-if="record.payType == 8"
+                  ><IdcardOutlined class="tag-icon" />VIP次卡</a-tag
+                >
+                <a-tag v-if="record.payType == 9"
+                  ><IdcardOutlined class="tag-icon" />IC月卡</a-tag
+                >
+                <a-tag v-if="record.payType == 10"
+                  ><IdcardOutlined class="tag-icon" />IC年卡</a-tag
+                >
+                <a-tag v-if="record.payType == 11"
+                  ><IdcardOutlined class="tag-icon" />IC次卡</a-tag
+                >
+                <a-tag v-if="record.payType == 12"
+                  ><IdcardOutlined class="tag-icon" />免费</a-tag
+                >
+                <a-tag v-if="record.payType == 13"
+                  ><IdcardOutlined class="tag-icon" />VIP充值卡</a-tag
+                >
+                <a-tag v-if="record.payType == 14"
+                  ><IdcardOutlined class="tag-icon" />IC充值卡</a-tag
+                >
+                <a-tag v-if="record.payType == 15"
+                  ><IdcardOutlined class="tag-icon" />积分支付</a-tag
+                >
+                <a-tag v-if="record.payType == 16"
+                  ><IdcardOutlined class="tag-icon" />VIP季卡</a-tag
+                >
+                <a-tag v-if="record.payType == 17"
+                  ><IdcardOutlined class="tag-icon" />IC季卡</a-tag
+                >
+              </template>
+              <template v-else>
+                <span></span>
+              </template>
+            </template>
+            <template v-if="column.key === 'couponType'">
+              <a-tag v-if="record.couponType == 0">无</a-tag>
+              <a-tag v-if="record.couponType == 1" color="blue"
+                ><IdcardOutlined class="tag-icon" />抵扣优惠券</a-tag
+              >
+              <a-tag v-if="record.couponType == 2" color="blue"
+                ><IdcardOutlined class="tag-icon" />折扣优惠券</a-tag
+              >
+              <a-tag v-if="record.couponType == 3" color="blue"
+                ><IdcardOutlined class="tag-icon" />VIP月卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 4" color="blue"
+                ><IdcardOutlined class="tag-icon" />VIP年卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 5" color="blue"
+                ><IdcardOutlined class="tag-icon" />VIP次卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 6" color="blue"
+                ><IdcardOutlined class="tag-icon" />VIP会员卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 7" color="blue"
+                ><IdcardOutlined class="tag-icon" />IC月卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 8" color="blue"
+                ><IdcardOutlined class="tag-icon" />IC年卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 9" color="blue"
+                ><IdcardOutlined class="tag-icon" />IC次卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 10" color="blue"
+                ><IdcardOutlined class="tag-icon" />IC会员卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 11" color="blue"
+                ><IdcardOutlined class="tag-icon" />免费订单</a-tag
+              >
+              <a-tag v-if="record.couponType == 12" color="blue"
+                ><IdcardOutlined class="tag-icon" />VIP充值卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 13" color="blue"
+                ><IdcardOutlined class="tag-icon" />IC充值卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 14" color="blue"
+                ><IdcardOutlined class="tag-icon" />VIP季卡</a-tag
+              >
+              <a-tag v-if="record.couponType == 15" color="blue"
+                ><IdcardOutlined class="tag-icon" />IC季卡</a-tag
+              >
+            </template>
+            <template v-if="column.key === 'payStatus'">
+              <a-tag v-if="record.payStatus == 1" color="green"
+                ><CheckOutlined class="tag-icon" />已付款</a-tag
+              >
+              <a-tag v-if="record.payStatus == 0" color="error"
+                ><CloseOutlined class="tag-icon" />未付款</a-tag
+              >
+              <a-tag v-if="record.payStatus == 3" color="cyan"
+                ><CoffeeOutlined class="tag-icon" />未付款,占场中</a-tag
+              >
+            </template>
+            <template v-if="column.key === 'orderInfo'">
+              {{ record.orderInfoList }}
+            </template>
+            <template v-if="column.key === 'orderStatus'">
+              <span v-if="record.orderStatus == 0" class="ele-text-primary"
+                >未使用</span
+              >
+              <span v-if="record.orderStatus == 2" class="ele-text-placeholder"
+                >已取消</span
+              >
+              <span v-if="record.orderStatus == 1" class="ele-text-success"
+                >已完成</span
+              >
+              <span v-if="record.orderStatus == 3" class="ele-text-placeholder"
+                >已取消</span
+              >
+              <span v-if="record.orderStatus == 4" class="ele-text-warning"
+                >退款申请中</span
+              >
+              <span v-if="record.orderStatus == 5" class="ele-text-danger"
+                >退款被拒绝</span
+              >
+              <span v-if="record.orderStatus == 6" class="ele-text-heading"
+                >退款成功</span
+              >
+              <span v-if="record.orderStatus == 7" class="ele-text-warning"
+                >客户端申请退款</span
+              >
+            </template>
+            <template v-if="column.key === 'isInvoice'">
+              <a-tag v-if="record.isInvoice == 0">未开</a-tag>
+              <a-tag v-if="record.isInvoice == 1" color="green">已开</a-tag>
+              <a-tag v-if="record.isInvoice == 2">不能开</a-tag>
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">详情</a>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+      <!-- 编辑弹窗 -->
+      <OrderInfo v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import {
+    ExclamationCircleOutlined,
+    CheckOutlined,
+    CloseOutlined,
+    AlipayCircleOutlined
+  } from '@ant-design/icons-vue';
+  import { EleProTable, toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import OrderInfo from './components/orderInfo.vue';
+  import {
+    pageOrder,
+    removeOrder,
+    removeBatchOrder
+  } from '@/api/booking/order';
+  import type { Order, OrderParam } from '@/api/booking/order/model';
+  import { formatNumber } from 'ele-admin-pro/es';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Order[]>([]);
+  // 当前编辑数据
+  const current = ref<Order | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    // 预定订单
+    where.type = 1;
+    // where.sceneType = 'showOrderInfo';
+    // where.merchantId = getMerchantId();
+    return pageOrder({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '场馆名称',
+      dataIndex: 'merchantName',
+      key: 'merchantName',
+      align: 'center'
+    },
+    {
+      title: '下单时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center'
+    },
+    {
+      title: '单位',
+      dataIndex: 'realName',
+      key: 'realName',
+      align: 'center'
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center'
+    },
+    {
+      title: '实际转账单位/个人',
+      dataIndex: 'realName',
+      key: 'realName',
+      align: 'center'
+    },
+    {
+      title: '价格',
+      dataIndex: 'totalPrice',
+      align: 'center'
+    },
+    {
+      title: '积分',
+      dataIndex: 'money',
+      align: 'center'
+    },
+    {
+      title: '支付方式',
+      dataIndex: 'payType',
+      key: 'payType',
+      align: 'center'
+    },
+    {
+      title: '会员/散客',
+      dataIndex: 'gradeName',
+      key: 'gradeName',
+      align: 'center'
+    },
+    {
+      title: '预付卡号',
+      dataIndex: 'icCard',
+      align: 'center'
+    },
+    {
+      title: '预付卡到期时间',
+      dataIndex: 'expirationTime',
+      align: 'center'
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      align: 'center'
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: OrderParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Order) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Order) => {
+    const hide = message.loading('请求中..', 0);
+    removeOrder(row.orderId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchOrder(selection.value.map((d) => d.orderId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Order) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  import * as MenuIcons from '@/layout/menu-icons';
+  export default {
+    name: 'Order',
+    components: MenuIcons
+  };
+</script>
+<style lang="less" scoped>
+  .tag-icon {
+    padding-right: 6px;
+  }
+</style>

modules/views/bak/goods/components/goodsEdit.vue

@@ -0,0 +1,361 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑广告' : '添加广告'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="广告位类型" name="adType">
+        <a-select
+          ref="select"
+          v-model:value="form.adType"
+          style="width: 120px"
+        >
+          <a-select-option value="图片广告">图片广告</a-select-option>
+          <a-select-option value="幻灯片">幻灯片</a-select-option>
+          <a-select-option value="视频广告">视频广告</a-select-option>
+        </a-select>
+      </a-form-item>
+      <template v-if="form.adType == '幻灯片'">
+        <a-form-item label="广告图片" name="images" extra="请上传广告图片,最多可上传9张图">
+          <SelectFile
+            :placeholder="`请选择图片`"
+            :limit="9"
+            :data="images"
+            @done="chooseFile"
+            @del="onDeleteItem"
+          />
+<!--          <ele-image-upload-->
+<!--            v-model:value="images"-->
+<!--            :limit="9"-->
+<!--            :drag="true"-->
+<!--            :accept="'image/png,image/jpeg'"-->
+<!--            :item-style="{ maxWidth: '160px', maxHeight: '160px' }"-->
+<!--            :upload-handler="uploadHandler"-->
+<!--            @upload="onUpload"-->
+<!--          />-->
+        </a-form-item>
+      </template>
+      <template v-if="form.adType == '图片广告'">
+        <a-form-item label="广告图片" name="images" extra="请上传广告图片">
+          <SelectFile
+            :placeholder="`请选择图片`"
+            :limit="1"
+            :data="images"
+            @done="chooseFile"
+            @del="onDeleteItem"
+          />
+<!--          <ele-image-upload-->
+<!--            v-model:value="images"-->
+<!--            :limit="1"-->
+<!--            :accept="'image/png,image/jpeg'"-->
+<!--            :drag="true"-->
+<!--            :item-style="{ maxWidth: '160px', maxHeight: '160px' }"-->
+<!--            :upload-handler="uploadHandler"-->
+<!--            @upload="onUpload"-->
+<!--          />-->
+        </a-form-item>
+      </template>
+      <template v-if="form.adType == '视频广告'">
+        <a-form-item label="上传视频" name="images" extra="请上传视频文件，仅支持mp4格式，大小200M以内">
+          <SelectFile
+            :placeholder="`请选择视频文件`"
+            :limit="1"
+            :data="images"
+            @done="chooseFile"
+            @del="onDeleteItem"
+          />
+<!--          <ele-image-upload-->
+<!--            v-model:value="images"-->
+<!--            :limit="1"-->
+<!--            :accept="'video/mp4'"-->
+<!--            :drag="true"-->
+<!--            :item-style="{ maxWidth: '160px', maxHeight: '160px' }"-->
+<!--            :upload-handler="uploadHandler"-->
+<!--            @upload="onUpload"-->
+<!--          />-->
+        </a-form-item>
+      </template>
+      <a-form-item label="广告位名称" name="name">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="请输入广告位名称"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="广告位描述" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入广告位描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="路由/链接地址" name="path">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="请输入路由/链接地址"
+          v-model:value="form.path"
+        />
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">开启</a-radio>
+          <a-radio :value="1">关闭</a-radio>
+        </a-radio-group>
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import {assignObject, isChinese} from 'ele-admin-pro';
+  import { addAd, updateAd } from '@/api/cms/ad';
+  import { Ad } from '@/api/cms/ad/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import {FormInstance, RuleObject} from 'ant-design-vue/es/form';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { uploadFile } from '@/api/system/file';
+  import {FileRecord} from "@/api/system/file/model";
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Ad | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 已上传数据
+  const images = ref<ItemType[]>([]);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+
+  // 用户信息
+  const form = reactive<Ad>({
+    adId: undefined,
+    name: '',
+    adType: '图片广告',
+    images: '',
+    width: '',
+    height: '',
+    path: '',
+    type: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    name: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写广告位名称',
+        trigger: 'blur'
+      }
+    ],
+    adType: [
+      {
+        required: true,
+        type: 'string',
+        message: '请选择广告类型',
+        trigger: 'blur'
+      }
+    ],
+    images: [
+      {
+        required: true,
+        type: 'string',
+        message: '请上传图片或视频',
+        trigger: 'blur',
+        validator: async (_rule: RuleObject, value: string) => {
+          if (images.value.length == 0) {
+            return Promise.reject('请上传图片或视频');
+          }
+          return Promise.resolve();
+        }
+      }
+    ]
+  });
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 上传事件 */
+  const uploadHandler = (file: File) => {
+    const item: ItemType = {
+      file,
+      uid: (file as any).uid,
+      name: file.name
+    };
+    if (file.type.startsWith('video')) {
+      if (file.size / 1024 / 1024 > 200) {
+        message.error('大小不能超过 200MB');
+        return;
+      }
+    }
+    if (file.type.startsWith('image')) {
+      if (file.size / 1024 / 1024 > 5) {
+        message.error('大小不能超过 5MB');
+        return;
+      }
+    }
+
+    onUpload(item);
+  };
+
+  // 上传文件
+  const onUpload = (item: any) => {
+    const { file } = item;
+    uploadFile(file)
+      .then((data) => {
+        images.value.push({
+          uid: data.id,
+          url: file.type == 'video/mp4' ? 'https://oss.wsdns.cn/20240301/6e4e32cb808245d4be336b9486961145.png' : data.path,
+          status: 'done'
+        });
+      })
+      .catch((e) => {
+        message.error(e.message);
+      });
+  };
+
+  const chooseFile = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.images = data.path;
+  }
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index,1)
+    form.images = '';
+  }
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form,
+          images: JSON.stringify(images.value)
+        };
+        const saveOrUpdate = isUpdate.value ? updateAd : addAd;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          assignObject(form, props.data);
+          images.value = [];
+          if (props.data.images) {
+            const arr = JSON.parse(props.data.images);
+            arr.map((d) => {
+              images.value.push({
+                uid: d.uid,
+                url: d.url,
+                status: 'done'
+              });
+            });
+          }
+          isUpdate.value = true;
+        } else {
+          images.value = [];
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
+<style lang="less">
+  .tab-pane {
+    min-height: 300px;
+  }
+  .ml-10 {
+    margin-left: 5px;
+  }
+  .upload-text {
+    margin-right: 70px;
+  }
+  .icon-bg {
+    width: 50px;
+    height: 50px;
+    display: block;
+    border-radius: 50px;
+    background: url('data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20version%3D%221.1%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%221%22%20x1%3D%220%22%20x2%3D%221%22%20y1%3D%220%22%20y2%3D%220%22%20gradientTransform%3D%22matrix(6.123233995736766e-17%2C%201%2C%20-0.024693877551020406%2C%206.123233995736766e-17%2C%200.5%2C%200)%22%3E%3Cstop%20stop-color%3D%22%230a060d%22%20stop-opacity%3D%221%22%20offset%3D%220%22%3E%3C%2Fstop%3E%3Cstop%20stop-color%3D%22%23660061%22%20stop-opacity%3D%221%22%20offset%3D%220.95%22%3E%3C%2Fstop%3E%3C%2FlinearGradient%3E%3C%2Fdefs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20fill%3D%22url(%231)%22%3E%3C%2Frect%3E%3C%2Fsvg%3E');
+  }
+</style>

modules/views/bak/goods/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/goods/index.vue

@@ -0,0 +1,268 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="goodsId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'goodsName'">
+              <a @click="openPreview(`/goods/detail/${record.goodsId}`)">{{
+                record.goodsName
+              }}</a>
+            </template>
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="80" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">已上架</a-tag>
+              <a-tag v-if="record.status === 1">已下架</a-tag>
+              <a-tag v-if="record.status === 2" color="red">待审核</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <GoodsEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref, watch } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import { EleProTable, toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import GoodsEdit from './components/goodsEdit.vue';
+  import { pageGoods, removeGoods, removeBatchGoods } from '@/api/shop/goods';
+  import type { Goods, GoodsParam } from '@/api/shop/goods/model';
+  import { getMerchantId, openPreview, openUrl } from "@/utils/common";
+  import { useRouter } from 'vue-router';
+  const { currentRoute } = useRouter();
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Goods[]>([]);
+  // 当前编辑数据
+  const current = ref<Goods | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    where.merchantId = getMerchantId();
+    return pageGoods({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      width: 90,
+      dataIndex: 'goodsId'
+    },
+    {
+      title: '封面图',
+      dataIndex: 'image',
+      width: 120,
+      align: 'center',
+      key: 'image'
+    },
+    {
+      title: '课程名称',
+      dataIndex: 'goodsName',
+      key: 'goodsName'
+    },
+    {
+      title: '课程售价',
+      dataIndex: 'price',
+      width: 120,
+      align: 'center',
+      sorter: true,
+      key: 'price'
+    },
+    {
+      title: '销量',
+      dataIndex: 'sales',
+      width: 120,
+      align: 'center',
+      sorter: true,
+      key: 'sales'
+    },
+    {
+      title: '库存',
+      dataIndex: 'stock',
+      width: 120,
+      align: 'center',
+      sorter: true,
+      key: 'stock'
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      width: 120,
+      align: 'center',
+      key: 'status'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      width: 120,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 120,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: GoodsParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Goods) => {
+    current.value = row ?? null;
+    openUrl(`/goods/add`);
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Goods) => {
+    const hide = message.loading('请求中..', 0);
+    removeGoods(row.goodsId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchGoods(selection.value.map((d) => d.goodsId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Goods) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openUrl(`/booking/goods/add?goodsId=${record.goodsId}`);
+      }
+    };
+  };
+
+  watch(
+    currentRoute,
+    () => {
+      reload();
+    },
+    { immediate: true }
+  );
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Goods'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/integral/components/integralEdit.vue

@@ -0,0 +1,210 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑签到积分' : '添加签到积分'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="用户id" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户id"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="微信昵称" name="username">
+        <a-input
+          allow-clear
+          placeholder="请输入微信昵称"
+          v-model:value="form.username"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          placeholder="请输入手机号码"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="获得积分" name="integral">
+        <a-input
+          allow-clear
+          placeholder="请输入获得积分"
+          v-model:value="form.integral"
+        />
+      </a-form-item>
+      <a-form-item label="日期" name="dateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入日期"
+          v-model:value="form.dateTime"
+        />
+      </a-form-item>
+      <a-form-item label="天" name="day">
+        <a-input
+          allow-clear
+          placeholder="请输入天"
+          v-model:value="form.day"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addIntegral, updateIntegral } from '@/api/booking/integral';
+  import { Integral } from '@/api/booking/integral/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Integral | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Integral>({
+    id: undefined,
+    userId: undefined,
+    username: undefined,
+    phone: undefined,
+    integral: undefined,
+    dateTime: undefined,
+    day: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    integralId: undefined,
+    integralName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    integralName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写签到积分名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateIntegral : addIntegral;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/integral/components/search.vue

@@ -0,0 +1,63 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-input-search
+      allow-clear
+      placeholder="请输入关键词"
+      v-model:value="where.keywords"
+      @pressEnter="search"
+      @search="search"
+    />
+    <a-button @click="reset">重置</a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { watch } from 'vue';
+  import useSearch from '@/utils/use-search';
+  import { UserParam } from '@/api/system/user/model';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: UserParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  // 表单数据
+  const { where, resetFields } = useSearch<UserParam>({
+    userId: undefined,
+    username: undefined,
+    phone: undefined,
+    realName: undefined,
+    keywords: undefined
+  });
+
+  const search = () => {
+    emit('search', where);
+  };
+
+  /*  重置 */
+  const reset = () => {
+    resetFields();
+    search();
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/integral/index.vue

@@ -0,0 +1,250 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="integralId"
+          :columns="columns"
+          :datasource="datasource"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'id'">
+              {{ record.id }}
+            </template>
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <IntegralEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import IntegralEdit from './components/integralEdit.vue';
+  import {
+    pageIntegral,
+    removeIntegral,
+    removeBatchIntegral
+  } from '@/api/booking/integral';
+  import type { Integral, IntegralParam } from '@/api/booking/integral/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Integral[]>([]);
+  // 当前编辑数据
+  const current = ref<Integral | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageIntegral({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      key: 'id',
+      width: 90
+    },
+    {
+      title: '微信昵称',
+      dataIndex: 'username',
+      key: 'username',
+      align: 'center'
+    },
+    {
+      title: '手机号码',
+      dataIndex: 'mobile',
+      key: 'mobile',
+      align: 'center'
+    },
+    {
+      title: '获得积分',
+      dataIndex: 'integral',
+      key: 'integral',
+      align: 'center'
+    },
+    {
+      title: '日期',
+      dataIndex: 'dateTime',
+      key: 'dateTime',
+      align: 'center'
+    },
+    {
+      title: '天',
+      dataIndex: 'day',
+      key: 'day',
+      align: 'center'
+    },
+    {
+      title: '签到时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    }
+    // {
+    //   title: '操作',
+    //   key: 'action',
+    //   width: 180,
+    //   fixed: 'right',
+    //   align: 'center',
+    //   hideInSetting: true
+    // }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: IntegralParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Integral) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Integral) => {
+    const hide = message.loading('请求中..', 0);
+    removeIntegral(row.integralId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchIntegral(selection.value.map((d) => d.integralId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Integral) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Integral'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/integralLog/components/integralLogEdit.vue

@@ -0,0 +1,234 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑积分明细' : '添加积分明细'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="场馆订单号" name="orderNum">
+        <a-input
+          allow-clear
+          placeholder="请输入场馆订单号"
+          v-model:value="form.orderNum"
+        />
+      </a-form-item>
+      <a-form-item label="订单id" name="oid">
+        <a-input
+          allow-clear
+          placeholder="请输入订单id"
+          v-model:value="form.oid"
+        />
+      </a-form-item>
+      <a-form-item label="场馆名称" name="siteName">
+        <a-input
+          allow-clear
+          placeholder="请输入场馆名称"
+          v-model:value="form.siteName"
+        />
+      </a-form-item>
+      <a-form-item label="微信昵称" name="username">
+        <a-input
+          allow-clear
+          placeholder="请输入微信昵称"
+          v-model:value="form.username"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          placeholder="请输入手机号码"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="获得积分" name="integral">
+        <a-input
+          allow-clear
+          placeholder="请输入获得积分"
+          v-model:value="form.integral"
+        />
+      </a-form-item>
+      <a-form-item label="变化前积分" name="oldMoney">
+        <a-input
+          allow-clear
+          placeholder="请输入变化前积分"
+          v-model:value="form.oldMoney"
+        />
+      </a-form-item>
+      <a-form-item label="变化后积分" name="newMoney">
+        <a-input
+          allow-clear
+          placeholder="请输入变化后积分"
+          v-model:value="form.newMoney"
+        />
+      </a-form-item>
+      <a-form-item label="描述" name="info">
+        <a-input
+          allow-clear
+          placeholder="请输入描述"
+          v-model:value="form.info"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addIntegralLog, updateIntegralLog } from '@/api/booking/integralLog';
+  import { IntegralLog } from '@/api/booking/integralLog/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: IntegralLog | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<IntegralLog>({
+    id: undefined,
+    orderNum: undefined,
+    oid: undefined,
+    siteName: undefined,
+    username: undefined,
+    phone: undefined,
+    integral: undefined,
+    oldMoney: undefined,
+    newMoney: undefined,
+    info: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    integralLogId: undefined,
+    integralLogName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    integralLogName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写积分明细名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateIntegralLog : addIntegralLog;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/integralLog/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/integralLog/index.vue

@@ -0,0 +1,269 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="integralLogId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <IntegralLogEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import IntegralLogEdit from './components/integralLogEdit.vue';
+  import { pageIntegralLog, removeIntegralLog, removeBatchIntegralLog } from '@/api/booking/integralLog';
+  import type { IntegralLog, IntegralLogParam } from '@/api/booking/integralLog/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<IntegralLog[]>([]);
+  // 当前编辑数据
+  const current = ref<IntegralLog | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageIntegralLog({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '场馆订单号',
+      dataIndex: 'orderNum',
+      key: 'orderNum',
+      align: 'center',
+    },
+    {
+      title: '订单id',
+      dataIndex: 'oid',
+      key: 'oid',
+      align: 'center',
+    },
+    {
+      title: '场馆名称',
+      dataIndex: 'siteName',
+      key: 'siteName',
+      align: 'center',
+    },
+    {
+      title: '微信昵称',
+      dataIndex: 'username',
+      key: 'username',
+      align: 'center',
+    },
+    {
+      title: '手机号码',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '获得积分',
+      dataIndex: 'integral',
+      key: 'integral',
+      align: 'center',
+    },
+    {
+      title: '变化前积分',
+      dataIndex: 'oldMoney',
+      key: 'oldMoney',
+      align: 'center',
+    },
+    {
+      title: '变化后积分',
+      dataIndex: 'newMoney',
+      key: 'newMoney',
+      align: 'center',
+    },
+    {
+      title: '描述',
+      dataIndex: 'info',
+      key: 'info',
+      align: 'center',
+    },
+    {
+      title: '记录时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: IntegralLogParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: IntegralLog) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: IntegralLog) => {
+    const hide = message.loading('请求中..', 0);
+    removeIntegralLog(row.integralLogId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchIntegralLog(selection.value.map((d) => d.integralLogId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: IntegralLog) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'IntegralLog'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/item/components/itemEdit.vue

@@ -0,0 +1,199 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑项目类型' : '添加项目类型'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="项目类型" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入项目类型"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="项目备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="项目图标" name="image">
+        <SelectFile
+          :placeholder="`请选择图标`"
+          :limit="1"
+          :data="images"
+          @done="chooseImage"
+          @del="onDeleteItem"
+        />
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addItem, updateItem } from '@/api/booking/item';
+  import { Item } from '@/api/booking/item/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Item | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Item>({
+    id: undefined,
+    name: '',
+    image: '',
+    comments: '',
+    status: 0,
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    name: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.thumbnail;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateItem : addItem;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/item/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/item/index.vue

@@ -0,0 +1,240 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="itemId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'name'">
+              <a-avatar :src="record.image" :width="50" />
+              {{ record.name }}
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <ItemEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import ItemEdit from './components/itemEdit.vue';
+  import { pageItem, removeItem, removeBatchItem } from '@/api/booking/item';
+  import type { Item, ItemParam } from '@/api/booking/item/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Item[]>([]);
+  // 当前编辑数据
+  const current = ref<Item | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageItem({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '项目类型',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    // {
+    //   title: '备注',
+    //   dataIndex: 'comments',
+    //   key: 'comments',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '状态',
+    //   dataIndex: 'status',
+    //   key: 'status',
+    //   align: 'center',
+    // },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+      width: 180,
+    },
+    // {
+    //   title: '创建时间',
+    //   dataIndex: 'createTime',
+    //   key: 'createTime',
+    //   align: 'center',
+    //   sorter: true,
+    //   ellipsis: true,
+    //   customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    // },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: ItemParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Item) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Item) => {
+    const hide = message.loading('请求中..', 0);
+    removeItem(row.id)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchItem(selection.value.map((d) => d.id))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Item) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Item'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/order/components/orderEdit.vue

@@ -0,0 +1,509 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑' : '添加'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="订单类型，0商城订单 1预定订单 2会员卡" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入订单类型，0商城订单 1预定订单 2会员卡"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="订单号" name="orderNo">
+        <a-input
+          allow-clear
+          placeholder="请输入订单号"
+          v-model:value="form.orderNo"
+        />
+      </a-form-item>
+      <a-form-item label="下单渠道，0小程序预定 1俱乐部训练场 3活动订场" name="channel">
+        <a-input
+          allow-clear
+          placeholder="请输入下单渠道，0小程序预定 1俱乐部训练场 3活动订场"
+          v-model:value="form.channel"
+        />
+      </a-form-item>
+      <a-form-item label="微信支付订单号" name="transactionId">
+        <a-input
+          allow-clear
+          placeholder="请输入微信支付订单号"
+          v-model:value="form.transactionId"
+        />
+      </a-form-item>
+      <a-form-item label="微信退款订单号" name="refundOrder">
+        <a-input
+          allow-clear
+          placeholder="请输入微信退款订单号"
+          v-model:value="form.refundOrder"
+        />
+      </a-form-item>
+      <a-form-item label="场馆id用于权限判断" name="merchantId">
+        <a-input
+          allow-clear
+          placeholder="请输入场馆id用于权限判断"
+          v-model:value="form.merchantId"
+        />
+      </a-form-item>
+      <a-form-item label="商户名称" name="merchantName">
+        <a-input
+          allow-clear
+          placeholder="请输入商户名称"
+          v-model:value="form.merchantName"
+        />
+      </a-form-item>
+      <a-form-item label="商户编号" name="merchantCode">
+        <a-input
+          allow-clear
+          placeholder="请输入商户编号"
+          v-model:value="form.merchantCode"
+        />
+      </a-form-item>
+      <a-form-item label="用户id" name="uid">
+        <a-input
+          allow-clear
+          placeholder="请输入用户id"
+          v-model:value="form.uid"
+        />
+      </a-form-item>
+      <a-form-item label="使用的优惠券id" name="cid">
+        <a-input
+          allow-clear
+          placeholder="请输入使用的优惠券id"
+          v-model:value="form.cid"
+        />
+      </a-form-item>
+      <a-form-item label="使用的会员卡id" name="vid">
+        <a-input
+          allow-clear
+          placeholder="请输入使用的会员卡id"
+          v-model:value="form.vid"
+        />
+      </a-form-item>
+      <a-form-item label="关联管理员id" name="aid">
+        <a-input
+          allow-clear
+          placeholder="请输入关联管理员id"
+          v-model:value="form.aid"
+        />
+      </a-form-item>
+      <a-form-item label="核销管理员id" name="adminId">
+        <a-input
+          allow-clear
+          placeholder="请输入核销管理员id"
+          v-model:value="form.adminId"
+        />
+      </a-form-item>
+      <a-form-item label="IC卡号" name="code">
+        <a-input
+          allow-clear
+          placeholder="请输入IC卡号"
+          v-model:value="form.code"
+        />
+      </a-form-item>
+      <a-form-item label="真实姓名" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入真实姓名"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          placeholder="请输入手机号码"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="订单总额" name="totalPrice">
+        <a-input
+          allow-clear
+          placeholder="请输入订单总额"
+          v-model:value="form.totalPrice"
+        />
+      </a-form-item>
+      <a-form-item label="减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格" name="reducePrice">
+        <a-input
+          allow-clear
+          placeholder="请输入减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格"
+          v-model:value="form.reducePrice"
+        />
+      </a-form-item>
+      <a-form-item label="实际付款" name="payPrice">
+        <a-input
+          allow-clear
+          placeholder="请输入实际付款"
+          v-model:value="form.payPrice"
+        />
+      </a-form-item>
+      <a-form-item label="用于统计" name="price">
+        <a-input
+          allow-clear
+          placeholder="请输入用于统计"
+          v-model:value="form.price"
+        />
+      </a-form-item>
+      <a-form-item label="价钱，用于积分赠送" name="money">
+        <a-input
+          allow-clear
+          placeholder="请输入价钱，用于积分赠送"
+          v-model:value="form.money"
+        />
+      </a-form-item>
+      <a-form-item label="退款金额" name="refundMoney">
+        <a-input
+          allow-clear
+          placeholder="请输入退款金额"
+          v-model:value="form.refundMoney"
+        />
+      </a-form-item>
+      <a-form-item label="教练价格" name="coachPrice">
+        <a-input
+          allow-clear
+          placeholder="请输入教练价格"
+          v-model:value="form.coachPrice"
+        />
+      </a-form-item>
+      <a-form-item label="教练id" name="coachId">
+        <a-input
+          allow-clear
+          placeholder="请输入教练id"
+          v-model:value="form.coachId"
+        />
+      </a-form-item>
+      <a-form-item label="1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡" name="payType">
+        <a-input
+          allow-clear
+          placeholder="请输入1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡"
+          v-model:value="form.payType"
+        />
+      </a-form-item>
+      <a-form-item label="1已付款，2未付款" name="payStatus">
+        <a-input
+          allow-clear
+          placeholder="请输入1已付款，2未付款"
+          v-model:value="form.payStatus"
+        />
+      </a-form-item>
+      <a-form-item label="1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款" name="orderStatus">
+        <a-input
+          allow-clear
+          placeholder="请输入1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款"
+          v-model:value="form.orderStatus"
+        />
+      </a-form-item>
+      <a-form-item label="优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡" name="couponType">
+        <a-input
+          allow-clear
+          placeholder="请输入优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡"
+          v-model:value="form.couponType"
+        />
+      </a-form-item>
+      <a-form-item label="二维码地址，保存订单号，支付成功后才生成" name="qrcode">
+        <a-input
+          allow-clear
+          placeholder="请输入二维码地址，保存订单号，支付成功后才生成"
+          v-model:value="form.qrcode"
+        />
+      </a-form-item>
+      <a-form-item label="优惠说明" name="couponDesc">
+        <a-input
+          allow-clear
+          placeholder="请输入优惠说明"
+          v-model:value="form.couponDesc"
+        />
+      </a-form-item>
+      <a-form-item label="vip月卡年卡、ic月卡年卡回退次数" name="returnNum">
+        <a-input
+          allow-clear
+          placeholder="请输入vip月卡年卡、ic月卡年卡回退次数"
+          v-model:value="form.returnNum"
+        />
+      </a-form-item>
+      <a-form-item label="vip充值回退金额" name="returnMoney">
+        <a-input
+          allow-clear
+          placeholder="请输入vip充值回退金额"
+          v-model:value="form.returnMoney"
+        />
+      </a-form-item>
+      <a-form-item label="预约详情开始时间数组" name="startTime">
+        <a-input
+          allow-clear
+          placeholder="请输入预约详情开始时间数组"
+          v-model:value="form.startTime"
+        />
+      </a-form-item>
+      <a-form-item label="是否已开具发票：1已开发票，2未开发票，3不能开具发票" name="isInvoice">
+        <a-input
+          allow-clear
+          placeholder="请输入是否已开具发票：1已开发票，2未开发票，3不能开具发票"
+          v-model:value="form.isInvoice"
+        />
+      </a-form-item>
+      <a-form-item label="" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.updateTime"
+        />
+      </a-form-item>
+      <a-form-item label="付款时间" name="payTime">
+        <a-input
+          allow-clear
+          placeholder="请输入付款时间"
+          v-model:value="form.payTime"
+        />
+      </a-form-item>
+      <a-form-item label="退款时间" name="refundTime">
+        <a-input
+          allow-clear
+          placeholder="请输入退款时间"
+          v-model:value="form.refundTime"
+        />
+      </a-form-item>
+      <a-form-item label="申请退款时间" name="refundApplyTime">
+        <a-input
+          allow-clear
+          placeholder="请输入申请退款时间"
+          v-model:value="form.refundApplyTime"
+        />
+      </a-form-item>
+      <a-form-item label="过期时间" name="expirationTime">
+        <a-input
+          allow-clear
+          placeholder="请输入过期时间"
+          v-model:value="form.expirationTime"
+        />
+      </a-form-item>
+      <a-form-item label="对账情况：1=已对账；2=未对账；3=已对账，金额对不上；4=未查询到该订单" name="checkBill">
+        <a-input
+          allow-clear
+          placeholder="请输入对账情况：1=已对账；2=未对账；3=已对账，金额对不上；4=未查询到该订单"
+          v-model:value="form.checkBill"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="是否删除, 0否, 1是" name="deleted">
+        <a-input
+          allow-clear
+          placeholder="请输入是否删除, 0否, 1是"
+          v-model:value="form.deleted"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addOrder, updateOrder } from '@/api/booking/order';
+  import { Order } from '@/api/booking/order/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Order | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Order>({
+    orderId: undefined,
+    type: undefined,
+    orderNo: undefined,
+    channel: undefined,
+    transactionId: undefined,
+    refundOrder: undefined,
+    merchantId: undefined,
+    merchantName: undefined,
+    merchantCode: undefined,
+    uid: undefined,
+    cid: undefined,
+    vid: undefined,
+    aid: undefined,
+    adminId: undefined,
+    code: undefined,
+    name: undefined,
+    phone: undefined,
+    totalPrice: undefined,
+    reducePrice: undefined,
+    payPrice: undefined,
+    price: undefined,
+    money: undefined,
+    refundMoney: undefined,
+    coachPrice: undefined,
+    coachId: undefined,
+    payType: undefined,
+    payStatus: undefined,
+    orderStatus: undefined,
+    couponType: undefined,
+    qrcode: undefined,
+    couponDesc: undefined,
+    returnNum: undefined,
+    returnMoney: undefined,
+    startTime: undefined,
+    isInvoice: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    payTime: undefined,
+    refundTime: undefined,
+    refundApplyTime: undefined,
+    expirationTime: undefined,
+    checkBill: undefined,
+    comments: undefined,
+    sortNumber: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    orderId: undefined,
+    orderName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    orderName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateOrder : addOrder;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/order/components/orderInfo.vue

@@ -0,0 +1,401 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="`80%`"
+    :visible="visible"
+    :confirm-loading="loading"
+    :maxable="maxAble"
+    :title="isUpdate ? '编辑订单' : '订单详情'"
+    :body-style="{ paddingBottom: '8px', background: '#f3f3f3' }"
+    @update:visible="updateVisible"
+    :maskClosable="false"
+    :footer="null"
+    @ok="save"
+  >
+    <a-card class="order-card" :bordered="false">
+      <a-descriptions title="基本信息" :column="3">
+        <a-descriptions-item
+          label="订单号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.orderId }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单编号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.orderNo }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单状态"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <a-tag v-if="form.orderStatus == 0">未使用</a-tag>
+          <a-tag v-if="form.orderStatus == 1">已付款</a-tag>
+          <a-tag v-if="form.orderStatus == 3">已取消</a-tag>
+          <a-tag v-if="form.orderStatus == 4">退款申请中</a-tag>
+          <a-tag v-if="form.orderStatus == 5">退款被拒绝</a-tag>
+          <a-tag v-if="form.orderStatus == 6">退款成功</a-tag>
+          <a-tag v-if="form.orderStatus == 7">客户端申请退款</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="买家信息"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.realName }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="手机号码"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.phone }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="交易流水号"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.transactionId }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="订单总金额"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          ￥{{ form.totalPrice }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="实付金额"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          ￥{{ form.payPrice }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="减少金额"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          ￥{{ form.reducePrice }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="支付方式"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <template v-if="form.payStatus == 1">
+            <a-tag v-if="form.payType == 0">余额支付</a-tag>
+            <a-tag v-if="form.payType == 1">微信支付</a-tag>
+            <a-tag v-if="form.payType == 2">积分</a-tag>
+            <a-tag v-if="form.payType == 3">支付宝</a-tag>
+            <a-tag v-if="form.payType == 4">现金</a-tag>
+            <a-tag v-if="form.payType == 5">POS机</a-tag>
+            <a-tag v-if="form.payType == 6">VIP月卡</a-tag>
+            <a-tag v-if="form.payType == 7">formVIP年卡</a-tag>
+            <a-tag v-if="form.payType == 8">formVIP次卡</a-tag>
+            <a-tag v-if="form.payType == 9">formIC月卡</a-tag>
+            <a-tag v-if="form.payType == 10">formIC年卡</a-tag>
+            <a-tag v-if="form.payType == 11">formIC次卡</a-tag>
+            <a-tag v-if="form.payType == 12">form免费</a-tag>
+            <a-tag v-if="form.payType == 13">formVIP充值卡</a-tag>
+            <a-tag v-if="form.payType == 14">formIC充值卡</a-tag>
+            <a-tag v-if="form.payType == 15">form积分支付</a-tag>
+            <a-tag v-if="form.payType == 16">formVIP季卡</a-tag>
+            <a-tag v-if="form.payType == 17">formIC季卡</a-tag>
+          </template>
+          <template v-else>
+            <span></span>
+          </template>
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="支付状态"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          <a-tag v-if="form.payStatus == 1" color="green"
+            ><CheckOutlined class="tag-icon" />已付款</a-tag
+          >
+          <a-tag v-if="form.payStatus == 0" color="error"
+            ><CloseOutlined class="tag-icon" />未付款</a-tag
+          >
+          <a-tag v-if="form.payStatus == 3" color="cyan"
+            ><CoffeeOutlined class="tag-icon" />未付款,占场中</a-tag
+          >
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="付款时间"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.payTime }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="下单时间"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.createTime }}
+        </a-descriptions-item>
+        <a-descriptions-item
+          label="信息备注"
+          :labelStyle="{ width: '90px', color: '#808080' }"
+        >
+          {{ form.comments }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-card>
+    <a-card class="order-card" :bordered="false">
+      <a-spin :spinning="loading">
+        <a-table
+          :data-source="form.orderInfoList"
+          :columns="columns"
+          :pagination="false"
+        />
+      </a-spin>
+    </a-card>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from "ant-design-vue";
+  import { assignObject } from 'ele-admin-pro';
+  import { Order } from '@/api/shop/order/model';
+  import { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
+  import {
+    CheckOutlined,
+    CloseOutlined,
+    CoffeeOutlined
+  } from '@ant-design/icons-vue';
+  import { pageOrderInfo } from '@/api/shop/orderInfo';
+
+  const useForm = Form.useForm;
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Order | null;
+  }>();
+
+  export interface step {
+    title?: String | undefined;
+    subTitle?: String | undefined;
+    description?: String | undefined;
+  }
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  // 是否显示最大化切换按钮
+  const maxAble = ref(true);
+
+  // 步骤条
+  const steps = ref<step[]>([
+    {
+      title: '报餐',
+      description: undefined
+    },
+    {
+      title: '付款',
+      description: undefined
+    },
+    {
+      title: '发餐',
+      description: undefined
+    },
+    {
+      title: '取餐',
+      description: undefined
+    },
+    {
+      title: '完成',
+      description: undefined
+    }
+  ]);
+  const active = ref(2);
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 订单信息
+  const form = reactive<Order>({
+    orderId: undefined,
+    orderNo: undefined,
+    transactionId: undefined,
+    refundOrder: undefined,
+    merchantId: undefined,
+    couponId: undefined,
+    cardId: undefined,
+    adminId: undefined,
+    confirmId: undefined,
+    icCard: undefined,
+    realName: undefined,
+    phone: undefined,
+    totalPrice: undefined,
+    reducePrice: undefined,
+    payPrice: undefined,
+    price: undefined,
+    money: undefined,
+    refundMoney: undefined,
+    coachPrice: undefined,
+    coachId: undefined,
+    payType: undefined,
+    payStatus: undefined,
+    orderStatus: undefined,
+    couponType: undefined,
+    couponDesc: undefined,
+    qrcode: undefined,
+    returnNum: undefined,
+    returnMoney: undefined,
+    startTime: undefined,
+    isInvoice: undefined,
+    payTime: undefined,
+    refundTime: undefined,
+    refundApplyTime: undefined,
+    checkBill: undefined,
+    isSettled: undefined,
+    version: undefined,
+    userId: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    updateTime: undefined,
+    createTime: undefined,
+    status: 0,
+    comments: '',
+    sortNumber: 100,
+    orderInfoList: []
+  });
+
+  // 请求状态
+  const loading = ref(true);
+
+  const { resetFields } = useForm(form);
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '场馆名称',
+      dataIndex: 'merchantName',
+      key: 'merchantName'
+    },
+    {
+      title: '场地',
+      dataIndex: 'fieldName'
+    },
+    {
+      title: '预定信息',
+      dataIndex: 'comments',
+      key: 'comments'
+    },
+    {
+      title: '金额',
+      dataIndex: 'price',
+      customRender: ({ text }) => '￥' + text
+    }
+  ]);
+
+  /* 制作步骤条 */
+  const loadSteps = (order) => {
+    steps.value = [];
+    steps.value.push({
+      title: '下单'
+    });
+    steps.value.push({
+      title: '付款'
+    });
+    steps.value.push({
+      title: '发货'
+    });
+    steps.value.push({
+      title: '收货'
+    });
+    steps.value.push({
+      title: '完成'
+    });
+
+    // 下单
+    if (order.payStatus == 10) {
+      active.value = 0;
+      steps.value[0].description = order.createTime;
+    }
+    // 付款
+    if (order.payStatus == 20) {
+      active.value = 1;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+    }
+    // 发货
+    if (order.payStatus == 20 && order.deliveryStatus == 20) {
+      active.value = 2;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+      steps.value[2].description = order.deliveryTime;
+    }
+    // 收货
+    if (order.payStatus == 20 && order.receiptStatus == 20) {
+      active.value = 3;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+      steps.value[2].description = order.deliveryTime;
+      steps.value[3].description = order.receiptTime;
+    }
+    // 完成
+    if (order.payStatus == 20 && order.orderStatus == 30) {
+      active.value = 4;
+      steps.value[0].description = order.createTime;
+      steps.value[1].description = order.payTime;
+      steps.value[2].description = order.deliveryTime;
+      steps.value[3].description = order.receiptTime;
+    }
+    // 已取消
+    if (order.orderStatus == 20) {
+      active.value = 4;
+    }
+  };
+
+  // const getOrderInfo = () => {
+  //   const orderId = props.data?.orderId;
+  //   listOrderInfo({ orderId }).then((data) => {
+  //     orderInfo.value = data.filter((d) => d.totalNum > 0);
+  //   });
+  // };
+
+  /* 保存编辑 */
+  const save = () => {};
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          loading.value = true;
+          assignObject(form, props.data);
+          pageOrderInfo({ orderId: form.orderId }).then((res) => {
+            form.orderInfoList = res?.list;
+            loading.value = false;
+          });
+          loadSteps(props.data);
+        }
+      } else {
+        resetFields();
+      }
+    }
+  );
+</script>
+<style lang="less" scoped>
+  .order-card {
+    margin-bottom: 20px;
+  }
+  .ant-form-item {
+    margin-bottom: 5px;
+  }
+  .order-info {
+    display: flex;
+    .info {
+      padding-left: 5px;
+      display: flex;
+      flex-direction: column;
+    }
+  }
+  .tag-icon {
+    padding-right: 6px;
+  }
+</style>

modules/views/bak/order/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加2</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/order/index.vue

@@ -0,0 +1,473 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="orderId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <OrderEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import OrderEdit from './components/orderEdit.vue';
+  import { pageOrder, removeOrder, removeBatchOrder } from '@/api/booking/order';
+  import type { Order, OrderParam } from '@/api/booking/order/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Order[]>([]);
+  // 当前编辑数据
+  const current = ref<Order | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageOrder({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '',
+      dataIndex: 'orderId',
+      key: 'orderId',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '订单类型，0商城订单 1预定订单 2会员卡',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+    },
+    {
+      title: '订单号',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+      align: 'center',
+    },
+    {
+      title: '下单渠道，0小程序预定 1俱乐部训练场 3活动订场',
+      dataIndex: 'channel',
+      key: 'channel',
+      align: 'center',
+    },
+    {
+      title: '微信支付订单号',
+      dataIndex: 'transactionId',
+      key: 'transactionId',
+      align: 'center',
+    },
+    {
+      title: '微信退款订单号',
+      dataIndex: 'refundOrder',
+      key: 'refundOrder',
+      align: 'center',
+    },
+    {
+      title: '场馆id用于权限判断',
+      dataIndex: 'merchantId',
+      key: 'merchantId',
+      align: 'center',
+    },
+    {
+      title: '商户名称',
+      dataIndex: 'merchantName',
+      key: 'merchantName',
+      align: 'center',
+    },
+    {
+      title: '商户编号',
+      dataIndex: 'merchantCode',
+      key: 'merchantCode',
+      align: 'center',
+    },
+    {
+      title: '用户id',
+      dataIndex: 'uid',
+      key: 'uid',
+      align: 'center',
+    },
+    {
+      title: '使用的优惠券id',
+      dataIndex: 'cid',
+      key: 'cid',
+      align: 'center',
+    },
+    {
+      title: '使用的会员卡id',
+      dataIndex: 'vid',
+      key: 'vid',
+      align: 'center',
+    },
+    {
+      title: '关联管理员id',
+      dataIndex: 'aid',
+      key: 'aid',
+      align: 'center',
+    },
+    {
+      title: '核销管理员id',
+      dataIndex: 'adminId',
+      key: 'adminId',
+      align: 'center',
+    },
+    {
+      title: 'IC卡号',
+      dataIndex: 'code',
+      key: 'code',
+      align: 'center',
+    },
+    {
+      title: '真实姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '手机号码',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '订单总额',
+      dataIndex: 'totalPrice',
+      key: 'totalPrice',
+      align: 'center',
+    },
+    {
+      title: '减少的金额，使用VIP会员折扣、优惠券抵扣、优惠券折扣后减去的价格',
+      dataIndex: 'reducePrice',
+      key: 'reducePrice',
+      align: 'center',
+    },
+    {
+      title: '实际付款',
+      dataIndex: 'payPrice',
+      key: 'payPrice',
+      align: 'center',
+    },
+    {
+      title: '用于统计',
+      dataIndex: 'price',
+      key: 'price',
+      align: 'center',
+    },
+    {
+      title: '价钱，用于积分赠送',
+      dataIndex: 'money',
+      key: 'money',
+      align: 'center',
+    },
+    {
+      title: '退款金额',
+      dataIndex: 'refundMoney',
+      key: 'refundMoney',
+      align: 'center',
+    },
+    {
+      title: '教练价格',
+      dataIndex: 'coachPrice',
+      key: 'coachPrice',
+      align: 'center',
+    },
+    {
+      title: '教练id',
+      dataIndex: 'coachId',
+      key: 'coachId',
+      align: 'center',
+    },
+    {
+      title: '1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡',
+      dataIndex: 'payType',
+      key: 'payType',
+      align: 'center',
+    },
+    {
+      title: '1已付款，2未付款',
+      dataIndex: 'payStatus',
+      key: 'payStatus',
+      align: 'center',
+    },
+    {
+      title: '1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款',
+      dataIndex: 'orderStatus',
+      key: 'orderStatus',
+      align: 'center',
+    },
+    {
+      title: '优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡',
+      dataIndex: 'couponType',
+      key: 'couponType',
+      align: 'center',
+    },
+    {
+      title: '二维码地址，保存订单号，支付成功后才生成',
+      dataIndex: 'qrcode',
+      key: 'qrcode',
+      align: 'center',
+    },
+    {
+      title: '优惠说明',
+      dataIndex: 'couponDesc',
+      key: 'couponDesc',
+      align: 'center',
+    },
+    {
+      title: 'vip月卡年卡、ic月卡年卡回退次数',
+      dataIndex: 'returnNum',
+      key: 'returnNum',
+      align: 'center',
+    },
+    {
+      title: 'vip充值回退金额',
+      dataIndex: 'returnMoney',
+      key: 'returnMoney',
+      align: 'center',
+    },
+    {
+      title: '预约详情开始时间数组',
+      dataIndex: 'startTime',
+      key: 'startTime',
+      align: 'center',
+    },
+    {
+      title: '是否已开具发票：1已开发票，2未开发票，3不能开具发票',
+      dataIndex: 'isInvoice',
+      key: 'isInvoice',
+      align: 'center',
+    },
+    {
+      title: '下单时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+    {
+      title: '付款时间',
+      dataIndex: 'payTime',
+      key: 'payTime',
+      align: 'center',
+    },
+    {
+      title: '退款时间',
+      dataIndex: 'refundTime',
+      key: 'refundTime',
+      align: 'center',
+    },
+    {
+      title: '申请退款时间',
+      dataIndex: 'refundApplyTime',
+      key: 'refundApplyTime',
+      align: 'center',
+    },
+    {
+      title: '过期时间',
+      dataIndex: 'expirationTime',
+      key: 'expirationTime',
+      align: 'center',
+    },
+    {
+      title: '对账情况：1=已对账；2=未对账；3=已对账，金额对不上；4=未查询到该订单',
+      dataIndex: 'checkBill',
+      key: 'checkBill',
+      align: 'center',
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center',
+    },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+    },
+    {
+      title: '是否删除, 0否, 1是',
+      dataIndex: 'deleted',
+      key: 'deleted',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: OrderParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Order) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Order) => {
+    const hide = message.loading('请求中..', 0);
+    removeOrder(row.orderId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchOrder(selection.value.map((d) => d.orderId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Order) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Order'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/orderExport/components/orderExportEdit.vue

@@ -0,0 +1,306 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑统计报表导出' : '添加统计报表导出'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="机构名称" name="organizationName">
+        <a-input
+          allow-clear
+          placeholder="请输入机构名称"
+          v-model:value="form.organizationName"
+        />
+      </a-form-item>
+      <a-form-item label="实际消费的金额(不含退款)" name="expendMoney">
+        <a-input
+          allow-clear
+          placeholder="请输入实际消费的金额(不含退款)"
+          v-model:value="form.expendMoney"
+        />
+      </a-form-item>
+      <a-form-item label="早餐报餐次数" name="breakfastPost">
+        <a-input
+          allow-clear
+          placeholder="请输入早餐报餐次数"
+          v-model:value="form.breakfastPost"
+        />
+      </a-form-item>
+      <a-form-item label="早餐签到次数" name="breakfastSign">
+        <a-input
+          allow-clear
+          placeholder="请输入早餐签到次数"
+          v-model:value="form.breakfastSign"
+        />
+      </a-form-item>
+      <a-form-item label="午餐报餐次数" name="lunchPost">
+        <a-input
+          allow-clear
+          placeholder="请输入午餐报餐次数"
+          v-model:value="form.lunchPost"
+        />
+      </a-form-item>
+      <a-form-item label="午餐签到次数" name="lunchSign">
+        <a-input
+          allow-clear
+          placeholder="请输入午餐签到次数"
+          v-model:value="form.lunchSign"
+        />
+      </a-form-item>
+      <a-form-item label="晚餐报餐次数" name="dinnerPost">
+        <a-input
+          allow-clear
+          placeholder="请输入晚餐报餐次数"
+          v-model:value="form.dinnerPost"
+        />
+      </a-form-item>
+      <a-form-item label="晚餐签到次数" name="dinnerSign">
+        <a-input
+          allow-clear
+          placeholder="请输入晚餐签到次数"
+          v-model:value="form.dinnerSign"
+        />
+      </a-form-item>
+      <a-form-item label="档口 10 食堂档口 20 物品档口 " name="gear">
+        <a-input
+          allow-clear
+          placeholder="请输入档口 10 食堂档口 20 物品档口 "
+          v-model:value="form.gear"
+        />
+      </a-form-item>
+      <a-form-item label="商品价格(单价)" name="goodsPrice">
+        <a-input
+          allow-clear
+          placeholder="请输入商品价格(单价)"
+          v-model:value="form.goodsPrice"
+        />
+      </a-form-item>
+      <a-form-item label="发货时间" name="deliveryTime">
+        <a-input
+          allow-clear
+          placeholder="请输入发货时间"
+          v-model:value="form.deliveryTime"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0待发布, 1已发布" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="订单号" name="orderId">
+        <a-input
+          allow-clear
+          placeholder="请输入订单号"
+          v-model:value="form.orderId"
+        />
+      </a-form-item>
+      <a-form-item label="机构id" name="organizationId">
+        <a-input
+          allow-clear
+          placeholder="请输入机构id"
+          v-model:value="form.organizationId"
+        />
+      </a-form-item>
+      <a-form-item label="发布人" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入发布人"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="是否删除, 0否, 1是" name="deleted">
+        <a-input
+          allow-clear
+          placeholder="请输入是否删除, 0否, 1是"
+          v-model:value="form.deleted"
+        />
+      </a-form-item>
+      <a-form-item label="修改时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入修改时间"
+          v-model:value="form.updateTime"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addOrderExport, updateOrderExport } from '@/api/booking/orderExport';
+  import { OrderExport } from '@/api/booking/orderExport/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: OrderExport | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<OrderExport>({
+    exportId: undefined,
+    organizationName: undefined,
+    expendMoney: undefined,
+    breakfastPost: undefined,
+    breakfastSign: undefined,
+    lunchPost: undefined,
+    lunchSign: undefined,
+    dinnerPost: undefined,
+    dinnerSign: undefined,
+    gear: undefined,
+    goodsPrice: undefined,
+    deliveryTime: undefined,
+    status: undefined,
+    comments: undefined,
+    orderId: undefined,
+    organizationId: undefined,
+    userId: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    orderExportId: undefined,
+    orderExportName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    orderExportName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写统计报表导出名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateOrderExport : addOrderExport;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/orderExport/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/orderExport/index.vue

@@ -0,0 +1,323 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="orderExportId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <OrderExportEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import OrderExportEdit from './components/orderExportEdit.vue';
+  import { pageOrderExport, removeOrderExport, removeBatchOrderExport } from '@/api/booking/orderExport';
+  import type { OrderExport, OrderExportParam } from '@/api/booking/orderExport/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<OrderExport[]>([]);
+  // 当前编辑数据
+  const current = ref<OrderExport | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageOrderExport({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '自增ID',
+      dataIndex: 'exportId',
+      key: 'exportId',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '机构名称',
+      dataIndex: 'organizationName',
+      key: 'organizationName',
+      align: 'center',
+    },
+    {
+      title: '实际消费的金额(不含退款)',
+      dataIndex: 'expendMoney',
+      key: 'expendMoney',
+      align: 'center',
+    },
+    {
+      title: '早餐报餐次数',
+      dataIndex: 'breakfastPost',
+      key: 'breakfastPost',
+      align: 'center',
+    },
+    {
+      title: '早餐签到次数',
+      dataIndex: 'breakfastSign',
+      key: 'breakfastSign',
+      align: 'center',
+    },
+    {
+      title: '午餐报餐次数',
+      dataIndex: 'lunchPost',
+      key: 'lunchPost',
+      align: 'center',
+    },
+    {
+      title: '午餐签到次数',
+      dataIndex: 'lunchSign',
+      key: 'lunchSign',
+      align: 'center',
+    },
+    {
+      title: '晚餐报餐次数',
+      dataIndex: 'dinnerPost',
+      key: 'dinnerPost',
+      align: 'center',
+    },
+    {
+      title: '晚餐签到次数',
+      dataIndex: 'dinnerSign',
+      key: 'dinnerSign',
+      align: 'center',
+    },
+    {
+      title: '档口 10 食堂档口 20 物品档口 ',
+      dataIndex: 'gear',
+      key: 'gear',
+      align: 'center',
+    },
+    {
+      title: '商品价格(单价)',
+      dataIndex: 'goodsPrice',
+      key: 'goodsPrice',
+      align: 'center',
+    },
+    {
+      title: '发货时间',
+      dataIndex: 'deliveryTime',
+      key: 'deliveryTime',
+      align: 'center',
+    },
+    {
+      title: '状态, 0待发布, 1已发布',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center',
+    },
+    {
+      title: '订单号',
+      dataIndex: 'orderId',
+      key: 'orderId',
+      align: 'center',
+    },
+    {
+      title: '机构id',
+      dataIndex: 'organizationId',
+      key: 'organizationId',
+      align: 'center',
+    },
+    {
+      title: '发布人',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+    },
+    {
+      title: '是否删除, 0否, 1是',
+      dataIndex: 'deleted',
+      key: 'deleted',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: OrderExportParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: OrderExport) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: OrderExport) => {
+    const hide = message.loading('请求中..', 0);
+    removeOrderExport(row.orderExportId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchOrderExport(selection.value.map((d) => d.orderExportId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: OrderExport) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'OrderExport'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/orderInfo/components/orderInfoEdit.vue

@@ -0,0 +1,306 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑' : '添加'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="关联订单表id" name="oid">
+        <a-input
+          allow-clear
+          placeholder="请输入关联订单表id"
+          v-model:value="form.oid"
+        />
+      </a-form-item>
+      <a-form-item label="关联场馆id" name="sid">
+        <a-input
+          allow-clear
+          placeholder="请输入关联场馆id"
+          v-model:value="form.sid"
+        />
+      </a-form-item>
+      <a-form-item label="关联场地id" name="fid">
+        <a-input
+          allow-clear
+          placeholder="请输入关联场地id"
+          v-model:value="form.fid"
+        />
+      </a-form-item>
+      <a-form-item label="场馆" name="siteName">
+        <a-input
+          allow-clear
+          placeholder="请输入场馆"
+          v-model:value="form.siteName"
+        />
+      </a-form-item>
+      <a-form-item label="场地" name="fieldName">
+        <a-input
+          allow-clear
+          placeholder="请输入场地"
+          v-model:value="form.fieldName"
+        />
+      </a-form-item>
+      <a-form-item label="预约时间段" name="dateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入预约时间段"
+          v-model:value="form.dateTime"
+        />
+      </a-form-item>
+      <a-form-item label="单价" name="price">
+        <a-input
+          allow-clear
+          placeholder="请输入单价"
+          v-model:value="form.price"
+        />
+      </a-form-item>
+      <a-form-item label="儿童价" name="childrenPrice">
+        <a-input
+          allow-clear
+          placeholder="请输入儿童价"
+          v-model:value="form.childrenPrice"
+        />
+      </a-form-item>
+      <a-form-item label="成人人数" name="adultNum">
+        <a-input
+          allow-clear
+          placeholder="请输入成人人数"
+          v-model:value="form.adultNum"
+        />
+      </a-form-item>
+      <a-form-item label="儿童人数" name="childrenNum">
+        <a-input
+          allow-clear
+          placeholder="请输入儿童人数"
+          v-model:value="form.childrenNum"
+        />
+      </a-form-item>
+      <a-form-item label="1已付款，2未付款，3无需付款或占用状态" name="payStatus">
+        <a-input
+          allow-clear
+          placeholder="请输入1已付款，2未付款，3无需付款或占用状态"
+          v-model:value="form.payStatus"
+        />
+      </a-form-item>
+      <a-form-item label="是否免费：1免费、2收费" name="isFree">
+        <a-input
+          allow-clear
+          placeholder="请输入是否免费：1免费、2收费"
+          v-model:value="form.isFree"
+        />
+      </a-form-item>
+      <a-form-item label="是否支持儿童票：1支持，2不支持" name="isChildren">
+        <a-input
+          allow-clear
+          placeholder="请输入是否支持儿童票：1支持，2不支持"
+          v-model:value="form.isChildren"
+        />
+      </a-form-item>
+      <a-form-item label="预订类型：1全场，2半场" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入预订类型：1全场，2半场"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="组合数据:日期+时间段+场馆id+场地id" name="mergeData">
+        <a-input
+          allow-clear
+          placeholder="请输入组合数据:日期+时间段+场馆id+场地id"
+          v-model:value="form.mergeData"
+        />
+      </a-form-item>
+      <a-form-item label="开场时间" name="startTime">
+        <a-input
+          allow-clear
+          placeholder="请输入开场时间"
+          v-model:value="form.startTime"
+        />
+      </a-form-item>
+      <a-form-item label="下单时间" name="orderTime">
+        <a-input
+          allow-clear
+          placeholder="请输入下单时间"
+          v-model:value="form.orderTime"
+        />
+      </a-form-item>
+      <a-form-item label="毫秒时间戳" name="timeFlag">
+        <a-input
+          allow-clear
+          placeholder="请输入毫秒时间戳"
+          v-model:value="form.timeFlag"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addOrderInfo, updateOrderInfo } from '@/api/booking/orderInfo';
+  import { OrderInfo } from '@/api/booking/orderInfo/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: OrderInfo | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<OrderInfo>({
+    id: undefined,
+    oid: undefined,
+    sid: undefined,
+    fid: undefined,
+    siteName: undefined,
+    fieldName: undefined,
+    dateTime: undefined,
+    price: undefined,
+    childrenPrice: undefined,
+    adultNum: undefined,
+    childrenNum: undefined,
+    payStatus: undefined,
+    isFree: undefined,
+    isChildren: undefined,
+    type: undefined,
+    mergeData: undefined,
+    startTime: undefined,
+    orderTime: undefined,
+    timeFlag: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    orderInfoId: undefined,
+    orderInfoName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    orderInfoName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateOrderInfo : addOrderInfo;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/orderInfo/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/orderInfo/index.vue

@@ -0,0 +1,323 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="orderInfoId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <OrderInfoEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import OrderInfoEdit from './components/orderInfoEdit.vue';
+  import { pageOrderInfo, removeOrderInfo, removeBatchOrderInfo } from '@/api/booking/orderInfo';
+  import type { OrderInfo, OrderInfoParam } from '@/api/booking/orderInfo/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<OrderInfo[]>([]);
+  // 当前编辑数据
+  const current = ref<OrderInfo | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageOrderInfo({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '关联订单表id',
+      dataIndex: 'oid',
+      key: 'oid',
+      align: 'center',
+    },
+    {
+      title: '关联场馆id',
+      dataIndex: 'sid',
+      key: 'sid',
+      align: 'center',
+    },
+    {
+      title: '关联场地id',
+      dataIndex: 'fid',
+      key: 'fid',
+      align: 'center',
+    },
+    {
+      title: '场馆',
+      dataIndex: 'siteName',
+      key: 'siteName',
+      align: 'center',
+    },
+    {
+      title: '场地',
+      dataIndex: 'fieldName',
+      key: 'fieldName',
+      align: 'center',
+    },
+    {
+      title: '预约时间段',
+      dataIndex: 'dateTime',
+      key: 'dateTime',
+      align: 'center',
+    },
+    {
+      title: '单价',
+      dataIndex: 'price',
+      key: 'price',
+      align: 'center',
+    },
+    {
+      title: '儿童价',
+      dataIndex: 'childrenPrice',
+      key: 'childrenPrice',
+      align: 'center',
+    },
+    {
+      title: '成人人数',
+      dataIndex: 'adultNum',
+      key: 'adultNum',
+      align: 'center',
+    },
+    {
+      title: '儿童人数',
+      dataIndex: 'childrenNum',
+      key: 'childrenNum',
+      align: 'center',
+    },
+    {
+      title: '1已付款，2未付款，3无需付款或占用状态',
+      dataIndex: 'payStatus',
+      key: 'payStatus',
+      align: 'center',
+    },
+    {
+      title: '是否免费：1免费、2收费',
+      dataIndex: 'isFree',
+      key: 'isFree',
+      align: 'center',
+    },
+    {
+      title: '是否支持儿童票：1支持，2不支持',
+      dataIndex: 'isChildren',
+      key: 'isChildren',
+      align: 'center',
+    },
+    {
+      title: '预订类型：1全场，2半场',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+    },
+    {
+      title: '组合数据:日期+时间段+场馆id+场地id',
+      dataIndex: 'mergeData',
+      key: 'mergeData',
+      align: 'center',
+    },
+    {
+      title: '开场时间',
+      dataIndex: 'startTime',
+      key: 'startTime',
+      align: 'center',
+    },
+    {
+      title: '下单时间',
+      dataIndex: 'orderTime',
+      key: 'orderTime',
+      align: 'center',
+    },
+    {
+      title: '毫秒时间戳',
+      dataIndex: 'timeFlag',
+      key: 'timeFlag',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: OrderInfoParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: OrderInfo) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: OrderInfo) => {
+    const hide = message.loading('请求中..', 0);
+    removeOrderInfo(row.orderInfoId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchOrderInfo(selection.value.map((d) => d.orderInfoId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: OrderInfo) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'OrderInfo'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/school/components/itemType.vue

@@ -0,0 +1,67 @@
+<!-- 角色选择下拉框 -->
+<template>
+  <a-select
+    mode="multiple"
+    allow-clear
+    :value="ids"
+    :placeholder="placeholder"
+    @update:value="updateValue"
+    @blur="onBlur"
+  >
+    <a-select-option v-for="item in data" :key="item.id" :value="item.id">
+      {{ item.name }}
+    </a-select-option>
+  </a-select>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import { Item } from '@/api/booking/item/model';
+  import { listItem } from '@/api/booking/item';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value: Item[]): void;
+    (e: 'blur'): void;
+  }>();
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的商户
+      value?: Item[];
+      //
+      placeholder?: string;
+    }>(),
+    {
+      placeholder: '请选择场馆'
+    }
+  );
+
+  // 选中的id
+  const ids = computed(() => props.value?.map((d) => d.id as number));
+
+  // 数据列表
+  const data = ref<Item[]>([]);
+
+  /* 更新选中数据 */
+  const updateValue = (value: number[]) => {
+    emit(
+      'update:value',
+      value.map((v) => ({ id: v }))
+    );
+  };
+
+  /* 获取数据 */
+  listItem({})
+    .then((list) => {
+      data.value = list;
+    })
+    .catch((e) => {
+      message.error(e.message);
+    });
+
+  /* 失去焦点 */
+  const onBlur = () => {
+    emit('blur');
+  };
+</script>

modules/views/bak/school/components/merchantEdit.vue

@@ -0,0 +1,613 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="1000"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑场馆' : '添加场馆'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="场馆图标" name="image">
+        <SelectFile
+          :placeholder="`请选择图片`"
+          :limit="1"
+          :data="images"
+          @done="chooseImage"
+          @del="onDeleteItem"
+        />
+      </a-form-item>
+      <a-form-item label="场馆名称" name="merchantName">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="xxx场馆"
+          v-model:value="form.merchantName"
+        />
+      </a-form-item>
+      <a-form-item label="场馆电话" name="phone">
+        <a-input
+          allow-clear
+          :maxlength="11"
+          placeholder="请输入场馆电话"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="负责人姓名" name="realName">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="请输入场馆负责人姓名"
+          v-model:value="form.realName"
+        />
+      </a-form-item>
+      <a-form-item label="场馆类型" name="shopType">
+        <SelectMerchantType
+          :placeholder="`请选择场馆类型`"
+          v-model:value="form.shopType"
+          @done="chooseShopType"
+        />
+      </a-form-item>
+      <a-form-item label="项目类型" name="itemType">
+        <ItemTypeForm v-model:value="select" />
+<!--        <DictSelect-->
+<!--          dict-code="ItemType"-->
+<!--          :placeholder="`请选择项目类型`"-->
+<!--          style="width: 120px"-->
+<!--          v-model:value="form.itemType"-->
+<!--        />-->
+      </a-form-item>
+      <a-form-item label="营业时间" name="businessTime">
+        <!--        <a-time-picker-->
+        <!--          v-model:value="form.timePeriod1"-->
+        <!--          format="HH:mm"-->
+        <!--          valueFormat="HH:mm"-->
+        <!--        />-->
+        <!--        - -->
+        <!--        <a-time-picker-->
+        <!--          v-model:value="form.timePeriod2"-->
+        <!--          format="HH:mm"-->
+        <!--          valueFormat="HH:mm"-->
+        <!--        />-->
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="请选择营业时间"
+          v-model:value="form.businessTime"
+        />
+      </a-form-item>
+      <a-form-item label="所属行业" name="category">
+        <industry-select
+          v-model:value="form.category"
+          valueField="label"
+          placeholder="请选择所属行业"
+          class="ele-fluid"
+          @change="onIndustry"
+        />
+      </a-form-item>
+      <a-form-item label="场馆坐标" name="lngAndLat">
+        <div class="flex-sb">
+          <a-input
+            allow-clear
+            placeholder="请选择所在位置"
+            v-model:value="form.lngAndLat"
+            disabled
+          />
+          <a-button
+            class="ele-btn-icon"
+            style="margin-left: 10px"
+            @click="openMapPicker"
+          >
+            打开地图位置选择器
+          </a-button>
+        </div>
+      </a-form-item>
+      <a-form-item label="场馆地址" name="address">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="请输入场馆地址"
+          v-model:value="form.address"
+        />
+      </a-form-item>
+      <a-form-item label="每小时价格" name="price">
+        <a-input-number
+          :step="1"
+          :max="1000000"
+          :min="0.0"
+          :precision="2"
+          class="ele-fluid"
+          placeholder="请输入每小时价格"
+          v-model:value="form.price"
+        />
+      </a-form-item>
+      <!--      <a-form-item label="手续费(%)" name="commission">-->
+      <!--        <a-input-number-->
+      <!--          :step="1"-->
+      <!--          :max="100"-->
+      <!--          :min="0.0"-->
+      <!--          :precision="2"-->
+      <!--          class="ele-fluid"-->
+      <!--          placeholder="请输入手续费"-->
+      <!--          v-model:value="form.commission"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <a-form-item label="关键字" name="keywords">
+        <a-select
+          v-model:value="form.keywords"
+          mode="tags"
+          placeholder="输入关键词后回车"
+        />
+      </a-form-item>
+      <a-form-item label="场馆图片" name="files">
+        <SelectFile
+          :placeholder="`请选择图片`"
+          :limit="9"
+          :data="files"
+          @done="chooseFiles"
+          @del="onDeleteFiles"
+        />
+      </a-form-item>
+      <a-form-item label="场馆介绍" name="content">
+        <!-- 编辑器 -->
+        <tinymce-editor
+          ref="editorRef"
+          class="content"
+          v-model:value="content"
+          :disabled="disabled"
+          :init="config"
+          placeholder="请输入场馆介绍内容"
+        />
+      </a-form-item>
+      <a-form-item label="是否自营" name="ownStore">
+        <a-switch
+          checked-children="是"
+          un-checked-children="否"
+          :checked="form.ownStore === 1"
+          @update:checked="updateOwnStore"
+        />
+      </a-form-item>
+      <a-form-item label="是否推荐" name="recommend">
+        <a-switch
+          checked-children="是"
+          un-checked-children="否"
+          :checked="form.recommend === 1"
+          @update:checked="updateRecommend"
+        />
+      </a-form-item>
+      <a-form-item label="是否需要审核" name="goodsReview">
+        <a-switch
+          checked-children="是"
+          un-checked-children="否"
+          :checked="form.goodsReview === 1"
+          @update:checked="updateGoodsReview"
+        />
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+  <!-- 地图位置选择弹窗 -->
+  <ele-map-picker
+    :need-city="true"
+    :dark-mode="darkMode"
+    v-model:visible="showMap"
+    :center="[108.374959, 22.767024]"
+    :search-type="1"
+    :zoom="12"
+    @done="onDone"
+  />
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addMerchant, listMerchant, updateMerchant } from "@/api/shop/merchant";
+  import { Merchant } from '@/api/shop/merchant/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+  import { MerchantType } from '@/api/shop/merchantType/model';
+  import ItemTypeForm from './itemType.vue'
+  import { CenterPoint } from 'ele-admin-pro/es/ele-map-picker/types';
+  import { listRoles } from '@/api/system/role';
+  import TinymceEditor from '@/components/TinymceEditor/index.vue';
+  import { uploadOss } from '@/api/system/file';
+  import { Item } from "@/api/booking/item/model";
+  import { listItem } from "@/api/booking/item";
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive, darkMode } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Merchant | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+  const files = ref<ItemType[]>([]);
+  const disabled = ref(false);
+  // 编辑器内容，双向绑定
+  const content = ref<any>('');
+  // 是否显示地图选择弹窗
+  const showMap = ref(false);
+  const select = ref<Item[]>([]);
+
+  // 用户信息
+  const form = reactive<Merchant>({
+    merchantId: undefined,
+    merchantName: undefined,
+    image: undefined,
+    phone: undefined,
+    realName: undefined,
+    shopType: undefined,
+    itemType: undefined,
+    category: undefined,
+    province: '',
+    city: '',
+    region: '',
+    address: '',
+    lngAndLat: '',
+    price: 0,
+    commission: 0,
+    keywords: undefined,
+    files: undefined,
+    businessTime: undefined,
+    content: '',
+    timePeriod1: undefined,
+    timePeriod2: undefined,
+    ownStore: undefined,
+    recommend: undefined,
+    goodsReview: 1,
+    comments: '',
+    adminUrl: '',
+    status: 0,
+    sortNumber: 100,
+    roleId: undefined,
+    roleName: '',
+    tenantId: undefined
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    merchantName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写场馆名称',
+        trigger: 'blur'
+      }
+    ],
+    category: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写场馆分类',
+        trigger: 'blur'
+      }
+    ],
+    lngAndLat: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写场馆坐标',
+        trigger: 'blur'
+      }
+    ],
+    businessTime: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填营业时间',
+        trigger: 'blur'
+      }
+    ],
+    realName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写场馆姓名',
+        trigger: 'blur'
+      }
+    ],
+    shopType: [
+      {
+        required: true,
+        type: 'string',
+        message: '请选择店铺类型',
+        trigger: 'blur'
+      }
+    ],
+    phone: [
+      {
+        required: true,
+        message: '请输入场馆电话',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseShopType = (data: MerchantType) => {
+    form.shopType = data.name;
+  };
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const chooseFiles = (data: FileRecord) => {
+    files.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+  };
+
+  /* 打开位置选择 */
+  const openMapPicker = () => {
+    showMap.value = true;
+  };
+
+  /* 地图选择后回调 */
+  const onDone = (location: CenterPoint) => {
+    // city.value = [
+    //   `${location.city?.province}`,
+    //   `${location.city?.city}`,
+    //   `${location.city?.district}`
+    // ];
+    form.province = `${location.city?.province}`;
+    form.city = `${location.city?.city}`;
+    form.region = `${location.city?.district}`;
+    form.address = `${location.address}`;
+    form.lngAndLat = `${location.lng},${location.lat}`;
+    showMap.value = false;
+  };
+
+  const onDeleteFiles = (index: number) => {
+    files.value.splice(index, 1);
+  };
+
+  const updateOwnStore = (value: boolean) => {
+    form.ownStore = value ? 1 : 0;
+  };
+
+  const updateRecommend = (value: boolean) => {
+    form.recommend = value ? 1 : 0;
+  };
+
+  const updateGoodsReview = (value: boolean) => {
+    form.goodsReview = value ? 1 : 0;
+  };
+
+  const onIndustry = (item: any) => {
+    form.category = item[0] + '/' + item[1];
+  };
+
+  const editorRef = ref<InstanceType<typeof TinymceEditor> | null>(null);
+  const config = ref({
+    height: 450,
+    images_upload_handler: (blobInfo, success, error) => {
+      const file = blobInfo.blob();
+      const formData = new FormData();
+      formData.append('file', file, file.name);
+      uploadOss(file)
+        .then((res) => {
+          success(res.path);
+        })
+        .catch((msg) => {
+          error(msg);
+        });
+    },
+    // 自定义文件上传(这里使用把选择的文件转成 blob 演示)
+    file_picker_callback: (callback: any, _value: any, meta: any) => {
+      const input = document.createElement('input');
+      input.setAttribute('type', 'file');
+      // 设定文件可选类型
+      if (meta.filetype === 'image') {
+        input.setAttribute('accept', 'image/*');
+      } else if (meta.filetype === 'media') {
+        input.setAttribute('accept', 'video/*,.pdf');
+      }
+      input.onchange = () => {
+        const file = input.files?.[0];
+        if (!file) {
+          return;
+        }
+        if (meta.filetype === 'media') {
+          if (file.size / 1024 / 1024 > 200) {
+            editorRef.value?.alert({ content: '大小不能超过 200MB' });
+            return;
+          }
+          if (file.type.startsWith('application/pdf')) {
+            uploadOss(file).then((res) => {
+              const addPath = `<a href="${res.downloadUrl}" target="_blank">${res.name}</a>`;
+              content.value = content.value + addPath;
+            });
+            return;
+          }
+          if (!file.type.startsWith('video/')) {
+            editorRef.value?.alert({ content: '只能选择视频文件' });
+            return;
+          }
+          uploadOss(file).then((res) => {
+            callback(res.path);
+          });
+        }
+        // const reader = new FileReader();
+        // reader.onload = (e) => {
+        //   if (e.target?.result != null) {
+        //     const blob = new Blob([e.target.result], { type: file.type });
+        //     callback(URL.createObjectURL(blob));
+        //   }
+        // };
+        // reader.readAsArrayBuffer(file);
+      };
+      input.click();
+    }
+  });
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form,
+          content: content.value,
+          keywords: JSON.stringify(form.keywords),
+          files: JSON.stringify(files.value),
+          itemType: select.value?.map((d) => d.id).join(',')
+        };
+        const saveOrUpdate = isUpdate.value ? updateMerchant : addMerchant;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        files.value = [];
+        select.value = [];
+        content.value = '';
+        if (props.data) {
+          isUpdate.value = true;
+          assignObject(form, props.data);
+          if (form.content) {
+            content.value = form.content;
+          }
+          if (props.data.image) {
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            });
+          }
+          if (props.data.files) {
+            const arr = JSON.parse(props.data.files);
+            arr.map((item) => {
+              files.value.push({
+                uid: uuid(),
+                url: item.url,
+                status: 'done'
+              });
+            });
+          }
+          if (props.data.keywords) {
+            form.keywords = JSON.parse(props.data.keywords);
+          }
+          if (props.data.itemType) {
+            listItem({ ids: props.data.itemType }).then((list) => {
+              select.value = list;
+            });
+          }
+        } else {
+          isUpdate.value = false;
+        }
+        // 获取场馆管理员的roleId
+        listRoles({ roleCode: 'merchant' }).then((res) => {
+          form.roleId = res[0].roleId;
+          form.roleName = res[0].roleName;
+          form.tenantId = Number(localStorage.getItem('TenantId'));
+        });
+      } else {
+        content.value = '';
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
+
+<style lang="less" scoped>
+  .flex-sb {
+    display: flex;
+    justify-content: space-between;
+  }
+</style>

modules/views/bak/school/components/search.vue

@@ -0,0 +1,47 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button
+      v-role="'superAdmin'"
+      type="primary"
+      class="ele-btn-icon"
+      @click="add"
+    >
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加场馆</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/school/index.vue

@@ -0,0 +1,268 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="merchantId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <!--                <a @click="openNew(record.adminUrl)">场馆管理端</a>-->
+                <!--                <a-divider type="vertical" />-->
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <MerchantEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref, watch } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import MerchantEdit from './components/merchantEdit.vue';
+  import {
+    pageMerchant,
+    removeMerchant,
+    removeBatchMerchant
+  } from '@/api/shop/merchant';
+  import type { Merchant, MerchantParam } from '@/api/shop/merchant/model';
+  import { getMerchantId, openNew } from '@/utils/common';
+  import { useRouter } from 'vue-router';
+  const { currentRoute } = useRouter();
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Merchant[]>([]);
+  // 当前编辑数据
+  const current = ref<Merchant | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    where.merchantId = getMerchantId();
+    return pageMerchant({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'merchantId',
+      key: 'merchantId',
+      width: 90
+    },
+    {
+      title: '场馆图片',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center'
+    },
+    {
+      title: '场馆名称',
+      dataIndex: 'merchantName',
+      key: 'merchantName',
+      align: 'center'
+    },
+    {
+      title: '负责人',
+      dataIndex: 'realName',
+      key: 'realName',
+      align: 'center'
+    },
+    {
+      title: '场馆电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center'
+    },
+    {
+      title: '地点',
+      dataIndex: 'shopType',
+      key: 'shopType',
+      align: 'center'
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center'
+    },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: MerchantParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Merchant) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Merchant) => {
+    const hide = message.loading('请求中..', 0);
+    removeMerchant(row.merchantId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchMerchant(selection.value.map((d) => d.merchantId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Merchant) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+
+  watch(
+    currentRoute,
+    () => {
+      reload();
+    },
+    { immediate: true }
+  );
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Merchant'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/schoolType/components/merchantTypeEdit.vue

@@ -0,0 +1,197 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑场馆类型' : '添加场馆类型'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="场馆类型" name="name">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="请输入场馆类型"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="描述" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addMerchantType, updateMerchantType } from '@/api/shop/merchantType';
+  import { MerchantType } from '@/api/shop/merchantType/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: MerchantType | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<MerchantType>({
+    id: undefined,
+    name: undefined,
+    comments: undefined,
+    status: undefined,
+    sortNumber: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    merchantTypeId: undefined,
+    merchantTypeName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    merchantTypeName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写商户类型名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateMerchantType : addMerchantType;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/schoolType/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/schoolType/index.vue

@@ -0,0 +1,239 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="merchantTypeId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <MerchantTypeEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import MerchantTypeEdit from './components/merchantTypeEdit.vue';
+  import { pageMerchantType, removeMerchantType, removeBatchMerchantType } from '@/api/shop/merchantType';
+  import type { MerchantType, MerchantTypeParam } from '@/api/shop/merchantType/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<MerchantType[]>([]);
+  // 当前编辑数据
+  const current = ref<MerchantType | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageMerchantType({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90
+    },
+    {
+      title: '名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center'
+    },
+    {
+      title: '描述',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center'
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center'
+    },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: MerchantTypeParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: MerchantType) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: MerchantType) => {
+    const hide = message.loading('请求中..', 0);
+    removeMerchantType(row.id)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchMerchantType(selection.value.map((d) => d.id))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: MerchantType) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'MerchantType'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/site/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/site/components/siteEdit.vue

@@ -0,0 +1,275 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑' : '添加'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="场地名称" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入场地名称"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="封面图" name="thumb">
+        <a-input
+          allow-clear
+          placeholder="请输入封面图"
+          v-model:value="form.thumb"
+        />
+      </a-form-item>
+      <a-form-item label="每小时价格" name="price">
+        <a-input
+          allow-clear
+          placeholder="请输入每小时价格"
+          v-model:value="form.price"
+        />
+      </a-form-item>
+      <a-form-item label="营业时间" name="businessTime">
+        <a-input
+          allow-clear
+          placeholder="请输入营业时间"
+          v-model:value="form.businessTime"
+        />
+      </a-form-item>
+      <a-form-item label="场馆地址" name="address">
+        <a-input
+          allow-clear
+          placeholder="请输入场馆地址"
+          v-model:value="form.address"
+        />
+      </a-form-item>
+      <a-form-item label="场馆介绍" name="info">
+        <a-input
+          allow-clear
+          placeholder="请输入场馆介绍"
+          v-model:value="form.info"
+        />
+      </a-form-item>
+      <a-form-item label="场馆电话" name="tel">
+        <a-input
+          allow-clear
+          placeholder="请输入场馆电话"
+          v-model:value="form.tel"
+        />
+      </a-form-item>
+      <a-form-item label="排序" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="类型：1天，2小时" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入类型：1天，2小时"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="天数或小时" name="num">
+        <a-input
+          allow-clear
+          placeholder="请输入天数或小时"
+          v-model:value="form.num"
+        />
+      </a-form-item>
+      <a-form-item label="退款比率" name="proportion">
+        <a-input
+          allow-clear
+          placeholder="请输入退款比率"
+          v-model:value="form.proportion"
+        />
+      </a-form-item>
+      <a-form-item label="退款规则组" name="moneyJson">
+        <a-input
+          allow-clear
+          placeholder="请输入退款规则组"
+          v-model:value="form.moneyJson"
+        />
+      </a-form-item>
+      <a-form-item label="更新时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入更新时间"
+          v-model:value="form.updateTime"
+        />
+      </a-form-item>
+      <a-form-item label="周末活动订场开关：1开，0关" name="weekendOpen">
+        <a-input
+          allow-clear
+          placeholder="请输入周末活动订场开关：1开，0关"
+          v-model:value="form.weekendOpen"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addSite, updateSite } from '@/api/booking/site';
+  import { Site } from '@/api/booking/site/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Site | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Site>({
+    id: undefined,
+    name: undefined,
+    thumb: undefined,
+    price: undefined,
+    businessTime: undefined,
+    address: undefined,
+    info: undefined,
+    tel: undefined,
+    sortNumber: undefined,
+    type: undefined,
+    num: undefined,
+    proportion: undefined,
+    moneyJson: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    weekendOpen: undefined,
+    siteId: undefined,
+    siteName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    siteName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateSite : addSite;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/site/index.vue

@@ -0,0 +1,268 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="siteId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <SiteEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import SiteEdit from './components/siteEdit.vue';
+  import { pageSite, removeSite, removeBatchSite } from '@/api/booking/site';
+  import type { Site, SiteParam } from '@/api/booking/site/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Site[]>([]);
+  // 当前编辑数据
+  const current = ref<Site | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageSite({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      key: 'id',
+      width: 90
+    },
+    {
+      title: '场馆名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center'
+    },
+    {
+      title: '每小时价格',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center'
+    },
+    {
+      title: '营业时间',
+      dataIndex: 'thumb',
+      key: 'thumb',
+      align: 'center'
+    },
+    {
+      title: '负责人',
+      dataIndex: 'realName',
+      key: 'realName',
+      align: 'center'
+    },
+    {
+      title: '场馆电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center'
+    },
+    {
+      title: '项目类型',
+      dataIndex: 'itemType',
+      key: 'itemType',
+      align: 'center'
+    },
+    {
+      title: '类型',
+      dataIndex: 'shopType',
+      key: 'shopType',
+      align: 'center'
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center'
+    },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center'
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: SiteParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Site) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Site) => {
+    const hide = message.loading('请求中..', 0);
+    removeSite(row.siteId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchSite(selection.value.map((d) => d.siteId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Site) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Site'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/student/components/org-select.vue

@@ -0,0 +1,39 @@
+<!-- 机构选择下拉框 -->
+<template>
+  <a-tree-select
+    allow-clear
+    tree-default-expand-all
+    :placeholder="placeholder"
+    :value="value || undefined"
+    :tree-data="data"
+    :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
+    @update:value="updateValue"
+  />
+</template>
+
+<script lang="ts" setup>
+  import type { Organization } from '@/api/system/organization/model';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value?: number): void;
+  }>();
+
+  withDefaults(
+    defineProps<{
+      // 选中的数据(v-modal)
+      value?: number;
+      // 提示信息
+      placeholder?: string;
+      // 机构数据
+      data: Organization[];
+    }>(),
+    {
+      placeholder: '请选择角色'
+    }
+  );
+
+  /* 更新选中数据 */
+  const updateValue = (value?: number) => {
+    emit('update:value', value);
+  };
+</script>

modules/views/bak/student/components/role-select.vue

@@ -0,0 +1,71 @@
+<!-- 角色选择下拉框 -->
+<template>
+  <a-select
+    allow-clear
+    mode="multiple"
+    :value="roleIds"
+    :placeholder="placeholder"
+    @update:value="updateValue"
+    @blur="onBlur"
+  >
+    <a-select-option
+      v-for="item in data"
+      :key="item.roleId"
+      :value="item.roleId"
+    >
+      {{ item.roleName }}
+    </a-select-option>
+  </a-select>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import { listRoles } from '@/api/system/role';
+  import type { Role } from '@/api/system/role/model';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value: Role[]): void;
+    (e: 'blur'): void;
+  }>();
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      value?: Role[];
+      //
+      placeholder?: string;
+    }>(),
+    {
+      placeholder: '请选择角色'
+    }
+  );
+
+  // 选中的角色id
+  const roleIds = computed(() => props.value?.map((d) => d.roleId as number));
+
+  // 角色数据
+  const data = ref<Role[]>([]);
+
+  /* 更新选中数据 */
+  const updateValue = (value: number[]) => {
+    emit(
+      'update:value',
+      value.map((v) => ({ roleId: v }))
+    );
+  };
+
+  /* 获取角色数据 */
+  listRoles()
+    .then((list) => {
+      data.value = list;
+    })
+    .catch((e) => {
+      message.error(e.message);
+    });
+
+  /* 失去焦点 */
+  const onBlur = () => {
+    emit('blur');
+  };
+</script>

modules/views/bak/student/components/sex-select.vue

@@ -0,0 +1,45 @@
+<!-- 角色选择下拉框 -->
+<template>
+  <a-select
+    show-search
+    optionFilterProp="label"
+    :options="data"
+    allow-clear
+    :value="value"
+    :placeholder="placeholder"
+    @update:value="updateValue"
+    @blur="onBlur"
+  />
+</template>
+
+<script lang="ts" setup>
+  import { getDictionaryOptions } from '@/utils/common';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value: string): void;
+    (e: 'blur'): void;
+  }>();
+
+  withDefaults(
+    defineProps<{
+      value?: string;
+      placeholder?: string;
+    }>(),
+    {
+      placeholder: '请选择性别'
+    }
+  );
+
+  // 字典数据
+  const data = getDictionaryOptions('sex');
+
+  /* 更新选中数据 */
+  const updateValue = (value: string) => {
+    emit('update:value', value);
+  };
+
+  /* 失去焦点 */
+  const onBlur = () => {
+    emit('blur');
+  };
+</script>

modules/views/bak/student/components/user-edit.vue

@@ -0,0 +1,313 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :confirm-loading="loading"
+    :title="isUpdate ? '用户详情' : '新建用户'"
+    :body-style="{ paddingBottom: '8px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 5, sm: 4, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 17, sm: 20, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-row :gutter="16">
+        <a-col
+          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
+        >
+          <a-form-item label="手机号" v-if="isUpdate" name="mobile">
+            <a-input
+              allow-clear
+              :maxlength="11"
+              placeholder="请输入手机号"
+              v-model:value="form.mobile"
+              :disabled="isUpdate"
+            />
+          </a-form-item>
+          <a-form-item label="昵称" name="nickname">
+            <a-input
+              allow-clear
+              :maxlength="20"
+              placeholder="请输入昵称"
+              v-model:value="form.nickname"
+            />
+          </a-form-item>
+          <a-form-item label="真实姓名" name="realName">
+            <a-input
+              allow-clear
+              :maxlength="20"
+              placeholder="请输入真实姓名"
+              v-model:value="form.realName"
+            />
+          </a-form-item>
+          <a-form-item label="性别" name="sex">
+            <span v-if="form.sex == 1">男</span>
+            <span v-else-if="form.sex == 2">女</span>
+            <span v-else>未知</span>
+          </a-form-item>
+        </a-col>
+        <a-col
+          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
+        >
+          <a-form-item label="会员等级">
+            <SelectGrade
+              :placeholder="`请选择会员等级`"
+              v-model:value="form.gradeName"
+              :disabled="isUpdate"
+              @done="chooseGradeId"
+            />
+          </a-form-item>
+          <a-form-item label="邮箱" name="email">
+            <a-input
+              allow-clear
+              :maxlength="100"
+              placeholder="请输入邮箱"
+              v-model:value="form.email"
+            />
+          </a-form-item>
+          <a-form-item label="出生日期">
+            <a-date-picker
+              class="ele-fluid"
+              value-format="YYYY-MM-DD"
+              placeholder="请选择出生日期"
+              v-model:value="form.birthday"
+            />
+          </a-form-item>
+          <a-form-item v-if="!isUpdate" label="登录密码" name="password">
+            <a-input-password
+              :maxlength="20"
+              v-model:value="form.password"
+              placeholder="请输入登录密码"
+            />
+          </a-form-item>
+          <a-form-item label="个人简介">
+            <a-textarea
+              :rows="4"
+              :maxlength="200"
+              placeholder="请输入个人简介"
+              v-model:value="form.introduction"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import type { FormInstance, Rule } from 'ant-design-vue/es/form';
+  import { emailReg, phoneReg } from 'ele-admin-pro/es';
+  import { storeToRefs } from 'pinia';
+  import { useThemeStore } from '@/store/modules/theme';
+  import useFormData from '@/utils/use-form-data';
+  import RoleSelect from './role-select.vue';
+  import SexSelect from './sex-select.vue';
+  import { addUser, updateUser, checkExistence } from '@/api/system/user';
+  import type { User } from '@/api/system/user/model';
+  import OrgSelect from './org-select.vue';
+  // import { getDictionaryOptions } from '@/utils/common';
+  import { Organization } from '@/api/system/organization/model';
+  import { Grade } from '@/api/user/grade/model';
+
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+  // 获取字典数据
+  // const userTypeData = getDictionaryOptions('userType');
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: User | null;
+    // 全部机构
+    organizationList: Organization[];
+  }>();
+
+  //
+  const formRef = ref<FormInstance | null>(null);
+
+  // 是否是修改
+  const isUpdate = ref(false);
+
+  // 提交状态
+  const loading = ref(false);
+
+  // 表单数据
+  const { form, resetFields, assignFields } = useFormData<User>({
+    type: undefined,
+    userId: undefined,
+    username: '',
+    nickname: '',
+    realName: '',
+    companyName: '',
+    sex: undefined,
+    roles: [],
+    email: '',
+    phone: '',
+    mobile: '',
+    password: '',
+    introduction: '',
+    organizationId: undefined,
+    birthday: '',
+    idCard: '',
+    comments: '',
+    gradeName: '',
+    gradeId: undefined
+  });
+
+  // 表单验证规则
+  const rules = reactive<Record<string, Rule[]>>({
+    username: [
+      {
+        required: true,
+        type: 'string',
+        validator: (_rule: Rule, value: string) => {
+          return new Promise<void>((resolve, reject) => {
+            if (!value) {
+              return reject('请输入用户账号');
+            }
+            checkExistence('username', value, props.data?.userId)
+              .then(() => {
+                reject('账号已经存在');
+              })
+              .catch(() => {
+                resolve();
+              });
+          });
+        },
+        trigger: 'blur'
+      }
+    ],
+    nickname: [
+      {
+        required: true,
+        message: '请输入昵称',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    // realName: [
+    //   {
+    //     required: true,
+    //     message: '请输入真实姓名',
+    //     type: 'string',
+    //     trigger: 'blur'
+    //   }
+    // ],
+    // sex: [
+    //   {
+    //     required: true,
+    //     message: '请选择性别',
+    //     type: 'string',
+    //     trigger: 'blur'
+    //   }
+    // ],
+    roles: [
+      {
+        required: true,
+        message: '请选择角色',
+        type: 'array',
+        trigger: 'blur'
+      }
+    ],
+    email: [
+      {
+        pattern: emailReg,
+        message: '邮箱格式不正确',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    password: [
+      {
+        required: true,
+        type: 'string',
+        validator: async (_rule: Rule, value: string) => {
+          if (isUpdate.value || /^[\S]{5,18}$/.test(value)) {
+            return Promise.resolve();
+          }
+          return Promise.reject('密码必须为5-18位非空白字符');
+        },
+        trigger: 'blur'
+      }
+    ],
+    phone: [
+      {
+        required: true,
+        pattern: phoneReg,
+        message: '手机号格式不正确',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseGradeId = (data: Grade) => {
+    form.gradeName = data.name;
+    form.gradeId = data.gradeId;
+  };
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const saveOrUpdate = isUpdate.value ? updateUser : addUser;
+        saveOrUpdate(form)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          assignFields({
+            ...props.data,
+            password: ''
+          });
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+        formRef.value?.clearValidate();
+      }
+    }
+  );
+</script>

modules/views/bak/student/components/user-import.vue

@@ -0,0 +1,88 @@
+<!-- 用户导入弹窗 -->
+<template>
+  <ele-modal
+    :width="520"
+    :footer="null"
+    title="导入用户"
+    :visible="visible"
+    @update:visible="updateVisible"
+  >
+    <a-spin :spinning="loading">
+      <a-upload-dragger
+        accept=".xls,.xlsx"
+        :show-upload-list="false"
+        :customRequest="doUpload"
+        style="padding: 24px 0; margin-bottom: 16px"
+      >
+        <p class="ant-upload-drag-icon">
+          <cloud-upload-outlined />
+        </p>
+        <p class="ant-upload-hint">将文件拖到此处，或点击上传</p>
+      </a-upload-dragger>
+    </a-spin>
+    <div class="ele-text-center">
+      <span>只能上传xls、xlsx文件，</span>
+      <a
+        href="https://cdn.eleadmin.com/20200610/用户导入模板.xlsx"
+        download="用户导入模板.xlsx"
+      >
+        下载模板
+      </a>
+    </div>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import { CloudUploadOutlined } from '@ant-design/icons-vue';
+  import { importUsers } from '@/api/system/user';
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  defineProps<{
+    // 是否打开弹窗
+    visible: boolean;
+  }>();
+
+  // 导入请求状态
+  const loading = ref(false);
+
+  /* 上传 */
+  const doUpload = ({ file }) => {
+    if (
+      ![
+        'application/vnd.ms-excel',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      ].includes(file.type)
+    ) {
+      message.error('只能选择 excel 文件');
+      return false;
+    }
+    if (file.size / 1024 / 1024 > 10) {
+      message.error('大小不能超过 10MB');
+      return false;
+    }
+    loading.value = true;
+    importUsers(file)
+      .then((msg) => {
+        loading.value = false;
+        message.success(msg);
+        updateVisible(false);
+        emit('done');
+      })
+      .catch((e) => {
+        loading.value = false;
+        message.error(e.message);
+      });
+    return false;
+  };
+
+  /* 更新 visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+</script>

modules/views/bak/student/components/user-info.vue

@@ -0,0 +1,143 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <a-drawer
+    :width="680"
+    :visible="visible"
+    :confirm-loading="loading"
+    :title="'基本信息'"
+    :body-style="{ paddingBottom: '8px' }"
+    @update:visible="updateVisible"
+    :footer="null"
+  >
+    <a-form
+      :label-col="{ md: { span: 6 }, sm: { span: 24 } }"
+      :wrapper-col="{ md: { span: 19 }, sm: { span: 24 } }"
+    >
+      <a-row :gutter="16">
+        <a-col
+          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
+        >
+          <a-form-item label="账号">
+            <span class="ele-text">{{ user.username }}</span>
+          </a-form-item>
+          <a-form-item label="昵称">
+            <span class="ele-text">{{ user.nickname }}</span>
+          </a-form-item>
+          <a-form-item label="性别">
+            <span class="ele-text">{{ user.sexName }}</span>
+          </a-form-item>
+          <a-form-item label="手机号">
+            <span class="ele-text">{{ user.phone }}</span>
+          </a-form-item>
+          <a-form-item label="角色">
+            <a-tag v-for="item in user.roles" :key="item.roleId" color="blue">
+              {{ item.roleName }}
+            </a-tag>
+          </a-form-item>
+          <a-form-item label="状态">
+            <a-badge
+              v-if="typeof user.status === 'number'"
+              :status="(['processing', 'error'][user.status] as any)"
+              :text="['正常', '冻结'][user.status]"
+            />
+          </a-form-item>
+          <a-form-item label="地址">
+            <span class="ele-text">{{ user.address }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col
+          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
+        >
+          <a-form-item label="可用余额">
+            <span class="ele-text-success">￥{{ formatNumber(user.balance) }}</span>
+          </a-form-item>
+          <a-form-item label="可用积分">
+            <span class="ele-text">{{ user.points }}</span>
+          </a-form-item>
+          <a-form-item label="实际消费">
+            <span class="ele-text">{{ user.payMoney }}</span>
+          </a-form-item>
+          <a-form-item label="机构/部门">
+            <span class="ele-text">{{ user.organizationName }}</span>
+          </a-form-item>
+          <a-form-item label="头像">
+            <a-image :src="user.avatar" :width="36" />
+          </a-form-item>
+          <a-form-item label="生日">
+            <span class="ele-text">{{ user.birthday }}</span>
+          </a-form-item>
+          <a-form-item label="创建时间">
+            <span class="ele-text">{{ user.createTime }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-drawer>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form } from 'ant-design-vue';
+  import { assignObject } from 'ele-admin-pro';
+  import type { User } from '@/api/system/user/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { formatNumber } from 'ele-admin-pro/es';
+  import { storeToRefs } from 'pinia';
+
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: User | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 用户信息
+  const user = reactive<User>({
+    username: '',
+    nickname: '',
+    sexName: '',
+    phone: '',
+    avatar: '',
+    balance: undefined,
+    points: 0,
+    payMoney: 0,
+    birthday: '',
+    address: '',
+    roles: [],
+    createTime: undefined,
+    status: undefined
+  });
+
+  // 请求状态
+  const loading = ref(true);
+
+  const { resetFields } = useForm(user);
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        if (props.data) {
+          loading.value = false;
+          assignObject(user, props.data);
+        }
+      } else {
+        resetFields();
+      }
+    }
+  );
+</script>

modules/views/bak/student/components/user-search.vue

@@ -0,0 +1,111 @@
+<!-- 搜索表单 -->
+<template>
+  <a-form
+    :label-col="
+      styleResponsive ? { xl: 7, lg: 5, md: 7, sm: 4 } : { flex: '90px' }
+    "
+    :wrapper-col="
+      styleResponsive ? { xl: 17, lg: 19, md: 17, sm: 20 } : { flex: '1' }
+    "
+  >
+    <a-row :gutter="8">
+      <a-col
+        v-bind="
+          styleResponsive
+            ? { xl: 6, lg: 12, md: 12, sm: 24, xs: 24 }
+            : { span: 6 }
+        "
+      >
+        <a-form-item label="用户账号">
+          <a-input
+            v-model:value.trim="form.username"
+            placeholder="请输入"
+            allow-clear
+          />
+        </a-form-item>
+      </a-col>
+      <a-col
+        v-bind="
+          styleResponsive
+            ? { xl: 6, lg: 12, md: 12, sm: 24, xs: 24 }
+            : { span: 6 }
+        "
+      >
+        <a-form-item label="昵称">
+          <a-input
+            v-model:value.trim="form.nickname"
+            placeholder="请输入"
+            allow-clear
+          />
+        </a-form-item>
+      </a-col>
+      <a-col
+        v-bind="
+          styleResponsive
+            ? { xl: 6, lg: 12, md: 12, sm: 24, xs: 24 }
+            : { span: 6 }
+        "
+      >
+        <a-form-item label="性别">
+          <a-select v-model:value="form.sex" placeholder="请选择" allow-clear>
+            <a-select-option value="1">男</a-select-option>
+            <a-select-option value="2">女</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-col>
+      <a-col
+        v-bind="
+          styleResponsive
+            ? { xl: 6, lg: 12, md: 12, sm: 24, xs: 24 }
+            : { span: 6 }
+        "
+      >
+        <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
+          <a-space>
+            <a-button type="primary" @click="search">查询</a-button>
+            <a-button @click="reset">重置</a-button>
+          </a-space>
+        </a-form-item>
+      </a-col>
+    </a-row>
+  </a-form>
+</template>
+
+<script lang="ts" setup>
+  import { storeToRefs } from 'pinia';
+  import { useThemeStore } from '@/store/modules/theme';
+  import useFormData from '@/utils/use-form-data';
+  import type { UserParam } from '@/api/system/user/model';
+
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 默认搜索条件
+    where?: UserParam;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'search', where?: UserParam): void;
+  }>();
+
+  // 表单数据
+  const { form, resetFields } = useFormData<UserParam>({
+    username: '',
+    nickname: '',
+    sex: undefined,
+    ...props.where
+  });
+
+  /* 搜索 */
+  const search = () => {
+    emit('search', form);
+  };
+
+  /*  重置 */
+  const reset = () => {
+    resetFields();
+    search();
+  };
+</script>

modules/views/bak/student/details/index.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="ele-body">
+    <a-card title="基本信息" :bordered="false">
+      <a-form
+        class="ele-form-detail"
+        :label-col="
+          styleResponsive ? { md: 2, sm: 4, xs: 6 } : { flex: '90px' }
+        "
+        :wrapper-col="
+          styleResponsive ? { md: 22, sm: 20, xs: 18 } : { flex: '1' }
+        "
+      >
+        <a-form-item label="账号">
+          <div class="ele-text-secondary">{{ form.username }}</div>
+        </a-form-item>
+        <a-form-item label="昵称">
+          <div class="ele-text-secondary">{{ form.nickname }}</div>
+        </a-form-item>
+        <a-form-item label="性别">
+          <div class="ele-text-secondary">{{ form.sexName }}</div>
+        </a-form-item>
+        <a-form-item label="手机号">
+          <div class="ele-text-secondary">{{ form.phone }}</div>
+        </a-form-item>
+        <a-form-item label="真实姓名">
+          <div class="ele-text-secondary">{{ form.realName }}</div>
+        </a-form-item>
+        <a-form-item label="别名">
+          <div class="ele-text-secondary">{{ form.alias }}</div>
+        </a-form-item>
+        <a-form-item label="角色">
+          <a-tag v-for="item in form.roles" :key="item.roleId" color="blue">
+            {{ item.roleName }}
+          </a-tag>
+        </a-form-item>
+        <a-form-item label="创建时间">
+          <div class="ele-text-secondary">{{ form.createTime }}</div>
+        </a-form-item>
+        <a-form-item label="状态">
+          <a-badge
+            v-if="typeof form.status === 'number'"
+            :status="(['processing', 'error'][form.status] as any)"
+            :text="['正常', '冻结'][form.status]"
+          />
+        </a-form-item>
+      </a-form>
+    </a-card>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { ref, watch, unref } from 'vue';
+  import { useRouter } from 'vue-router';
+  import { message } from 'ant-design-vue/es';
+  import { toDateString } from 'ele-admin-pro/es';
+  import { storeToRefs } from 'pinia';
+  import { useThemeStore } from '@/store/modules/theme';
+  import useFormData from '@/utils/use-form-data';
+  import { setPageTabTitle } from '@/utils/page-tab-util';
+  import { getUser } from '@/api/system/user';
+  import type { User } from '@/api/system/user/model';
+  const ROUTE_PATH = '/system/user/details';
+
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const { currentRoute } = useRouter();
+
+  // 用户信息
+  const { form, assignFields } = useFormData<User>({
+    userId: undefined,
+    alias: '',
+    realName: '',
+    username: '',
+    nickname: '',
+    sexName: '',
+    phone: '',
+    roles: [],
+    createTime: undefined,
+    status: undefined
+  });
+
+  // 请求状态
+  const loading = ref(true);
+
+  /*  */
+  const query = () => {
+    const { query } = unref(currentRoute);
+    const id = query.id;
+    if (!id || form.userId === Number(id)) {
+      return;
+    }
+    loading.value = true;
+    getUser(Number(id))
+      .then((data) => {
+        loading.value = false;
+        assignFields({
+          ...data,
+          createTime: toDateString(data.createTime)
+        });
+        // 修改页签标题
+        if (unref(currentRoute).path === ROUTE_PATH) {
+          setPageTabTitle(data.nickname + '的信息');
+        }
+      })
+      .catch((e) => {
+        loading.value = false;
+        message.error(e.message);
+      });
+  };
+
+  watch(
+    currentRoute,
+    (route) => {
+      const { path } = unref(route);
+      if (path !== ROUTE_PATH) {
+        return;
+      }
+      query();
+    },
+    { immediate: true }
+  );
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'SystemUserDetails'
+  };
+</script>

modules/views/bak/student/index.vue

@@ -0,0 +1,503 @@
+<template>
+  <div class="ele-body">
+    <a-card :bordered="false">
+      <!-- 表格 -->
+      <ele-pro-table
+        ref="tableRef"
+        row-key="userId"
+        :columns="columns"
+        :datasource="datasource"
+        :scroll="{ x: 1300 }"
+        :where="defaultWhere"
+        :customRow="customRow"
+        cache-key="proSystemUserTable"
+      >
+        <template #toolbar>
+          <a-space>
+            <a-input-search
+              allow-clear
+              v-model:value="searchText"
+              placeholder="请输入关键词"
+              @search="reload"
+              @pressEnter="reload"
+            />
+          </a-space>
+        </template>
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'nickname'">
+            <div class="user-box">
+              <a-avatar
+                :size="30"
+                :src="`${record.avatar}`"
+                style="margin-right: 4px"
+              >
+                <template #icon>
+                  <UserOutlined />
+                </template>
+              </a-avatar>
+              <div class="user-info" @click="openEdit(record)">
+                <span>{{ record.nickname }}</span>
+                <!--                <span class="ele-text-placeholder">{{ record.nickname }}</span>-->
+              </div>
+            </div>
+          </template>
+          <template v-if="column.key === 'mobile'">
+            <span>{{ record.mobile }}</span>
+          </template>
+          <template v-else-if="column.key === 'roles'">
+            <a-tag v-for="item in record.roles" :key="item.roleId" color="blue">
+              {{ item.roleName }}
+            </a-tag>
+          </template>
+          <template v-if="column.key === 'balance'">
+            <span class="ele-text-success">
+              ￥{{ formatNumber(record.balance) }}
+            </span>
+          </template>
+          <template v-if="column.key === 'expendMoney'">
+            <span class="ele-text-warning">
+              ￥{{ formatNumber(record.expendMoney) }}
+            </span>
+          </template>
+          <template v-else-if="column.key === 'status'">
+            <a-switch
+              :checked="record.status === 0"
+              @change="(checked: boolean) => editStatus(checked, record)"
+            />
+          </template>
+          <template v-else-if="column.key === 'action'">
+            <a-space>
+              <a @click="openEdit(record)">详情</a>
+<!--              <a-divider type="vertical" />-->
+              <!--              <a-popconfirm-->
+              <!--                placement="topRight"-->
+              <!--                title="确定要删除此用户吗？"-->
+              <!--                @confirm="remove(record)"-->
+              <!--              >-->
+              <!--                <a class="ele-text-danger">删除</a>-->
+              <!--              </a-popconfirm>-->
+            </a-space>
+          </template>
+        </template>
+      </ele-pro-table>
+    </a-card>
+    <!-- 编辑弹窗 -->
+    <user-edit
+      v-model:visible="showEdit"
+      :data="current"
+      :organization-list="data"
+      @done="reload"
+    />
+    <!-- 用户详情 -->
+    <user-info v-model:visible="showInfo" :data="current" @done="reload" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref, reactive } from 'vue';
+  import { message, Modal } from 'ant-design-vue/es';
+  import {
+    PlusOutlined,
+    DeleteOutlined,
+    UploadOutlined,
+    EditOutlined,
+    UserOutlined,
+    ExclamationCircleOutlined
+  } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro/es';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import { messageLoading, formatNumber } from 'ele-admin-pro/es';
+  import { timeAgo } from 'ele-admin-pro';
+  import UserEdit from './components/user-edit.vue';
+  import UserImport from './components/user-import.vue';
+  import UserInfo from './components/user-info.vue';
+  import {
+    pageUsers,
+    removeUser,
+    removeUsers,
+    updateUserStatus,
+    updateUserPassword
+  } from '@/api/system/user';
+  import type { User, UserParam } from '@/api/system/user/model';
+  import { toTreeData, uuid } from 'ele-admin-pro';
+  import { listRoles } from '@/api/system/role';
+  import { listOrganizations } from '@/api/system/organization';
+  import { Organization } from '@/api/system/organization/model';
+  import { hasRole } from '@/utils/permission';
+
+  // 加载状态
+  const loading = ref(true);
+  // 树形数据
+  const data = ref<Organization[]>([]);
+  // 树展开的key
+  const expandedRowKeys = ref<number[]>([]);
+  // 树选中的key
+  const selectedRowKeys = ref<number[]>([]);
+  // 表格选中数据
+  const selection = ref<User[]>([]);
+  // 当前编辑数据
+  const current = ref<User | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示用户详情
+  const showInfo = ref(false);
+  // 是否显示用户导入弹窗
+  const showImport = ref(false);
+  const userType = ref<number>();
+  const searchText = ref('');
+
+  // 加载角色
+  const roles = ref<any[]>([]);
+  const filters = () => {
+    listRoles().then((result) => {
+      result.map((d) => {
+        roles.value.push({
+          text: d.roleName,
+          value: d.roleId
+        });
+      });
+    });
+  };
+  filters();
+  // 加载机构
+  listOrganizations()
+    .then((list) => {
+      loading.value = false;
+      const eks: number[] = [];
+      list.forEach((d) => {
+        d.key = d.organizationId;
+        d.value = d.organizationId;
+        d.title = d.organizationName;
+        if (typeof d.key === 'number') {
+          eks.push(d.key);
+        }
+      });
+      expandedRowKeys.value = eks;
+      data.value = toTreeData({
+        data: list,
+        idField: 'organizationId',
+        parentIdField: 'parentId'
+      });
+      if (list.length) {
+        if (typeof list[0].key === 'number') {
+          selectedRowKeys.value = [list[0].key];
+        }
+        // current.value = list[0];
+      } else {
+        selectedRowKeys.value = [];
+        // current.value = null;
+      }
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'userId',
+      width: 80,
+      showSorterTooltip: false
+    },
+    {
+      title: '昵称',
+      key: 'nickname',
+      dataIndex: 'nickname',
+      width: 240,
+      showSorterTooltip: false
+    },
+    {
+      title: '手机号码',
+      dataIndex: 'mobile',
+      key: 'mobile',
+      showSorterTooltip: false
+    },
+    // {
+    //   title: '客户分组',
+    //   dataIndex: 'type',
+    //   key: 'type',
+    //   align: 'center',
+    //   width: 120
+    // },
+    {
+      title: '性别',
+      dataIndex: 'sexName',
+      align: 'center',
+      width: 180,
+      showSorterTooltip: false
+    },
+    {
+      title: '邮箱',
+      dataIndex: 'email',
+      hideInTable: true,
+      width: 180,
+      showSorterTooltip: false
+    },
+    {
+      title: '可用余额',
+      dataIndex: 'balance',
+      key: 'balance',
+      align: 'center',
+      width: 180,
+      sorter: true,
+      showSorterTooltip: false
+    },
+    {
+      title: '实际消费金额',
+      dataIndex: 'expendMoney',
+      key: 'expendMoney',
+      sorter: true,
+      hideInTable: true,
+      showSorterTooltip: false
+    },
+    {
+      title: '可用积分',
+      dataIndex: 'points',
+      hideInTable: true,
+      sorter: true
+    },
+    {
+      title: '注册来源',
+      key: 'platform',
+      align: 'center',
+      dataIndex: 'platform',
+      hideInTable: true,
+      customRender: ({ text }) => ['未知', '网站', '小程序', 'APP'][text]
+    },
+    {
+      title: '证件号码',
+      dataIndex: 'idCard',
+      hideInTable: true
+    },
+    {
+      title: '出生日期',
+      dataIndex: 'birthday',
+      key: 'birthday',
+      hideInTable: true
+    },
+    {
+      title: '省份',
+      dataIndex: 'province',
+      key: 'province',
+      hideInTable: true
+    },
+    {
+      title: '城市',
+      dataIndex: 'city',
+      key: 'city',
+      hideInTable: true,
+      showSorterTooltip: false
+    },
+    {
+      title: '地区',
+      dataIndex: 'region',
+      key: 'region',
+      hideInTable: true,
+      showSorterTooltip: false
+    },
+    {
+      title: '个人简介',
+      dataIndex: 'introduction',
+      key: 'introduction',
+      hideInTable: true,
+      showSorterTooltip: false
+    },
+    {
+      title: '邮箱认证',
+      dataIndex: 'emailVerified',
+      hideInTable: true,
+      showSorterTooltip: false,
+      customRender: ({ text }) => ['未认证', '已认证'][text]
+    },
+    {
+      title: '实名认证',
+      dataIndex: 'certification',
+      sorter: true,
+      hideInTable: true,
+      customRender: ({ text }) => ['未认证', '已认证'][text]
+    },
+    {
+      title: '注册时间',
+      dataIndex: 'createTime',
+      sorter: true,
+      align: 'center',
+      width: 200,
+      showSorterTooltip: false,
+      ellipsis: true,
+      customRender: ({ text }) => timeAgo(text)
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 120,
+      fixed: 'right',
+      align: 'center'
+    }
+  ]);
+
+  // 默认搜索条件
+  const defaultWhere = reactive({
+    username: '',
+    nickname: ''
+  });
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    where = {};
+    where.roleId = filters.roles;
+    where.keywords = searchText.value;
+    where.groupId = 23;
+    return pageUsers({ page, limit, ...where, ...orders });
+  };
+
+  /* 搜索 */
+  const reload = (where?: UserParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: User) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开用户详情弹窗 */
+  const openInfo = (row?: User) => {
+    current.value = row ?? null;
+    showInfo.value = true;
+  };
+
+  /* 打开编辑弹窗 */
+  const openImport = () => {
+    showImport.value = true;
+  };
+
+  const handleTabs = (e) => {
+    userType.value = Number(e.target.value);
+    reload();
+  };
+
+  /* 删除单个 */
+  const remove = (row: User) => {
+    const hide = messageLoading('请求中..', 0);
+    removeUser(row.userId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的用户吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = messageLoading('请求中..', 0);
+        removeUsers(selection.value.map((d) => d.userId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 重置用户密码 */
+  const resetPsw = (row: User) => {
+    Modal.confirm({
+      title: '提示',
+      content: '确定要重置此用户的密码吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        const password = uuid(8);
+        updateUserPassword(row.userId, password)
+          .then((msg) => {
+            hide();
+            message.success(msg + '，新密码：' + password);
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 修改用户状态 */
+  const editStatus = (checked: boolean, row: User) => {
+    const status = checked ? 0 : 1;
+    updateUserStatus(row.userId, status)
+      .then((msg) => {
+        row.status = status;
+        message.success(msg);
+      })
+      .catch((e) => {
+        message.error(e.message);
+      });
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: User) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'SystemUser'
+  };
+</script>
+
+<style lang="less" scoped>
+  .user-box {
+    display: flex;
+    align-items: center;
+    .user-info {
+      display: flex;
+      flex-direction: column;
+      align-items: start;
+    }
+  }
+</style>

modules/views/bak/teacher/components/merchantEdit.vue

@@ -0,0 +1,474 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑场馆' : '添加场馆'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="场馆图标" name="image">
+        <SelectFile
+          :placeholder="`请选择图片`"
+          :limit="1"
+          :data="images"
+          @done="chooseImage"
+          @del="onDeleteItem"
+        />
+      </a-form-item>
+      <a-form-item label="场馆名称" name="merchantName">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="xxx场馆"
+          v-model:value="form.merchantName"
+        />
+      </a-form-item>
+      <a-form-item
+        label="手机号码"
+        name="phone"
+        extra="手机号码将用做于场馆端的登录账号请填写真实手机号码"
+      >
+        <a-input
+          allow-clear
+          :maxlength="11"
+          placeholder="请输入场馆手机号"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="负责人姓名" name="realName">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="请输入场馆负责人姓名"
+          v-model:value="form.realName"
+        />
+      </a-form-item>
+      <a-form-item label="场馆类型" name="shopType">
+        <SelectMerchantType
+          :placeholder="`请选择场馆类型`"
+          v-model:value="form.shopType"
+          @done="chooseShopType"
+        />
+      </a-form-item>
+      <a-form-item label="所属行业" name="category">
+        <industry-select
+          v-model:value="form.category"
+          valueField="label"
+          placeholder="请选择所属行业"
+          class="ele-fluid"
+          @change="onIndustry"
+        />
+      </a-form-item>
+      <a-form-item label="场馆坐标" name="lngAndLat">
+        <div class="flex-sb">
+          <a-input
+            allow-clear
+            placeholder="请选择所在位置"
+            v-model:value="form.lngAndLat"
+            disabled
+          />
+          <a-button
+            class="ele-btn-icon"
+            style="margin-left: 10px"
+            @click="openMapPicker"
+          >
+            打开地图位置选择器
+          </a-button>
+        </div>
+      </a-form-item>
+      <a-form-item label="场馆地址" name="address">
+        <a-input
+          allow-clear
+          :maxlength="100"
+          placeholder="请输入场馆地址"
+          v-model:value="form.address"
+        />
+      </a-form-item>
+      <a-form-item label="手续费(%)" name="commission">
+        <a-input-number
+          :step="1"
+          :max="100"
+          :min="0.0"
+          :precision="2"
+          class="ele-fluid"
+          placeholder="请输入手续费"
+          v-model:value="form.commission"
+        />
+      </a-form-item>
+      <a-form-item label="关键字" name="keywords">
+        <a-select
+          v-model:value="form.keywords"
+          mode="tags"
+          placeholder="输入关键词后回车"
+        />
+      </a-form-item>
+      <a-form-item label="资质图片" name="files">
+        <SelectFile
+          :placeholder="`请选择图片`"
+          :limit="9"
+          :data="files"
+          @done="chooseFiles"
+          @del="onDeleteFiles"
+        />
+      </a-form-item>
+      <a-form-item label="是否自营" name="ownStore">
+        <a-switch
+          checked-children="是"
+          un-checked-children="否"
+          :checked="form.ownStore === 1"
+          @update:checked="updateOwnStore"
+        />
+      </a-form-item>
+      <a-form-item label="是否推荐" name="recommend">
+        <a-switch
+          checked-children="是"
+          un-checked-children="否"
+          :checked="form.recommend === 1"
+          @update:checked="updateRecommend"
+        />
+      </a-form-item>
+      <a-form-item label="是否需要审核" name="goodsReview">
+        <a-switch
+          checked-children="是"
+          un-checked-children="否"
+          :checked="form.goodsReview === 1"
+          @update:checked="updateGoodsReview"
+        />
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+  <!-- 地图位置选择弹窗 -->
+  <ele-map-picker
+    :need-city="true"
+    :dark-mode="darkMode"
+    v-model:visible="showMap"
+    :center="[108.374959, 22.767024]"
+    :search-type="1"
+    :zoom="12"
+    @done="onDone"
+  />
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid, phoneReg } from 'ele-admin-pro';
+  import { addMerchant, updateMerchant } from '@/api/shop/merchant';
+  import { Merchant } from '@/api/shop/merchant/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+  import { MerchantType } from '@/api/shop/merchantType/model';
+  import { CenterPoint } from 'ele-admin-pro/es/ele-map-picker/types';
+  import { listRoles } from '@/api/system/role';
+  import { getTenantId } from '@/utils/domain';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive, darkMode } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Merchant | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+  const files = ref<ItemType[]>([]);
+  // 是否显示地图选择弹窗
+  const showMap = ref(false);
+
+  // 用户信息
+  const form = reactive<Merchant>({
+    merchantId: undefined,
+    merchantName: undefined,
+    image: undefined,
+    phone: undefined,
+    realName: undefined,
+    shopType: undefined,
+    category: undefined,
+    province: '',
+    city: '',
+    region: '',
+    address: '',
+    lngAndLat: '',
+    commission: 0,
+    keywords: undefined,
+    files: undefined,
+    ownStore: undefined,
+    recommend: undefined,
+    goodsReview: 1,
+    comments: '',
+    adminUrl: '',
+    status: 0,
+    sortNumber: 100,
+    roleId: undefined,
+    roleName: '',
+    tenantId: undefined
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    merchantName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写场馆名称',
+        trigger: 'blur'
+      }
+    ],
+    category: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写场馆分类',
+        trigger: 'blur'
+      }
+    ],
+    lngAndLat: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写场馆坐标',
+        trigger: 'blur'
+      }
+    ],
+    realName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写场馆姓名',
+        trigger: 'blur'
+      }
+    ],
+    shopType: [
+      {
+        required: true,
+        type: 'string',
+        message: '请选择店铺类型',
+        trigger: 'blur'
+      }
+    ],
+    phone: [
+      {
+        required: true,
+        message: '请输入手机号',
+        trigger: 'blur'
+      },
+      {
+        pattern: phoneReg,
+        message: '手机号格式不正确',
+        type: 'string'
+      }
+    ]
+  });
+
+  const chooseShopType = (data: MerchantType) => {
+    form.shopType = data.name;
+  };
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const chooseFiles = (data: FileRecord) => {
+    files.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+  };
+
+  /* 打开位置选择 */
+  const openMapPicker = () => {
+    showMap.value = true;
+  };
+
+  /* 地图选择后回调 */
+  const onDone = (location: CenterPoint) => {
+    // city.value = [
+    //   `${location.city?.province}`,
+    //   `${location.city?.city}`,
+    //   `${location.city?.district}`
+    // ];
+    form.province = `${location.city?.province}`;
+    form.city = `${location.city?.city}`;
+    form.region = `${location.city?.district}`;
+    form.address = `${location.address}`;
+    form.lngAndLat = `${location.lng},${location.lat}`;
+    showMap.value = false;
+  };
+
+  const onDeleteFiles = (index: number) => {
+    files.value.splice(index, 1);
+  };
+
+  const updateOwnStore = (value: boolean) => {
+    form.ownStore = value ? 1 : 0;
+  };
+
+  const updateRecommend = (value: boolean) => {
+    form.recommend = value ? 1 : 0;
+  };
+
+  const updateGoodsReview = (value: boolean) => {
+    form.goodsReview = value ? 1 : 0;
+  };
+
+  const onIndustry = (item: any) => {
+    form.category = item[0] + '/' + item[1];
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form,
+          keywords: JSON.stringify(form.keywords),
+          files: JSON.stringify(files.value)
+        };
+        const saveOrUpdate = isUpdate.value ? updateMerchant : addMerchant;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        files.value = [];
+        if (props.data) {
+          isUpdate.value = true;
+          assignObject(form, props.data);
+          if (props.data.image) {
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            });
+          }
+          if (props.data.files) {
+            const arr = JSON.parse(props.data.files);
+            arr.map((item) => {
+              files.value.push({
+                uid: uuid(),
+                url: item.url,
+                status: 'done'
+              });
+            });
+          }
+          if (props.data.keywords) {
+            form.keywords = JSON.parse(props.data.keywords);
+          }
+        } else {
+          isUpdate.value = false;
+        }
+        // 获取场馆管理员的roleId
+        listRoles({ roleCode: 'merchant' }).then((res) => {
+          form.roleId = res[0].roleId;
+          form.roleName = res[0].roleName;
+          form.tenantId = Number(localStorage.getItem('TenantId'));
+        });
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
+
+<style lang="less" scoped>
+  .flex-sb {
+    display: flex;
+    justify-content: space-between;
+  }
+</style>

modules/views/bak/teacher/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <!--    <a-button type="primary" class="ele-btn-icon" @click="add">-->
+    <!--      <template #icon>-->
+    <!--        <PlusOutlined />-->
+    <!--      </template>-->
+    <!--      <span>添加</span>-->
+    <!--    </a-button>-->
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/teacher/components/teacherEdit.vue

@@ -0,0 +1,278 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑老师管理' : '添加老师管理'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="老师姓名" name="teacherName">
+        <a-input
+          allow-clear
+          placeholder="请输入老师姓名"
+          v-model:value="form.teacherName"
+        />
+      </a-form-item>
+      <a-form-item label="老师照片" name="image">
+        <SelectFile
+          :placeholder="`请选择图片`"
+          :limit="1"
+          :data="images"
+          @done="chooseImage"
+          @del="onDeleteItem"
+        />
+      </a-form-item>
+      <a-form-item label="老师介绍" name="content">
+        <!-- 编辑器 -->
+        <tinymce-editor
+          ref="editorRef"
+          class="content"
+          v-model:value="content"
+          :disabled="disabled"
+          :init="config"
+          placeholder="请填写内容"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="状态" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addTeacher, updateTeacher } from '@/api/booking/teacher';
+  import { Teacher } from '@/api/booking/teacher/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+  import { uploadOss } from '@/api/system/file';
+  import TinymceEditor from '@/components/TinymceEditor/index.vue';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Teacher | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+  const disabled = ref(false);
+  // 编辑器内容，双向绑定
+  const content = ref<any>('');
+
+  // 用户信息
+  const form = reactive<Teacher>({
+    teacherId: undefined,
+    teacherName: undefined,
+    image: undefined,
+    content: undefined,
+    comments: undefined,
+    status: undefined,
+    sortNumber: undefined,
+    tenantId: undefined,
+    createTime: undefined
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    teacherName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写老师管理名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const editorRef = ref<InstanceType<typeof TinymceEditor> | null>(null);
+  const config = ref({
+    height: 450,
+    images_upload_handler: (blobInfo, success, error) => {
+      const file = blobInfo.blob();
+      const formData = new FormData();
+      formData.append('file', file, file.name);
+      uploadOss(file)
+        .then((res) => {
+          success(res.path);
+        })
+        .catch((msg) => {
+          error(msg);
+        });
+    },
+    // 自定义文件上传(这里使用把选择的文件转成 blob 演示)
+    file_picker_callback: (callback: any, _value: any, meta: any) => {
+      const input = document.createElement('input');
+      input.setAttribute('type', 'file');
+      // 设定文件可选类型
+      if (meta.filetype === 'image') {
+        input.setAttribute('accept', 'image/*');
+      } else if (meta.filetype === 'media') {
+        input.setAttribute('accept', 'video/*,.pdf');
+      }
+      input.onchange = () => {
+        const file = input.files?.[0];
+        if (!file) {
+          return;
+        }
+        if (meta.filetype === 'media') {
+          if (file.size / 1024 / 1024 > 200) {
+            editorRef.value?.alert({ content: '大小不能超过 200MB' });
+            return;
+          }
+          if (file.type.startsWith('application/pdf')) {
+            uploadOss(file).then((res) => {
+              const addPath = `<a href="${res.downloadUrl}" target="_blank">${res.name}</a>`;
+              content.value = content.value + addPath;
+            });
+            return;
+          }
+          if (!file.type.startsWith('video/')) {
+            editorRef.value?.alert({ content: '只能选择视频文件' });
+            return;
+          }
+          uploadOss(file).then((res) => {
+            callback(res.path);
+          });
+        }
+      };
+      input.click();
+    }
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form,
+          content: content.value
+        };
+        const saveOrUpdate = isUpdate.value ? updateTeacher : addTeacher;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        content.value = '';
+        if (props.data) {
+          assignObject(form, props.data);
+          if (props.data.image) {
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            });
+          }
+          if (props.data.content) {
+            content.value = props.data.content;
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/teacher/index.vue

@@ -0,0 +1,247 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="teacherId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <TeacherEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import TeacherEdit from './components/teacherEdit.vue';
+  import { pageTeacher, removeTeacher, removeBatchTeacher } from '@/api/booking/teacher';
+  import type { Teacher, TeacherParam } from '@/api/booking/teacher/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Teacher[]>([]);
+  // 当前编辑数据
+  const current = ref<Teacher | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageTeacher({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: 'ID',
+      dataIndex: 'teacherId',
+      key: 'teacherId',
+      width: 90,
+    },
+    {
+      title: '老师照片',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      width: 120
+    },
+    {
+      title: '老师姓名',
+      dataIndex: 'teacherName',
+      key: 'teacherName'
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      width: 120,
+      align: 'center',
+    },
+    {
+      title: '排序号',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      width: 120,
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      width: 120,
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: TeacherParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Teacher) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Teacher) => {
+    const hide = message.loading('请求中..', 0);
+    removeTeacher(row.teacherId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchTeacher(selection.value.map((d) => d.teacherId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Teacher) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Teacher'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/user/components/org-select.vue

@@ -0,0 +1,39 @@
+<!-- 机构选择下拉框 -->
+<template>
+  <a-tree-select
+    allow-clear
+    tree-default-expand-all
+    :placeholder="placeholder"
+    :value="value || undefined"
+    :tree-data="data"
+    :dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
+    @update:value="updateValue"
+  />
+</template>
+
+<script lang="ts" setup>
+  import type { Organization } from '@/api/system/organization/model';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value?: number): void;
+  }>();
+
+  withDefaults(
+    defineProps<{
+      // 选中的数据(v-modal)
+      value?: number;
+      // 提示信息
+      placeholder?: string;
+      // 机构数据
+      data: Organization[];
+    }>(),
+    {
+      placeholder: '请选择角色'
+    }
+  );
+
+  /* 更新选中数据 */
+  const updateValue = (value?: number) => {
+    emit('update:value', value);
+  };
+</script>

modules/views/bak/user/components/role-select.vue

@@ -0,0 +1,71 @@
+<!-- 角色选择下拉框 -->
+<template>
+  <a-select
+    allow-clear
+    mode="multiple"
+    :value="roleIds"
+    :placeholder="placeholder"
+    @update:value="updateValue"
+    @blur="onBlur"
+  >
+    <a-select-option
+      v-for="item in data"
+      :key="item.roleId"
+      :value="item.roleId"
+    >
+      {{ item.roleName }}
+    </a-select-option>
+  </a-select>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import { listRoles } from '@/api/system/role';
+  import type { Role } from '@/api/system/role/model';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value: Role[]): void;
+    (e: 'blur'): void;
+  }>();
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      value?: Role[];
+      //
+      placeholder?: string;
+    }>(),
+    {
+      placeholder: '请选择角色'
+    }
+  );
+
+  // 选中的角色id
+  const roleIds = computed(() => props.value?.map((d) => d.roleId as number));
+
+  // 角色数据
+  const data = ref<Role[]>([]);
+
+  /* 更新选中数据 */
+  const updateValue = (value: number[]) => {
+    emit(
+      'update:value',
+      value.map((v) => ({ roleId: v }))
+    );
+  };
+
+  /* 获取角色数据 */
+  listRoles()
+    .then((list) => {
+      data.value = list;
+    })
+    .catch((e) => {
+      message.error(e.message);
+    });
+
+  /* 失去焦点 */
+  const onBlur = () => {
+    emit('blur');
+  };
+</script>

modules/views/bak/user/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/user/components/sex-select.vue

@@ -0,0 +1,45 @@
+<!-- 角色选择下拉框 -->
+<template>
+  <a-select
+    show-search
+    optionFilterProp="label"
+    :options="data"
+    allow-clear
+    :value="value"
+    :placeholder="placeholder"
+    @update:value="updateValue"
+    @blur="onBlur"
+  />
+</template>
+
+<script lang="ts" setup>
+  import { getDictionaryOptions } from '@/utils/common';
+
+  const emit = defineEmits<{
+    (e: 'update:value', value: string): void;
+    (e: 'blur'): void;
+  }>();
+
+  withDefaults(
+    defineProps<{
+      value?: string;
+      placeholder?: string;
+    }>(),
+    {
+      placeholder: '请选择性别'
+    }
+  );
+
+  // 字典数据
+  const data = getDictionaryOptions('sex');
+
+  /* 更新选中数据 */
+  const updateValue = (value: string) => {
+    emit('update:value', value);
+  };
+
+  /* 失去焦点 */
+  const onBlur = () => {
+    emit('blur');
+  };
+</script>

modules/views/bak/user/components/user-edit.vue

@@ -0,0 +1,397 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :confirm-loading="loading"
+    :title="isUpdate ? '修改用户' : '新建用户'"
+    :body-style="{ paddingBottom: '8px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 5, sm: 4, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 17, sm: 20, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-row :gutter="16">
+        <a-col
+          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
+        >
+          <a-form-item label="账号" name="username">
+            <a-input
+              allow-clear
+              :maxlength="20"
+              placeholder="请输入账号"
+              :disabled="isUpdate"
+              v-model:value="form.username"
+            />
+          </a-form-item>
+          <a-form-item label="昵称" name="nickname">
+            <a-input
+              allow-clear
+              :maxlength="20"
+              placeholder="请输入昵称"
+              v-model:value="form.nickname"
+            />
+          </a-form-item>
+          <a-form-item label="角色" name="roles">
+            <role-select v-model:value="form.roles" />
+          </a-form-item>
+          <a-form-item label="性别" name="sex">
+            <DictSelect
+              dict-code="sex"
+              :placeholder="`请选择性别`"
+              v-model:value="form.sexName"
+              @done="chooseSex"
+            />
+          </a-form-item>
+          <a-form-item label="姓名" name="realName">
+            <a-input
+              allow-clear
+              :maxlength="20"
+              placeholder="请输入真实姓名"
+              v-model:value="form.realName"
+            />
+          </a-form-item>
+          <a-form-item label="会员等级">
+            <SelectGrade
+              :placeholder="`请选择会员等级`"
+              v-model:value="form.gradeName"
+              :disabled="isUpdate"
+              @done="chooseGradeId"
+            />
+          </a-form-item>
+          <a-form-item label="所属机构" name="type">
+            <SelectOrganization
+              :placeholder="`请选择部门`"
+              v-model:value="form.organizationName"
+              @done="chooseOrganization"
+            />
+          </a-form-item>
+          <a-form-item label="可管场馆" name="merchantId">
+            <MerchantSelect v-model:value="merchants" />
+          </a-form-item>
+        </a-col>
+        <a-col
+          v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
+        >
+          <a-form-item label="手机号" v-if="isUpdate" name="mobile">
+            <a-input
+              allow-clear
+              :maxlength="11"
+              placeholder="请输入手机号"
+              v-model:value="form.mobile"
+              disabled
+            />
+          </a-form-item>
+          <a-form-item label="手机号" v-else name="phone">
+            <a-input
+              allow-clear
+              :maxlength="11"
+              placeholder="请输入手机号"
+              v-model:value="form.phone"
+            />
+          </a-form-item>
+          <a-form-item label="邮箱" name="email">
+            <a-input
+              allow-clear
+              :maxlength="100"
+              placeholder="请输入邮箱"
+              v-model:value="form.email"
+            />
+          </a-form-item>
+          <a-form-item label="出生日期">
+            <a-date-picker
+              class="ele-fluid"
+              value-format="YYYY-MM-DD"
+              placeholder="请选择出生日期"
+              v-model:value="form.birthday"
+            />
+          </a-form-item>
+          <a-form-item v-if="!isUpdate" label="登录密码" name="password">
+            <a-input-password
+              :maxlength="20"
+              v-model:value="form.password"
+              placeholder="请输入登录密码"
+            />
+          </a-form-item>
+          <a-form-item label="个人简介">
+            <a-textarea
+              :rows="4"
+              :maxlength="200"
+              placeholder="请输入个人简介"
+              v-model:value="form.introduction"
+            />
+          </a-form-item>
+          <a-form-item label="管理员">
+            <a-switch
+              checked-children="是"
+              un-checked-children="否"
+              :checked="form.isAdmin == 1"
+              @update:checked="updateIsAdmin"
+            />
+          </a-form-item>
+          <a-form-item label="允许办卡">
+            <a-switch
+              checked-children="允许"
+              un-checked-children="不允许"
+              :checked="!form.notAllowVip"
+              @update:checked="updateINotAllowVip"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import type { FormInstance, Rule } from 'ant-design-vue/es/form';
+  import { emailReg, phoneReg } from 'ele-admin-pro/es';
+  import { storeToRefs } from 'pinia';
+  import { useThemeStore } from '@/store/modules/theme';
+  import useFormData from '@/utils/use-form-data';
+  import RoleSelect from './role-select.vue';
+  import { addUser, updateUser, checkExistence } from '@/api/system/user';
+  import type { User } from '@/api/system/user/model';
+  import { Organization } from '@/api/system/organization/model';
+  import { Grade } from '@/api/user/grade/model';
+  import MerchantSelect from '@/views/booking/account/components/merchant-select.vue';
+  import { Merchant } from '@/api/shop/merchant/model';
+  import { listMerchant } from '@/api/shop/merchant';
+
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+  // 获取字典数据
+  // const userTypeData = getDictionaryOptions('userType');
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: User | null;
+    // 全部机构
+    organizationList: Organization[];
+  }>();
+
+  //
+  const formRef = ref<FormInstance | null>(null);
+
+  // 是否是修改
+  const isUpdate = ref(false);
+
+  // 提交状态
+  const loading = ref(false);
+
+  const merchants = ref<Merchant[]>([]);
+
+  // 表单数据
+  const { form, resetFields, assignFields } = useFormData<User>({
+    type: undefined,
+    userId: undefined,
+    username: '',
+    nickname: '',
+    realName: '',
+    companyName: '',
+    sex: undefined,
+    sexName: '',
+    roles: [],
+    email: '',
+    phone: '',
+    mobile: '',
+    password: '',
+    introduction: '',
+    organizationId: undefined,
+    organizationName: undefined,
+    birthday: '',
+    idCard: '',
+    comments: '',
+    gradeName: '',
+    notAllowVip: undefined,
+    merchants: '',
+    isAdmin: undefined,
+    gradeId: undefined
+  });
+
+  // 表单验证规则
+  const rules = reactive<Record<string, Rule[]>>({
+    username: [
+      {
+        required: true,
+        type: 'string',
+        validator: (_rule: Rule, value: string) => {
+          return new Promise<void>((resolve, reject) => {
+            if (!value) {
+              return reject('请输入用户账号');
+            }
+            checkExistence('username', value, props.data?.userId)
+              .then(() => {
+                reject('账号已经存在');
+              })
+              .catch(() => {
+                resolve();
+              });
+          });
+        },
+        trigger: 'blur'
+      }
+    ],
+    nickname: [
+      {
+        required: true,
+        message: '请输入昵称',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    // realName: [
+    //   {
+    //     required: true,
+    //     message: '请输入真实姓名',
+    //     type: 'string',
+    //     trigger: 'blur'
+    //   }
+    // ],
+    // sex: [
+    //   {
+    //     required: true,
+    //     message: '请选择性别',
+    //     type: 'string',
+    //     trigger: 'blur'
+    //   }
+    // ],
+    roles: [
+      {
+        required: true,
+        message: '请选择角色',
+        type: 'array',
+        trigger: 'blur'
+      }
+    ],
+    email: [
+      {
+        pattern: emailReg,
+        message: '邮箱格式不正确',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ],
+    password: [
+      {
+        required: true,
+        type: 'string',
+        validator: async (_rule: Rule, value: string) => {
+          if (isUpdate.value || /^[\S]{5,18}$/.test(value)) {
+            return Promise.resolve();
+          }
+          return Promise.reject('密码必须为5-18位非空白字符');
+        },
+        trigger: 'blur'
+      }
+    ],
+    phone: [
+      {
+        required: true,
+        pattern: phoneReg,
+        message: '手机号格式不正确',
+        type: 'string',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseGradeId = (data: Grade) => {
+    form.gradeName = data.name;
+    form.gradeId = data.gradeId;
+  };
+
+  const chooseSex = (data: any) => {
+    form.sex = data.key;
+    form.sexName = data.label;
+  };
+
+  const chooseOrganization = (data: Organization) => {
+    form.organizationId = data.organizationId;
+    form.organizationName = data.organizationName;
+  };
+
+  const updateIsAdmin = () => {
+    form.isAdmin = !form.isAdmin;
+  };
+
+  const updateINotAllowVip = () => {
+    form.notAllowVip = !form.notAllowVip;
+  };
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const saveOrUpdate = isUpdate.value ? updateUser : addUser;
+        const formData = {
+          ...form,
+          merchants: merchants.value?.map((d) => d.merchantId).join(',')
+        };
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        merchants.value = [];
+        if (props.data) {
+          assignFields({
+            ...props.data,
+            password: ''
+          });
+          if (props.data.merchants) {
+            listMerchant({ merchantIds: props.data.merchants }).then((list) => {
+              merchants.value = list;
+            });
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+        formRef.value?.clearValidate();
+      }
+    }
+  );
+</script>

modules/views/bak/user/components/userEdit.vue

@@ -0,0 +1,274 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑' : '添加'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="用户唯一小程序id" name="openId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户唯一小程序id"
+          v-model:value="form.openId"
+        />
+      </a-form-item>
+      <a-form-item label="小程序用户秘钥" name="sessionKey">
+        <a-input
+          allow-clear
+          placeholder="请输入小程序用户秘钥"
+          v-model:value="form.sessionKey"
+        />
+      </a-form-item>
+      <a-form-item label="用户名" name="username">
+        <a-input
+          allow-clear
+          placeholder="请输入用户名"
+          v-model:value="form.username"
+        />
+      </a-form-item>
+      <a-form-item label="头像地址" name="avatarUrl">
+        <a-input
+          allow-clear
+          placeholder="请输入头像地址"
+          v-model:value="form.avatarUrl"
+        />
+      </a-form-item>
+      <a-form-item label="1男，2女" name="gender">
+        <a-input
+          allow-clear
+          placeholder="请输入1男，2女"
+          v-model:value="form.gender"
+        />
+      </a-form-item>
+      <a-form-item label="国家" name="country">
+        <a-input
+          allow-clear
+          placeholder="请输入国家"
+          v-model:value="form.country"
+        />
+      </a-form-item>
+      <a-form-item label="省份" name="province">
+        <a-input
+          allow-clear
+          placeholder="请输入省份"
+          v-model:value="form.province"
+        />
+      </a-form-item>
+      <a-form-item label="城市" name="city">
+        <a-input
+          allow-clear
+          placeholder="请输入城市"
+          v-model:value="form.city"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          placeholder="请输入手机号码"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="积分" name="integral">
+        <a-input
+          allow-clear
+          placeholder="请输入积分"
+          v-model:value="form.integral"
+        />
+      </a-form-item>
+      <a-form-item label="余额" name="money">
+        <a-input
+          allow-clear
+          placeholder="请输入余额"
+          v-model:value="form.money"
+        />
+      </a-form-item>
+      <a-form-item label="" name="idcard">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.idcard"
+        />
+      </a-form-item>
+      <a-form-item label="" name="truename">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.truename"
+        />
+      </a-form-item>
+      <a-form-item label="是否管理员：1是；2否" name="isAdmin">
+        <a-input
+          allow-clear
+          placeholder="请输入是否管理员：1是；2否"
+          v-model:value="form.isAdmin"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addUser, updateUser } from '@/api/booking/user';
+  import { User } from '@/api/booking/user/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: User | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<User>({
+    id: undefined,
+    openId: undefined,
+    sessionKey: undefined,
+    username: undefined,
+    avatarUrl: undefined,
+    gender: undefined,
+    country: undefined,
+    province: undefined,
+    city: undefined,
+    phone: undefined,
+    integral: undefined,
+    money: undefined,
+    createTime: undefined,
+    idcard: undefined,
+    truename: undefined,
+    isAdmin: undefined,
+    tenantId: undefined,
+    userId: undefined,
+    userName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    userName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateUser : addUser;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/user/index.vue

@@ -0,0 +1,299 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="userId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <UserEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import UserEdit from './components/userEdit.vue';
+  import { pageUser, removeUser, removeBatchUser } from '@/api/booking/user';
+  import type { User, UserParam } from '@/api/booking/user/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<User[]>([]);
+  // 当前编辑数据
+  const current = ref<User | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageUser({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '用户唯一小程序id',
+      dataIndex: 'openId',
+      key: 'openId',
+      align: 'center',
+    },
+    {
+      title: '小程序用户秘钥',
+      dataIndex: 'sessionKey',
+      key: 'sessionKey',
+      align: 'center',
+    },
+    {
+      title: '用户名',
+      dataIndex: 'username',
+      key: 'username',
+      align: 'center',
+    },
+    {
+      title: '头像地址',
+      dataIndex: 'avatarUrl',
+      key: 'avatarUrl',
+      align: 'center',
+    },
+    {
+      title: '1男，2女',
+      dataIndex: 'gender',
+      key: 'gender',
+      align: 'center',
+    },
+    {
+      title: '国家',
+      dataIndex: 'country',
+      key: 'country',
+      align: 'center',
+    },
+    {
+      title: '省份',
+      dataIndex: 'province',
+      key: 'province',
+      align: 'center',
+    },
+    {
+      title: '城市',
+      dataIndex: 'city',
+      key: 'city',
+      align: 'center',
+    },
+    {
+      title: '手机号码',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '积分',
+      dataIndex: 'integral',
+      key: 'integral',
+      align: 'center',
+    },
+    {
+      title: '余额',
+      dataIndex: 'money',
+      key: 'money',
+      align: 'center',
+    },
+    {
+      title: '注册时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '',
+      dataIndex: 'idcard',
+      key: 'idcard',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'truename',
+      key: 'truename',
+      align: 'center',
+    },
+    {
+      title: '是否管理员：1是；2否',
+      dataIndex: 'isAdmin',
+      key: 'isAdmin',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: UserParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: User) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: User) => {
+    const hide = message.loading('请求中..', 0);
+    removeUser(row.userId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchUser(selection.value.map((d) => d.userId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: User) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'User'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/userCard/components/search.vue

@@ -0,0 +1,104 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <DictSelect
+      dict-code="ICType"
+      :placeholder="`IC卡类型`"
+      style="width: 120px"
+      v-model:value="where.typeName"
+      @done="onType"
+    />
+    <a-input-search
+      allow-clear
+      placeholder="请输入关键词"
+      v-model:value="where.keywords"
+      @pressEnter="search"
+      @search="search"
+    >
+      <template #addonBefore>
+        <a-select v-model:value="type" style="width: 100px; margin: -5px -12px">
+          <a-select-option value="userId">用户ID</a-select-option>
+          <a-select-option value="username">真实姓名</a-select-option>
+          <a-select-option value="phone">手机号</a-select-option>
+          <a-select-option value="cardNum">IC卡数字</a-select-option>
+        </a-select>
+      </template>
+    </a-input-search>
+    <a-button @click="reset">重置</a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { ref, watch } from 'vue';
+  import useSearch from '@/utils/use-search';
+  import { UserCardParam } from '@/api/booking/userCard/model';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: UserCardParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  const type = ref('phone');
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  // 表单数据
+  const { where, resetFields } = useSearch<UserCardParam>({
+    type: undefined,
+    userId: undefined,
+    phone: undefined,
+    keywords: undefined
+  });
+
+  const search = () => {
+    if (type.value == 'userId') {
+      where.userId = Number(where.keywords);
+      where.keywords = undefined;
+      emit('search', where);
+    }
+    if (type.value == 'username') {
+      where.username = where.keywords;
+      where.keywords = undefined;
+      emit('search', where);
+    }
+    if (type.value == 'phone') {
+      where.phone = where.keywords;
+      where.keywords = undefined;
+      emit('search', where);
+    }
+    if (type.value == 'cardNum') {
+      where.cardNum = where.keywords;
+      where.keywords = undefined;
+      emit('search', where);
+    }
+    // emit('search', where);
+  };
+
+  /*  重置 */
+  const reset = () => {
+    resetFields();
+    search();
+  };
+
+  const onType = (item: any) => {
+    where.type = item.key;
+    emit('search', where);
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/userCard/components/userCardEdit.vue

@@ -0,0 +1,492 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑会员卡' : '添加会员卡'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="用户id" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户id"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="sid场馆id集合，适用的场馆" name="sid">
+        <a-input
+          allow-clear
+          placeholder="请输入sid场馆id集合，适用的场馆"
+          v-model:value="form.sid"
+        />
+      </a-form-item>
+      <a-form-item label="用户id（旧）" name="uid">
+        <a-input
+          allow-clear
+          placeholder="请输入用户id（旧）"
+          v-model:value="form.uid"
+        />
+      </a-form-item>
+      <a-form-item label="vip卡id" name="vid">
+        <a-input
+          allow-clear
+          placeholder="请输入vip卡id"
+          v-model:value="form.vid"
+        />
+      </a-form-item>
+      <a-form-item label="开卡人id" name="aid">
+        <a-input
+          allow-clear
+          placeholder="请输入开卡人id"
+          v-model:value="form.aid"
+        />
+      </a-form-item>
+      <a-form-item label="微信订单号" name="wechatOrder">
+        <a-input
+          allow-clear
+          placeholder="请输入微信订单号"
+          v-model:value="form.wechatOrder"
+        />
+      </a-form-item>
+      <a-form-item label="卡号" name="code">
+        <a-input
+          allow-clear
+          placeholder="请输入卡号"
+          v-model:value="form.code"
+        />
+      </a-form-item>
+      <a-form-item label="会员卡名称" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入会员卡名称"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <a-form-item label="真实姓名" name="username">
+        <a-input
+          allow-clear
+          placeholder="请输入真实姓名"
+          v-model:value="form.username"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          placeholder="请输入手机号码"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="vip购卡价格" name="price">
+        <a-input
+          allow-clear
+          placeholder="请输入vip购卡价格"
+          v-model:value="form.price"
+        />
+      </a-form-item>
+      <a-form-item label="会员卡介绍" name="desc">
+        <a-input
+          allow-clear
+          placeholder="请输入会员卡介绍"
+          v-model:value="form.desc"
+        />
+      </a-form-item>
+      <a-form-item label="会员卡说明" name="info">
+        <a-input
+          allow-clear
+          placeholder="请输入会员卡说明"
+          v-model:value="form.info"
+        />
+      </a-form-item>
+      <a-form-item label="vip卡折扣率" name="discount">
+        <a-input
+          allow-clear
+          placeholder="请输入vip卡折扣率"
+          v-model:value="form.discount"
+        />
+      </a-form-item>
+      <a-form-item label="使用次数" name="count">
+        <a-input
+          allow-clear
+          placeholder="请输入使用次数"
+          v-model:value="form.count"
+        />
+      </a-form-item>
+      <a-form-item label="每使用一次减少的金额" name="eachMoney">
+        <a-input
+          allow-clear
+          placeholder="请输入每使用一次减少的金额"
+          v-model:value="form.eachMoney"
+        />
+      </a-form-item>
+      <a-form-item label="剩余金额" name="remainingMoney">
+        <a-input
+          allow-clear
+          placeholder="请输入剩余金额"
+          v-model:value="form.remainingMoney"
+        />
+      </a-form-item>
+      <a-form-item label="续费累加次数" name="number">
+        <a-input
+          allow-clear
+          placeholder="请输入续费累加次数"
+          v-model:value="form.number"
+        />
+      </a-form-item>
+      <a-form-item label="剩余次数" name="num">
+        <a-input
+          allow-clear
+          placeholder="请输入剩余次数"
+          v-model:value="form.num"
+        />
+      </a-form-item>
+      <a-form-item label="付款状态,1已付款，2未付款" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="会员卡年限" name="term">
+        <a-input
+          allow-clear
+          placeholder="请输入会员卡年限"
+          v-model:value="form.term"
+        />
+      </a-form-item>
+      <a-form-item label="月限" name="month">
+        <a-input
+          allow-clear
+          placeholder="请输入月限"
+          v-model:value="form.month"
+        />
+      </a-form-item>
+      <a-form-item label="IC卡类型：1年卡，2次卡，3月卡，4会员IC卡，5充值卡	" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入IC卡类型：1年卡，2次卡，3月卡，4会员IC卡，5充值卡	"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="卡类型：1成人卡，2儿童卡" name="cardType">
+        <a-input
+          allow-clear
+          placeholder="请输入卡类型：1成人卡，2儿童卡"
+          v-model:value="form.cardType"
+        />
+      </a-form-item>
+      <a-form-item label="vip卡等级类型：1特殊vip卡，2普通vip卡" name="vipType">
+        <a-input
+          allow-clear
+          placeholder="请输入vip卡等级类型：1特殊vip卡，2普通vip卡"
+          v-model:value="form.vipType"
+        />
+      </a-form-item>
+      <a-form-item label="特殊卡开发凭证图" name="pic">
+        <a-input
+          allow-clear
+          placeholder="请输入特殊卡开发凭证图"
+          v-model:value="form.pic"
+        />
+      </a-form-item>
+      <a-form-item label="价格组" name="prices">
+        <a-input
+          allow-clear
+          placeholder="请输入价格组"
+          v-model:value="form.prices"
+        />
+      </a-form-item>
+      <a-form-item label="1微信支付，2支付宝支付，3现金，4POS机刷卡，15平安健康卡" name="payType">
+        <a-input
+          allow-clear
+          placeholder="请输入1微信支付，2支付宝支付，3现金，4POS机刷卡，15平安健康卡"
+          v-model:value="form.payType"
+        />
+      </a-form-item>
+      <a-form-item label="是否赠送积分：1赠送，2不赠送" name="isIntegral">
+        <a-input
+          allow-clear
+          placeholder="请输入是否赠送积分：1赠送，2不赠送"
+          v-model:value="form.isIntegral"
+        />
+      </a-form-item>
+      <a-form-item label="是否已开具发票：1已开发票，2未开发票" name="isInvoice">
+        <a-input
+          allow-clear
+          placeholder="请输入是否已开具发票：1已开发票，2未开发票"
+          v-model:value="form.isInvoice"
+        />
+      </a-form-item>
+      <a-form-item label="vip卡到期时间" name="expireTime">
+        <a-input
+          allow-clear
+          placeholder="请输入vip卡到期时间"
+          v-model:value="form.expireTime"
+        />
+      </a-form-item>
+      <a-form-item label="紧急联系人" name="urgentName">
+        <a-input
+          allow-clear
+          placeholder="请输入紧急联系人"
+          v-model:value="form.urgentName"
+        />
+      </a-form-item>
+      <a-form-item label="紧急联系人号码" name="urgentPhone">
+        <a-input
+          allow-clear
+          placeholder="请输入紧急联系人号码"
+          v-model:value="form.urgentPhone"
+        />
+      </a-form-item>
+      <a-form-item label="卡号" name="cardNum">
+        <a-input
+          allow-clear
+          placeholder="请输入卡号"
+          v-model:value="form.cardNum"
+        />
+      </a-form-item>
+      <a-form-item label="密码" name="password">
+        <a-input
+          allow-clear
+          placeholder="请输入密码"
+          v-model:value="form.password"
+        />
+      </a-form-item>
+      <a-form-item label="使用时间" name="useTime">
+        <a-input
+          allow-clear
+          placeholder="请输入使用时间"
+          v-model:value="form.useTime"
+        />
+      </a-form-item>
+      <a-form-item label="" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.updateTime"
+        />
+      </a-form-item>
+      <a-form-item label="身份证号码" name="idCard">
+        <a-input
+          allow-clear
+          placeholder="请输入身份证号码"
+          v-model:value="form.idCard"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="remark">
+        <a-input
+          allow-clear
+          placeholder="请输入备注"
+          v-model:value="form.remark"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="排序号" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addUserCard, updateUserCard } from '@/api/booking/userCard';
+  import { UserCard } from '@/api/booking/userCard/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: UserCard | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<UserCard>({
+    id: undefined,
+    userId: undefined,
+    sid: undefined,
+    uid: undefined,
+    vid: undefined,
+    aid: undefined,
+    wechatOrder: undefined,
+    code: undefined,
+    name: undefined,
+    username: undefined,
+    phone: undefined,
+    price: undefined,
+    desc: undefined,
+    info: undefined,
+    discount: undefined,
+    count: undefined,
+    eachMoney: undefined,
+    remainingMoney: undefined,
+    number: undefined,
+    num: undefined,
+    status: undefined,
+    term: undefined,
+    month: undefined,
+    type: undefined,
+    cardType: undefined,
+    vipType: undefined,
+    pic: undefined,
+    prices: undefined,
+    payType: undefined,
+    isIntegral: undefined,
+    isInvoice: undefined,
+    expireTime: undefined,
+    urgentName: undefined,
+    urgentPhone: undefined,
+    cardNum: undefined,
+    password: undefined,
+    useTime: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    idCard: undefined,
+    remark: undefined,
+    comments: undefined,
+    sortNumber: undefined,
+    tenantId: undefined,
+    userCardId: undefined,
+    userCardName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    userCardName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写会员卡名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateUserCard : addUserCard;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/userCard/index.vue

@@ -0,0 +1,505 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="userCardId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          :scroll="{ x: 800 }"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a class="ele-text-success">解除绑定</a>
+                <a-divider type="vertical" />
+                <a class="ele-text-warning">变更绑定</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">注销</a>
+                </a-popconfirm>
+                <!--                <a-divider type="vertical" />-->
+                <!--                <a @click="openEdit(record)">修改</a>-->
+                <!--                <a-divider type="vertical" />-->
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <UserCardEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import { EleProTable, formatNumber } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import UserCardEdit from './components/userCardEdit.vue';
+  import {
+    pageUserCard,
+    removeUserCard,
+    removeBatchUserCard
+  } from '@/api/booking/userCard';
+  import type { UserCard, UserCardParam } from '@/api/booking/userCard/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<UserCard[]>([]);
+  // 当前编辑数据
+  const current = ref<UserCard | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageUserCard({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '姓名',
+      dataIndex: 'username',
+      key: 'username',
+      align: 'center',
+      width: 120,
+      fixed: 'left'
+    },
+    {
+      title: 'IC卡号',
+      dataIndex: 'code',
+      key: 'code',
+      width: 120,
+      fixed: 'left',
+      align: 'center'
+    },
+    {
+      title: '手机号码',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: 120,
+      fixed: 'left'
+    },
+    {
+      title: '会员卡名称',
+      dataIndex: 'name',
+      key: 'name',
+      width: 180,
+      align: 'center'
+    },
+    {
+      title: '卡号',
+      dataIndex: 'cardNum',
+      key: 'cardNum',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: '可用场馆',
+      dataIndex: 'sid',
+      key: 'sid',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: '购卡价格',
+      dataIndex: 'price',
+      key: 'price',
+      align: 'center',
+      width: 120,
+      customRender: ({ text }) => `￥${formatNumber(text)}`
+    },
+    {
+      title: '紧急联系人',
+      dataIndex: 'urgentName',
+      key: 'urgentName',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: '紧急联系人号码',
+      dataIndex: 'urgentPhone',
+      key: 'urgentPhone',
+      align: 'center',
+      width: 120
+    },
+    {
+      title: 'vip卡折扣率',
+      dataIndex: 'discount',
+      key: 'discount',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: '使用次数',
+      dataIndex: 'count',
+      key: 'count',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: '剩余次数',
+      dataIndex: 'num',
+      key: 'num',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: '每使用一次减少的金额',
+      dataIndex: 'eachMoney',
+      key: 'eachMoney',
+      width: 120,
+      align: 'center',
+      customRender: ({ text }) => `￥${formatNumber(text)}`
+    },
+    {
+      title: '剩余金额',
+      dataIndex: 'remainingMoney',
+      key: 'remainingMoney',
+      width: 120,
+      align: 'center',
+      customRender: ({ text }) => `￥${formatNumber(text)}`
+    },
+    {
+      title: '月限',
+      dataIndex: 'month',
+      key: 'month',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: '会员卡年限',
+      dataIndex: 'term',
+      key: 'term',
+      width: 120,
+      align: 'center'
+    },
+    {
+      title: 'IC卡类型',
+      dataIndex: 'type',
+      key: 'type',
+      width: 120,
+      align: 'center',
+      customRender: ({ text }) =>
+        ['-', '年卡', '次卡', '月卡', '会员IC卡', '充值卡'][text]
+    },
+    {
+      title: '是否赠送积分',
+      dataIndex: 'isIntegral',
+      key: 'isIntegral',
+      width: 120,
+      align: 'center',
+      customRender: ({ text }) => ['', '赠送', '不赠送'][text]
+    },
+    {
+      title: '支付状态',
+      dataIndex: 'status',
+      key: 'status',
+      width: 120,
+      align: 'center',
+      customRender: ({ text }) => ['未支付', '已支付'][text]
+    },
+    {
+      title: '支付方式',
+      dataIndex: 'payType',
+      key: 'payType',
+      width: 120,
+      align: 'center',
+      customRender: ({ text }) =>
+        [
+          '余额支付',
+          '微信支付',
+          '支付宝支付',
+          '现金',
+          'POS机刷卡',
+          '平安健康卡'
+        ][text]
+    },
+    {
+      title: '是否已开具发票',
+      dataIndex: 'isInvoice',
+      key: 'isInvoice',
+      width: 120,
+      align: 'center',
+      customRender: ({ text }) => ['未开票', '已开票', '未开票'][text]
+    },
+    {
+      title: '到期时间',
+      dataIndex: 'expireTime',
+      key: 'expireTime',
+      align: 'center',
+      width: 180,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm')
+    },
+    {
+      title: '购卡时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      width: 180,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    // {
+    //   title: '用户id（旧）',
+    //   dataIndex: 'uid',
+    //   key: 'uid',
+    //   width: 190,
+    //   align: 'center',
+    // },
+    // {
+    //   title: 'vip卡id',
+    //   dataIndex: 'vid',
+    //   key: 'vid',
+    //   width: 190,
+    //   align: 'center',
+    // },
+    // {
+    //   title: '开卡人id',
+    //   dataIndex: 'aid',
+    //   key: 'aid',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '微信订单号',
+    //   dataIndex: 'wechatOrder',
+    //   key: 'wechatOrder',
+    //   width: 190,
+    //   align: 'center',
+    // },
+    // {
+    //   title: '会员卡介绍',
+    //   dataIndex: 'desc',
+    //   key: 'desc',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '会员卡说明',
+    //   dataIndex: 'info',
+    //   key: 'info',
+    //   width: 490,
+    //   align: 'center',
+    // },
+
+    // {
+    //   title: '续费累加次数',
+    //   dataIndex: 'number',
+    //   key: 'number',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '卡类型：1成人卡，2儿童卡',
+    //   dataIndex: 'cardType',
+    //   key: 'cardType',
+    //   align: 'center',
+    // },
+    // {
+    //   title: 'vip卡等级类型：1特殊vip卡，2普通vip卡',
+    //   dataIndex: 'vipType',
+    //   key: 'vipType',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '特殊卡开发凭证图',
+    //   dataIndex: 'pic',
+    //   key: 'pic',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '价格组',
+    //   dataIndex: 'prices',
+    //   key: 'prices',
+    //   align: 'center',
+    // },
+
+    // {
+    //   title: '密码',
+    //   dataIndex: 'password',
+    //   key: 'password',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '使用时间',
+    //   dataIndex: 'useTime',
+    //   key: 'useTime',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '',
+    //   dataIndex: 'updateTime',
+    //   key: 'updateTime',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '身份证号码',
+    //   dataIndex: 'idCard',
+    //   key: 'idCard',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '备注',
+    //   dataIndex: 'remark',
+    //   key: 'remark',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '备注',
+    //   dataIndex: 'comments',
+    //   key: 'comments',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '排序号',
+    //   dataIndex: 'sortNumber',
+    //   key: 'sortNumber',
+    //   align: 'center'
+    // },
+    {
+      title: '操作',
+      key: 'action',
+      width: 240,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: UserCardParam) => {
+    console.log(where);
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: UserCard) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: UserCard) => {
+    const hide = message.loading('请求中..', 0);
+    removeUserCard(row.userCardId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchUserCard(selection.value.map((d) => d.userCardId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: UserCard) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'UserCard'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/userCardLog/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/userCardLog/components/userCardLogEdit.vue

@@ -0,0 +1,276 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑明细表' : '添加明细表'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="用户ID" name="userId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户ID"
+          v-model:value="form.userId"
+        />
+      </a-form-item>
+      <a-form-item label="IC卡类型：1年卡，2次卡，3月卡，4会员IC卡，5充值卡	" name="type">
+        <a-input
+          allow-clear
+          placeholder="请输入IC卡类型：1年卡，2次卡，3月卡，4会员IC卡，5充值卡	"
+          v-model:value="form.type"
+        />
+      </a-form-item>
+      <a-form-item label="变动金额" name="money">
+        <a-input
+          allow-clear
+          placeholder="请输入变动金额"
+          v-model:value="form.money"
+        />
+      </a-form-item>
+      <a-form-item label="变动后余额" name="balance">
+        <a-input
+          allow-clear
+          placeholder="请输入变动后余额"
+          v-model:value="form.balance"
+        />
+      </a-form-item>
+      <a-form-item label="管理员备注" name="remark">
+        <a-input
+          allow-clear
+          placeholder="请输入管理员备注"
+          v-model:value="form.remark"
+        />
+      </a-form-item>
+      <a-form-item label="订单编号" name="orderNo">
+        <a-input
+          allow-clear
+          placeholder="请输入订单编号"
+          v-model:value="form.orderNo"
+        />
+      </a-form-item>
+      <a-form-item label="操作人ID" name="adminId">
+        <a-input
+          allow-clear
+          placeholder="请输入操作人ID"
+          v-model:value="form.adminId"
+        />
+      </a-form-item>
+      <a-form-item label="排序(数字越小越靠前)" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+      <a-form-item label="状态, 0正常, 1冻结" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="是否删除, 0否, 1是" name="deleted">
+        <a-input
+          allow-clear
+          placeholder="请输入是否删除, 0否, 1是"
+          v-model:value="form.deleted"
+        />
+      </a-form-item>
+      <a-form-item label="商户ID" name="merchantId">
+        <a-input
+          allow-clear
+          placeholder="请输入商户ID"
+          v-model:value="form.merchantId"
+        />
+      </a-form-item>
+      <a-form-item label="商户编码" name="merchantCode">
+        <a-input
+          allow-clear
+          placeholder="请输入商户编码"
+          v-model:value="form.merchantCode"
+        />
+      </a-form-item>
+      <a-form-item label="修改时间" name="updateTime">
+        <a-input
+          allow-clear
+          placeholder="请输入修改时间"
+          v-model:value="form.updateTime"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addUserCardLog, updateUserCardLog } from '@/api/booking/userCardLog';
+  import { UserCardLog } from '@/api/booking/userCardLog/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: UserCardLog | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<UserCardLog>({
+    logId: undefined,
+    userId: undefined,
+    type: undefined,
+    money: undefined,
+    balance: undefined,
+    remark: undefined,
+    orderNo: undefined,
+    adminId: undefined,
+    sortNumber: undefined,
+    comments: undefined,
+    status: undefined,
+    deleted: undefined,
+    merchantId: undefined,
+    merchantCode: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    updateTime: undefined,
+    userCardLogId: undefined,
+    userCardLogName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    userCardLogName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写明细表名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateUserCardLog : addUserCardLog;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/userCardLog/index.vue

@@ -0,0 +1,299 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="userCardLogId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <UserCardLogEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import UserCardLogEdit from './components/userCardLogEdit.vue';
+  import { pageUserCardLog, removeUserCardLog, removeBatchUserCardLog } from '@/api/booking/userCardLog';
+  import type { UserCardLog, UserCardLogParam } from '@/api/booking/userCardLog/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<UserCardLog[]>([]);
+  // 当前编辑数据
+  const current = ref<UserCardLog | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageUserCardLog({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '主键ID',
+      dataIndex: 'logId',
+      key: 'logId',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
+      align: 'center',
+    },
+    {
+      title: 'IC卡类型：1年卡，2次卡，3月卡，4会员IC卡，5充值卡	',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+    },
+    {
+      title: '变动金额',
+      dataIndex: 'money',
+      key: 'money',
+      align: 'center',
+    },
+    {
+      title: '变动后余额',
+      dataIndex: 'balance',
+      key: 'balance',
+      align: 'center',
+    },
+    {
+      title: '管理员备注',
+      dataIndex: 'remark',
+      key: 'remark',
+      align: 'center',
+    },
+    {
+      title: '订单编号',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+      align: 'center',
+    },
+    {
+      title: '操作人ID',
+      dataIndex: 'adminId',
+      key: 'adminId',
+      align: 'center',
+    },
+    {
+      title: '排序(数字越小越靠前)',
+      dataIndex: 'sortNumber',
+      key: 'sortNumber',
+      align: 'center',
+    },
+    {
+      title: '备注',
+      dataIndex: 'comments',
+      key: 'comments',
+      align: 'center',
+    },
+    {
+      title: '状态, 0正常, 1冻结',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+    },
+    {
+      title: '是否删除, 0否, 1是',
+      dataIndex: 'deleted',
+      key: 'deleted',
+      align: 'center',
+    },
+    {
+      title: '商户ID',
+      dataIndex: 'merchantId',
+      key: 'merchantId',
+      align: 'center',
+    },
+    {
+      title: '商户编码',
+      dataIndex: 'merchantCode',
+      key: 'merchantCode',
+      align: 'center',
+    },
+    {
+      title: '注册时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '修改时间',
+      dataIndex: 'updateTime',
+      key: 'updateTime',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: UserCardLogParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: UserCardLog) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: UserCardLog) => {
+    const hide = message.loading('请求中..', 0);
+    removeUserCardLog(row.userCardLogId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchUserCardLog(selection.value.map((d) => d.userCardLogId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: UserCardLog) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'UserCardLog'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/users/components/search.vue

@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>

modules/views/bak/users/components/userEdit.vue

@@ -0,0 +1,331 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑用户' : '添加用户'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="openid" name="openid">
+        <a-input
+          allow-clear
+          placeholder="请输入用户唯一小程序id"
+          :disabled="true"
+          v-model:value="form.openid"
+        />
+      </a-form-item>
+      <a-form-item label="用户秘钥" name="sessionKey">
+        <a-input
+          allow-clear
+          placeholder="请输入小程序用户秘钥"
+          :disabled="true"
+          v-model:value="form.sessionKey"
+        />
+      </a-form-item>
+      <a-form-item label="用户名" name="username">
+        <a-input
+          allow-clear
+          placeholder="请输入用户名"
+          :disabled="true"
+          v-model:value="form.username"
+        />
+      </a-form-item>
+      <a-form-item label="头像地址" name="avatarUrl">
+        <a-input
+          allow-clear
+          placeholder="请输入头像地址"
+          :disabled="true"
+          v-model:value="form.avatarUrl"
+        />
+      </a-form-item>
+      <a-form-item label="1男，2女" name="gender">
+        <a-input
+          allow-clear
+          placeholder="请输入1男，2女"
+          :disabled="true"
+          v-model:value="form.sex"
+        />
+      </a-form-item>
+      <a-form-item label="国家" name="country">
+        <a-input
+          allow-clear
+          placeholder="请输入国家"
+          :disabled="true"
+          v-model:value="form.country"
+        />
+      </a-form-item>
+      <a-form-item label="省份" name="province">
+        <a-input
+          allow-clear
+          placeholder="请输入省份"
+          :disabled="true"
+          v-model:value="form.province"
+        />
+      </a-form-item>
+      <a-form-item label="城市" name="city">
+        <a-input
+          allow-clear
+          placeholder="请输入城市"
+          :disabled="true"
+          v-model:value="form.city"
+        />
+      </a-form-item>
+      <a-form-item label="所在辖区" name="region">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入所在辖区"
+          v-model:value="form.region"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          placeholder="请输入手机号码"
+          :disabled="true"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="邮箱" name="email">
+        <a-input
+          allow-clear
+          placeholder="请输入邮箱"
+          :disabled="true"
+          v-model:value="form.email"
+        />
+      </a-form-item>
+      <a-form-item label="积分" name="points">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入积分"
+          v-model:value="form.points"
+        />
+      </a-form-item>
+      <a-form-item label="余额" name="balance">
+        <a-input
+          allow-clear
+          :disabled="true"
+          placeholder="请输入余额"
+          v-model:value="form.balance"
+        />
+      </a-form-item>
+      <a-form-item label="注册时间" name="addTime">
+        <a-input
+          allow-clear
+          placeholder="请输入注册时间"
+          :disabled="true"
+          v-model:value="form.addTime"
+        />
+      </a-form-item>
+      <a-form-item label="身份证号码" name="idcard">
+        <a-input allow-clear placeholder="请输入" :disabled="true" v-model:value="form.idCard" />
+      </a-form-item>
+      <a-form-item label="真实姓名" name="realName">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          :disabled="true"
+          v-model:value="form.realName"
+        />
+      </a-form-item>
+      <a-form-item label="注册来源" name="platform">
+        <a-input
+          allow-clear
+          placeholder="请输入注册来源客户端 (APP、H5、小程序等)"
+          :disabled="true"
+          v-model:value="form.platform"
+        />
+      </a-form-item>
+      <a-form-item label="排序" name="sortNumber">
+        <a-input-number
+          :min="0"
+          :max="9999"
+          class="ele-fluid"
+          placeholder="请输入排序号"
+          :disabled="true"
+          v-model:value="form.sortNumber"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, toDateString, uuid } from 'ele-admin-pro';
+  import { addUsers, updateUsers } from '@/api/shop/users';
+  import { Users } from '@/api/shop/users/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+  import dayjs from 'dayjs';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Users | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Users>({
+    userId: undefined,
+    openid: undefined,
+    sessionKey: undefined,
+    username: undefined,
+    avatarUrl: undefined,
+    sex: undefined,
+    country: undefined,
+    province: undefined,
+    city: undefined,
+    region: undefined,
+    phone: undefined,
+    email: undefined,
+    emailVerified: undefined,
+    points: undefined,
+    balance: undefined,
+    addTime: undefined,
+    idCard: undefined,
+    realName: undefined,
+    isAdmin: undefined,
+    clientId: undefined,
+    platform: undefined,
+    sortNumber: undefined,
+    comments: undefined,
+    status: undefined,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    userName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写用户名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.avatarUrl = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.avatarUrl = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateUsers : addUsers;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if (props.data.avatarUrl) {
+            images.value.push({
+              uid: uuid(),
+              url: props.data.avatarUrl,
+              status: 'done'
+            });
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/users/components/usersEdit.vue

@@ -0,0 +1,274 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑' : '添加'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="用户唯一小程序id" name="openId">
+        <a-input
+          allow-clear
+          placeholder="请输入用户唯一小程序id"
+          v-model:value="form.openId"
+        />
+      </a-form-item>
+      <a-form-item label="小程序用户秘钥" name="sessionKey">
+        <a-input
+          allow-clear
+          placeholder="请输入小程序用户秘钥"
+          v-model:value="form.sessionKey"
+        />
+      </a-form-item>
+      <a-form-item label="用户名" name="username">
+        <a-input
+          allow-clear
+          placeholder="请输入用户名"
+          v-model:value="form.username"
+        />
+      </a-form-item>
+      <a-form-item label="头像地址" name="avatarUrl">
+        <a-input
+          allow-clear
+          placeholder="请输入头像地址"
+          v-model:value="form.avatarUrl"
+        />
+      </a-form-item>
+      <a-form-item label="1男，2女" name="gender">
+        <a-input
+          allow-clear
+          placeholder="请输入1男，2女"
+          v-model:value="form.gender"
+        />
+      </a-form-item>
+      <a-form-item label="国家" name="country">
+        <a-input
+          allow-clear
+          placeholder="请输入国家"
+          v-model:value="form.country"
+        />
+      </a-form-item>
+      <a-form-item label="省份" name="province">
+        <a-input
+          allow-clear
+          placeholder="请输入省份"
+          v-model:value="form.province"
+        />
+      </a-form-item>
+      <a-form-item label="城市" name="city">
+        <a-input
+          allow-clear
+          placeholder="请输入城市"
+          v-model:value="form.city"
+        />
+      </a-form-item>
+      <a-form-item label="手机号码" name="phone">
+        <a-input
+          allow-clear
+          placeholder="请输入手机号码"
+          v-model:value="form.phone"
+        />
+      </a-form-item>
+      <a-form-item label="积分" name="integral">
+        <a-input
+          allow-clear
+          placeholder="请输入积分"
+          v-model:value="form.integral"
+        />
+      </a-form-item>
+      <a-form-item label="余额" name="money">
+        <a-input
+          allow-clear
+          placeholder="请输入余额"
+          v-model:value="form.money"
+        />
+      </a-form-item>
+      <a-form-item label="" name="idcard">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.idcard"
+        />
+      </a-form-item>
+      <a-form-item label="" name="truename">
+        <a-input
+          allow-clear
+          placeholder="请输入"
+          v-model:value="form.truename"
+        />
+      </a-form-item>
+      <a-form-item label="是否管理员：1是；2否" name="isAdmin">
+        <a-input
+          allow-clear
+          placeholder="请输入是否管理员：1是；2否"
+          v-model:value="form.isAdmin"
+        />
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addUsers, updateUsers } from '@/api/booking/users';
+  import { Users } from '@/api/booking/users/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: Users | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+
+  // 用户信息
+  const form = reactive<Users>({
+    id: undefined,
+    openId: undefined,
+    sessionKey: undefined,
+    username: undefined,
+    avatarUrl: undefined,
+    gender: undefined,
+    country: undefined,
+    province: undefined,
+    city: undefined,
+    phone: undefined,
+    integral: undefined,
+    money: undefined,
+    createTime: undefined,
+    idcard: undefined,
+    truename: undefined,
+    isAdmin: undefined,
+    tenantId: undefined,
+    usersId: undefined,
+    usersName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    usersName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  const { resetFields } = useForm(form, rules);
+
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form
+        };
+        const saveOrUpdate = isUpdate.value ? updateUsers : addUsers;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
+          });
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        if (props.data) {
+          assignObject(form, props.data);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>

modules/views/bak/users/index.vue

@@ -0,0 +1,299 @@
+<template>
+  <div class="page">
+    <div class="ele-body">
+      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+        <ele-pro-table
+          ref="tableRef"
+          row-key="usersId"
+          :columns="columns"
+          :datasource="datasource"
+          :customRow="customRow"
+          tool-class="ele-toolbar-form"
+          class="sys-org-table"
+        >
+          <template #toolbar>
+            <search
+              @search="reload"
+              :selection="selection"
+              @add="openEdit"
+              @remove="removeBatch"
+              @batchMove="openMove"
+            />
+          </template>
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'image'">
+              <a-image :src="record.image" :width="50" />
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space>
+                <a @click="openEdit(record)">修改</a>
+                <a-divider type="vertical" />
+                <a-popconfirm
+                  title="确定要删除此记录吗？"
+                  @confirm="remove(record)"
+                >
+                  <a class="ele-text-danger">删除</a>
+                </a-popconfirm>
+              </a-space>
+            </template>
+          </template>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <UsersEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { createVNode, ref } from 'vue';
+  import { message, Modal } from 'ant-design-vue';
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import type { EleProTable } from 'ele-admin-pro';
+  import { toDateString } from 'ele-admin-pro';
+  import type {
+    DatasourceFunction,
+    ColumnItem
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import Search from './components/search.vue';
+  import UsersEdit from './components/usersEdit.vue';
+  import { pageUsers, removeUsers, removeBatchUsers } from '@/api/booking/users';
+  import type { Users, UsersParam } from '@/api/booking/users/model';
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格选中数据
+  const selection = ref<Users[]>([]);
+  // 当前编辑数据
+  const current = ref<Users | null>(null);
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 是否显示批量移动弹窗
+  const showMove = ref(false);
+  // 加载状态
+  const loading = ref(true);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageUsers({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  // 表格列配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '',
+      dataIndex: 'id',
+      key: 'id',
+      align: 'center',
+      width: 90,
+    },
+    {
+      title: '用户唯一小程序id',
+      dataIndex: 'openId',
+      key: 'openId',
+      align: 'center',
+    },
+    {
+      title: '小程序用户秘钥',
+      dataIndex: 'sessionKey',
+      key: 'sessionKey',
+      align: 'center',
+    },
+    {
+      title: '用户名',
+      dataIndex: 'username',
+      key: 'username',
+      align: 'center',
+    },
+    {
+      title: '头像地址',
+      dataIndex: 'avatarUrl',
+      key: 'avatarUrl',
+      align: 'center',
+    },
+    {
+      title: '1男，2女',
+      dataIndex: 'gender',
+      key: 'gender',
+      align: 'center',
+    },
+    {
+      title: '国家',
+      dataIndex: 'country',
+      key: 'country',
+      align: 'center',
+    },
+    {
+      title: '省份',
+      dataIndex: 'province',
+      key: 'province',
+      align: 'center',
+    },
+    {
+      title: '城市',
+      dataIndex: 'city',
+      key: 'city',
+      align: 'center',
+    },
+    {
+      title: '手机号码',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '积分',
+      dataIndex: 'integral',
+      key: 'integral',
+      align: 'center',
+    },
+    {
+      title: '余额',
+      dataIndex: 'money',
+      key: 'money',
+      align: 'center',
+    },
+    {
+      title: '注册时间',
+      dataIndex: 'createTime',
+      key: 'createTime',
+      align: 'center',
+      sorter: true,
+      ellipsis: true,
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
+    },
+    {
+      title: '',
+      dataIndex: 'idcard',
+      key: 'idcard',
+      align: 'center',
+    },
+    {
+      title: '',
+      dataIndex: 'truename',
+      key: 'truename',
+      align: 'center',
+    },
+    {
+      title: '是否管理员：1是；2否',
+      dataIndex: 'isAdmin',
+      key: 'isAdmin',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      key: 'action',
+      width: 180,
+      fixed: 'right',
+      align: 'center',
+      hideInSetting: true
+    }
+  ]);
+
+  /* 搜索 */
+  const reload = (where?: UsersParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: Users) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  /* 打开批量移动弹窗 */
+  const openMove = () => {
+    showMove.value = true;
+  };
+
+  /* 删除单个 */
+  const remove = (row: Users) => {
+    const hide = message.loading('请求中..', 0);
+    removeUsers(row.usersId)
+      .then((msg) => {
+        hide();
+        message.success(msg);
+        reload();
+      })
+      .catch((e) => {
+        hide();
+        message.error(e.message);
+      });
+  };
+
+  /* 批量删除 */
+  const removeBatch = () => {
+    if (!selection.value.length) {
+      message.error('请至少选择一条数据');
+      return;
+    }
+    Modal.confirm({
+      title: '提示',
+      content: '确定要删除选中的记录吗?',
+      icon: createVNode(ExclamationCircleOutlined),
+      maskClosable: true,
+      onOk: () => {
+        const hide = message.loading('请求中..', 0);
+        removeBatchUsers(selection.value.map((d) => d.usersId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: Users) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  export default {
+    name: 'Users'
+  };
+</script>
+
+<style lang="less" scoped></style>

modules/views/bak/wechatDeposit/components/search.vue

@@ -0,0 +1,48 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-input-search
+      allow-clear
+      v-model:value="where.keywords"
+      placeholder="请输入关键词"
+      @search="search"
+      @pressEnter="search"
+    />
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { watch } from 'vue';
+  import useSearch from '@/utils/use-search';
+  import { WechatDepositParam } from '@/api/shop/wechatDeposit/model';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: WechatDepositParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 表单数据
+  const { where } = useSearch<WechatDepositParam>({
+    keywords: ''
+  });
+
+  /* 搜索 */
+  const search = () => {
+    emit('search', where);
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>