From 9e837bd0ed932f89e4d48c966273f01c1c1335fb Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 20 Sep 2025 10:24:04 +0800
Subject: [PATCH 1/4] 11

---
 .env.development | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index 22cd38b..75886ba 100644
--- a/.env.development
+++ b/.env.development
@@ -11,16 +11,16 @@ ENV = 'development'
 # VITE_ADMIN_PROXY_PATH = http://123.157.250.162:8089/api/ # 测试线上
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
-# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-VITE_ADMIN_PROXY_PATH = http://192.168.101.196:9999 # 邓-本地
+VITE_ADMIN_PROXY_PATH = http://localhost:9999/
+# VITE_ADMIN_PROXY_PATH = http://192.168.101.196:9999 # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
 
 # 图片访问基础地址
 # VITE_IMAGE_BASE_PATH = http://123.157.250.162:8089/api/ # 测试线上
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
-# VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://192.168.101.196:9999 # 邓-本地
+VITE_IMAGE_BASE_PATH = http://localhost:9999
+# VITE_IMAGE_BASE_PATH = http://192.168.101.196:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
 
 # 代码生成服务地址

From e8e4ce3facbb673cead332fcf62c8493a4ab2032 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 20 Sep 2025 15:21:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/act/act-cancel-item.ts                |  41 +++++
 src/views/act/cancel-item/form.vue            | 146 ++++++++++++++++++
 src/views/act/cancel-item/index.vue           | 126 +++++++++++++++
 .../system/sys-user-transaction/index.vue     |  95 ++++--------
 4 files changed, 341 insertions(+), 67 deletions(-)
 create mode 100644 src/api/act/act-cancel-item.ts
 create mode 100644 src/views/act/cancel-item/form.vue
 create mode 100644 src/views/act/cancel-item/index.vue

