diff --git a/src/api/act/actCancel.ts b/src/api/act/actCancel.ts
new file mode 100644
index 0000000..b39a6ea
--- /dev/null
+++ b/src/api/act/actCancel.ts
@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/act/act-cancel/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/act/act-cancel",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/act/act-cancel/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/act/act-cancel",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/act/act-cancel",
+		method: "put",
+		data: obj,
+	})
+}
diff --git a/src/views/act/act-cancel/form.vue b/src/views/act/act-cancel/form.vue
new file mode 100644
index 0000000..4fd8253
--- /dev/null
+++ b/src/views/act/act-cancel/form.vue
@@ -0,0 +1,133 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="活动商户" prop="mchId">
+            <select-mch v-model="form.mchId" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="活动公告" prop="noticeId">
+            <el-input v-model="form.noticeId" placeholder="请输入公告id" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="活动标题" prop="actTitle">
+            <el-input v-model="form.actTitle" placeholder="请输入活动标题" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="到期时间" prop="expireTime">
+            <el-date-picker type="date" placeholder="请选择到期时间" v-model="form.expireTime"
+              :value-format="dateStr"></el-date-picker>
+          </el-form-item>
+        </el-col>
+
+        <el-col v-if="false" :span="24" class="mb20">
+          <el-form-item label="活动状态" prop="actStatus">
+            <dict-select v-model="form.actStatus" dict-code="act_status" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="活动内容" prop="actContent">
+            <editor v-if="visible" v-model:get-html="form.actContent" placeholder="请输入活动内容"></editor>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="ActCancelDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import * as  actCancelApi from "/@/api/act/actCancel";
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  mchId: '',
+  noticeId: '',
+  expireTime: '',
+  actStatus: '',
+  actTitle: '',
+  actContent: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取actCancel信息
+  if (id) {
+    form.id = id
+    getactCancelData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await actCancelApi.putObj(form) : await actCancelApi.addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getactCancelData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  actCancelApi.getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/act/act-cancel/index.vue b/src/views/act/act-cancel/index.vue
new file mode 100644
index 0000000..c93abb8
--- /dev/null
+++ b/src/views/act/act-cancel/index.vue
@@ -0,0 +1,138 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row>
+          <el-form-item style="width: 300px" label="活动标题" prop="actTitle">
+            <el-input v-model="state.queryForm.actTitle" placeholder="请输入活动标题" />
+          </el-form-item>
+          <el-form-item style="width: 300px" label="活动商户" prop="mchId">
+            <select-mch v-model="state.queryForm.mchId" />
+          </el-form-item>
+          <el-form-item style="width: 300px" label="活动状态" prop="actStatus">
+            <dict-select v-model="state.queryForm.actStatus" dict-code="act_status" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="Search" type="primary" @click="getDataList">
+              {{ $t("common.queryBtn") }}
+            </el-button>
+            <el-button icon="Refresh" @click="resetQuery">
+              {{ $t("common.resetBtn") }}
+            </el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'wallet_actCancel_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_actCancel_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'wallet_actCancel_export'" @exportExcel="exportExcel"
+            class="ml10 mr20" style="float: right;" @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="mchId" label="活动商户id" show-overflow-tooltip />
+        <el-table-column prop="noticeId" label="公告id" show-overflow-tooltip />
+        <el-table-column prop="expireTime" label="到期时间" show-overflow-tooltip />
+        <el-table-column prop="actStatus" label="活动状态(1:正常 2:关闭)" show-overflow-tooltip />
+        <el-table-column prop="actTitle" label="活动标题" show-overflow-tooltip />
+        <el-table-column prop="actContent" label="活动内容" show-overflow-tooltip />
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_actCancel_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'wallet_actCancel_del'"
+              @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemActCancel">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as  actCancelApi from "/@/api/act/actCancel";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: actCancelApi.fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/wallet/actCancel/export', Object.assign(state.queryForm, { ids: selectObjs }), 'actCancel.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await actCancelApi.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 921a6b9..59eec21 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -6,22 +6,20 @@
 				:defaultTreeWidth="20" :nodeClickable="false">
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
-						<el-row>
-							<el-form-item style="width: 300px" label="用户" prop="userId">
-								<select-user v-model="state.queryForm.userId" />
-							</el-form-item>
-							<el-form-item style="width: 200px" label="饭卡卡号" prop="cardNumber">
-								<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
-							</el-form-item>
-							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
-									clearable />
-							</el-form-item>
-							<el-form-item>
-								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
-								}}</el-button>
-								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
-							</el-form-item>
+						<select-user v-model="state.queryForm.userId" />
+						<el-form-item style="width: 300px" label="用户" prop="userId">
+						</el-form-item>
+						<el-form-item style="width: 200px" label="饭卡卡号" prop="cardNumber">
+							<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+						</el-form-item>
+						<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
+							<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+						</el-form-item>
+						<el-form-item>
+							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
+							}}</el-button>
+							<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+						</el-form-item>
 						</el-row>
 					</el-form>
 					<el-row>