diff --git a/src/api/act/act-cancel-item.ts b/src/api/act/act-cancel-item.ts
new file mode 100644
index 0000000..cc48a61
--- /dev/null
+++ b/src/api/act/act-cancel-item.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+    return request({
+        url: '/wallet/act/cancel-item/page',
+        method: 'get',
+        params: query
+    })
+}
+
+export function addObj(obj?: Object) {
+    return request({
+        url: '/wallet/act/cancel-item',
+        method: 'post',
+        data: obj
+    })
+}
+
+export function getObj(id?: string) {
+    return request({
+        url: '/wallet/act/cancel-item/' + id,
+        method: 'get'
+    })
+}
+
+export function delObjs(ids?: Object) {
+    return request({
+        url: '/wallet/act/cancel-item',
+        method: 'delete',
+        data: ids
+    })
+}
+
+export function putObj(obj?: Object) {
+    return request({
+        url: '/wallet/act/cancel-item',
+        method: 'put',
+        data: obj
+    })
+}
+
diff --git a/src/views/act/cancel-item/form.vue b/src/views/act/cancel-item/form.vue
new file mode 100644
index 0000000..3c97974
--- /dev/null
+++ b/src/views/act/cancel-item/form.vue
@@ -0,0 +1,146 @@
+<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="活动id" prop="actId">
+        <el-input v-model="form.actId" placeholder="请输入活动id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="24" class="mb20">
+      <el-form-item label="活动商户id" prop="mchId">
+        <el-input v-model="form.mchId" placeholder="请输入活动商户id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="24" class="mb20">
+      <el-form-item label="领取人用户id" prop="receiverUserId">
+        <el-input v-model="form.receiverUserId" placeholder="请输入领取人用户id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="24" class="mb20">
+      <el-form-item label="领取时间" prop="receiverTime">
+        <el-input v-model="form.receiverTime" placeholder="请输入领取时间"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="24" class="mb20">
+      <el-form-item label="活动状态(1:未核销 2:已核销)" prop="actStatus">
+        <el-input v-model="form.actStatus" placeholder="请输入活动状态(1:未核销 2:已核销)"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="24" class="mb20">
+      <el-form-item label="核销人用户id" prop="cancelUserId">
+        <el-input v-model="form.cancelUserId" placeholder="请输入核销人用户id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="24" class="mb20">
+      <el-form-item label="核销时间" prop="cancelTime">
+        <el-input v-model="form.cancelTime" placeholder="请输入核销时间"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="24" class="mb20">
+      <el-form-item label="过期时间" prop="expireTime">
+        <el-input v-model="form.expireTime" placeholder="请输入过期时间"/>
+      </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="ActCancelItemDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/wallet/actCancelItem'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  actId: '',
+	  mchId: '',
+	  receiverUserId: '',
+	  receiverTime: '',
+	  actStatus: '',
+	  cancelUserId: '',
+	  cancelTime: '',
+	  expireTime: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取actCancelItem信息
+  if (id) {
+    form.id = id
+    getactCancelItemData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getactCancelItemData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  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/cancel-item/index.vue b/src/views/act/cancel-item/index.vue
new file mode 100644
index 0000000..752658b
--- /dev/null
+++ b/src/views/act/cancel-item/index.vue
@@ -0,0 +1,126 @@
+<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="receiverUserId">
+            <select-user v-model="state.queryForm.receiverUserId" />
+          </el-form-item>
+          <el-form-item style="width: 300px" label="核销状态" prop="actStatus">
+            <dict-select v-model="state.queryForm.actStatus" dict-code="act_cancel_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-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="mchName" label="活动商户" />
+        <el-table-column prop="receiverUsername" label="领取人" />
+        <el-table-column prop="receiverTime" label="领取时间" />
+        <el-table-column prop="actStatus" label="活动状态">
+          <template #default="{ row }">
+            <dict-tag :options="act_cancel_status" :value="row.actStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="cancelUsername" label="核销人" />
+        <el-table-column prop="cancelTime" label="核销时间" />
+        <el-table-column prop="expireTime" label="过期时间" />
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_actCancelItem_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'wallet_actCancelItem_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="systemActCancelItem">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/act/act-cancel-item";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+const { act_cancel_status } = useDict("act_cancel_status")
+// 定义变量内容
+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: 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/actCancelItem/export', Object.assign(state.queryForm, { ids: selectObjs }), 'actCancelItem.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 delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/admin/system/sys-user-transaction/index.vue b/src/views/admin/system/sys-user-transaction/index.vue
index b8812b0..6b0166c 100644
--- a/src/views/admin/system/sys-user-transaction/index.vue
+++ b/src/views/admin/system/sys-user-transaction/index.vue
@@ -13,65 +13,47 @@
 						<dict-select v-model="state.queryForm.isWalletTransaction" dict-code="yes_no_type" />
 					</el-form-item>
 					<el-form-item style="width: 450px" label="申请时间" prop="createTimeList">
-						<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+						<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+							type="datetimerange" />
 					</el-form-item>
 					<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
-						<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+						<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+							type="datetimerange" />
 					</el-form-item>
 					<el-form-item style="width: 450px" label="自动转账时间" prop="walletTransactionTimeList">
-						<el-date-picker v-model="state.queryForm.walletTransactionTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+						<el-date-picker v-model="state.queryForm.walletTransactionTimeList"
+							value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
 					</el-form-item>
 					<el-form-item>
-						<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+						<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-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'admin_sysUserTransaction_add'"
-					>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+						v-auth="'admin_sysUserTransaction_add'">
 						新 增
 					</el-button>
-					<el-button
-						plain
-						:disabled="multiple"
-						icon="Delete"
-						type="primary"
-						v-auth="'admin_sysUserTransaction_del'"
-						@click="handleDelete(selectObjs)"
-					>
+					<el-button plain :disabled="multiple" icon="Delete" type="primary"
+						v-auth="'admin_sysUserTransaction_del'" @click="handleDelete(selectObjs)">
 						删除
 					</el-button>
 					<div class="flex justify-between items-center">
 						<el-tabs class="flex-1" v-model="activeName" @tab-click="handleClickTabItem">
 							<el-tab-pane v-for="v in tabItems" :key="v.id" :label="v.label" :name="v.value" />
 						</el-tabs>
-						<right-toolbar
-							v-model:showSearch="showSearch"
-							:export="'admin_sysUserTransaction_export'"
-							@exportExcel="exportExcel"
-							class="ml10 mr20"
-							style="float: right"
-							@queryTable="getDataList"
-						/>
+						<right-toolbar v-model:showSearch="showSearch" :export="'admin_sysUserTransaction_export'"
+							@exportExcel="exportExcel" class="ml10 mr20" style="float: right"
+							@queryTable="getDataList" />
 					</div>
 				</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 :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="80" />
 				<el-table-column prop="applyUsername" label="申请人" />
@@ -106,47 +88,26 @@
 						<span v-else class="color-danger">未审核</span>
 					</template>
 				</el-table-column>
-				<el-table-column
-					label="操作"
-					fixed="right"
-					width="250"
-					v-auths="['admin_sysUserTransaction_edit', 'admin_sysUserTransaction_check', 'admin_sysUserTransaction_del']"
-				>
+				<el-table-column label="操作" fixed="right" width="250"
+					v-auths="['admin_sysUserTransaction_edit', 'admin_sysUserTransaction_check', 'admin_sysUserTransaction_del']">
 					<template #default="{ row }">
-						<el-button
-							icon="edit-pen"
-							v-if="row.processStatus == 1"
-							text
-							type="primary"
-							v-auth="'admin_sysUserTransaction_edit'"
-							@click="formDialogRef.openDialog(row.id)"
-						>
+						<el-button icon="edit-pen" v-if="row.processStatus == 1" text type="primary"
+							v-auth="'admin_sysUserTransaction_edit'" @click="formDialogRef.openDialog(row.id)">
 							编辑
 						</el-button>
-						<el-button
-							icon="VideoPlay"
-							v-if="row.processStatus == 1"
-							text
-							type="primary"
-							v-auth="'admin_sysUserTransaction_check'"
-							@click="deal(row)"
-						>
+						<el-button icon="VideoPlay" v-if="row.processStatus == 1" text type="primary"
+							v-auth="'admin_sysUserTransaction_check'" @click="deal(row)">
 							开始处理
 						</el-button>
-						<el-button
-							icon="delete"
-							v-if="row.processStatus == 1"
-							text
-							type="primary"
-							v-auth="'admin_sysUserTransaction_del'"
-							@click="handleDelete([row.id])"
-						>
+						<el-button icon="delete" v-if="row.processStatus == 1" text type="primary"
+							v-auth="'admin_sysUserTransaction_del'" @click="handleDelete([row.id])">
 							删除
 						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
-			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+				v-bind="state.pagination" />
 		</div>
 		<!-- 审批抽屉 -->
 		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />

From 3a6aa37123f3d0b119f36fc18f1ca4bba5276659 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 20 Sep 2025 17:56:49 +0800
Subject: [PATCH 3/4] 11

---
 src/views/act/cancel-item/index.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/act/cancel-item/index.vue b/src/views/act/cancel-item/index.vue
index 752658b..b2fd3ab 100644
--- a/src/views/act/cancel-item/index.vue
+++ b/src/views/act/cancel-item/index.vue
@@ -35,7 +35,7 @@
         <el-table-column prop="cancelUsername" label="核销人" />
         <el-table-column prop="cancelTime" label="核销时间" />
         <el-table-column prop="expireTime" label="过期时间" />
-        <el-table-column label="操作" width="150">
+        <el-table-column label="操作" v-if="false" width="150">
           <template #default="scope">
             <el-button icon="edit-pen" text type="primary" v-auth="'wallet_actCancelItem_edit'"
               @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
@@ -96,11 +96,6 @@ const resetQuery = () => {
   getDataList()
 }
 
-// 导出excel
-const exportExcel = () => {
-  downBlobFile('/wallet/actCancelItem/export', Object.assign(state.queryForm, { ids: selectObjs }), 'actCancelItem.xlsx')
-}
-
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
   selectObjs.value = objs.map(({ id }) => id);

From d48a4a7c3729aa2ac5070297485e42f74b786d98 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 20 Sep 2025 18:03:00 +0800
Subject: [PATCH 4/4] 111

---
 src/views/act/cancel-item/form.vue | 153 ++++++++++++++---------------
 1 file changed, 76 insertions(+), 77 deletions(-)

diff --git a/src/views/act/cancel-item/form.vue b/src/views/act/cancel-item/form.vue
index 3c97974..9fdca96 100644
--- a/src/views/act/cancel-item/form.vue
+++ b/src/views/act/cancel-item/form.vue
@@ -1,71 +1,70 @@
 <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="活动id" prop="actId">
-        <el-input v-model="form.actId" placeholder="请输入活动id"/>
-      </el-form-item>
-      </el-col>
+  <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="活动id" prop="actId">
+            <el-input v-model="form.actId" placeholder="请输入活动id" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="活动商户id" prop="mchId">
-        <el-input v-model="form.mchId" placeholder="请输入活动商户id"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="活动商户id" prop="mchId">
+            <el-input v-model="form.mchId" placeholder="请输入活动商户id" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="领取人用户id" prop="receiverUserId">
-        <el-input v-model="form.receiverUserId" placeholder="请输入领取人用户id"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="领取人用户id" prop="receiverUserId">
+            <el-input v-model="form.receiverUserId" placeholder="请输入领取人用户id" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="领取时间" prop="receiverTime">
-        <el-input v-model="form.receiverTime" placeholder="请输入领取时间"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="领取时间" prop="receiverTime">
+            <el-input v-model="form.receiverTime" placeholder="请输入领取时间" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="活动状态(1:未核销 2:已核销)" prop="actStatus">
-        <el-input v-model="form.actStatus" placeholder="请输入活动状态(1:未核销 2:已核销)"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="活动状态(1:未核销 2:已核销)" prop="actStatus">
+            <el-input v-model="form.actStatus" placeholder="请输入活动状态(1:未核销 2:已核销)" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="核销人用户id" prop="cancelUserId">
-        <el-input v-model="form.cancelUserId" placeholder="请输入核销人用户id"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="核销人用户id" prop="cancelUserId">
+            <el-input v-model="form.cancelUserId" placeholder="请输入核销人用户id" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="核销时间" prop="cancelTime">
-        <el-input v-model="form.cancelTime" placeholder="请输入核销时间"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="核销时间" prop="cancelTime">
+            <el-input v-model="form.cancelTime" placeholder="请输入核销时间" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="过期时间" prop="expireTime">
-        <el-input v-model="form.expireTime" placeholder="请输入过期时间"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="过期时间" prop="expireTime">
+            <el-input v-model="form.expireTime" placeholder="请输入过期时间" />
+          </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>
+      </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="ActCancelItemDialog">
 import { useDict } from '/@/hooks/dict';
 import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/wallet/actCancelItem'
+import * as actCancelItem from "/@/api/act/act-cancel-item";
 import { rule } from '/@/utils/validate';
 const emit = defineEmits(['refresh']);
 
@@ -77,15 +76,15 @@ const loading = ref(false)
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  actId: '',
-	  mchId: '',
-	  receiverUserId: '',
-	  receiverTime: '',
-	  actStatus: '',
-	  cancelUserId: '',
-	  cancelTime: '',
-	  expireTime: '',
+  id: '',
+  actId: '',
+  mchId: '',
+  receiverUserId: '',
+  receiverTime: '',
+  actStatus: '',
+  cancelUserId: '',
+  cancelTime: '',
+  expireTime: '',
 });
 
 // 定义校验规则
@@ -98,9 +97,9 @@ const openDialog = (id: string) => {
   form.id = ''
 
   // 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
 
   // 获取actCancelItem信息
   if (id) {
@@ -111,18 +110,18 @@ const openDialog = (id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
 
-	try {
+  try {
     loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
-	} catch (err: any) {
-		useMessage().error(err.msg);
-	} finally {
+    form.id ? await actCancelItem.putObj(form) : await actCancelItem.addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
     loading.value = false;
   }
 };
@@ -132,7 +131,7 @@ const onSubmit = async () => {
 const getactCancelItemData = (id: string) => {
   // 获取数据
   loading.value = true
-  getObj(id).then((res: any) => {
+  actCancelItem.getObj(id).then((res: any) => {
     Object.assign(form, res.data)
   }).finally(() => {
     loading.value = false