diff --git a/src/api/integrated/notice.ts b/src/api/integrated/notice.ts
index eba63c5..95fae0e 100644
--- a/src/api/integrated/notice.ts
+++ b/src/api/integrated/notice.ts
@@ -1,49 +1,48 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/integrated/notice/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/integrated/notice/page",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/integrated/notice',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/integrated/notice",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/integrated/notice/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/integrated/notice/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/integrated/notice',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/integrated/notice",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/integrated/notice',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/integrated/notice",
+		method: "put",
+		data: obj,
+	})
 }
 
 export function getScreenNoticeList(params?: Object) {
-  return request({
-    url: '/integrated/notice/screen/list',
-    method: 'get',
-    params
-  })
+	return request({
+		url: "/integrated/notice/screen/list",
+		method: "get",
+		params,
+	})
 }
-
diff --git a/src/components/Select/SelectNotice.vue b/src/components/Select/SelectNotice.vue
new file mode 100644
index 0000000..bf8b3ff
--- /dev/null
+++ b/src/components/Select/SelectNotice.vue
@@ -0,0 +1,90 @@
+<template>
+    <el-select style="width: 100%" v-model="selectId" :placeholder="props.placeholder" clearable remote-show-suffix
+        filterable remote :disabled="props.disabled" :remote-method="remoteSearch" :loading="state.loading"
+        @visible-change="(e: boolean) => e && getOptions()" :multiple="props.multiple">
+        <el-option v-for="v in state.options" :key="v.id" :label="`${v.title}`" :value="v.id">
+            <div class="flex items-center">
+                <div class="color-primary"> {{ v.title }}</div>
+            </div>
+        </el-option>
+    </el-select>
+</template>
+
+<script setup lang="ts" name="select-merchant">
+import { reactive } from "vue"
+import * as noticeApi from "/@/api/integrated/notice"
+
+const selectId = defineModel()
+
+const props = withDefaults(
+    defineProps<{
+        placeholder?: string
+        apiParams?: any
+        autoFirst?: boolean
+        disabled?: boolean
+        multiple?: boolean
+    }>(),
+    {
+        placeholder: "请选择",
+        apiParams: {},
+        autoFirst: false,
+        disabled: false,
+        multiple: false
+    },
+)
+
+const queryForm = reactive<any>({
+    name: null,
+    current: 1,
+    size: 9999,
+})
+
+const state = reactive<any>({
+    loading: true,
+    selectId: selectId.value,
+    options: [],
+})
+
+watch(
+    selectId,
+    (newVal, oldValue) => {
+        if (newVal == oldValue) return
+        state.selectId = newVal
+        getOptions()
+    },
+    { immediate: true },
+)
+
+async function getOptions() {
+    try {
+        state.loading = true
+        const _pa = {
+            ...queryForm,
+            ...props.apiParams,
+        }
+        const { data } = await noticeApi.fetchList(_pa)
+        state.options = data.records ?? []
+        if (props.autoFirst && state.options.length != 0) {
+            state.selectId = state.options[0].id
+        }
+    } finally {
+        setTimeout(() => (state.loading = false), 500)
+    }
+}
+
+function remoteSearch(params: string) {
+    if (params != queryForm.name) {
+        queryForm.name = params
+        getOptions()
+    }
+}
+
+function clear() {
+    state.selectId = null
+    getOptions()
+}
+
+onMounted(() => {
+    props.autoFirst && getOptions()
+})
+</script>
diff --git a/src/components/index.ts b/src/components/index.ts
index d91f00b..b2bace0 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -38,6 +38,7 @@ import SelectCabinet from "/@/components/Select/SelectCabinet.vue"
 import SelectMchCatory from "/@/components/Select/SelectMchCatory.vue"
 import SelectCanteenSupplier from "/@/components/Select/SelectCanteenSupplier.vue"
 import SelectWalletInvoice from "/@/components/Select/SelectWalletInvoice.vue"
+import SelectNotice from "/@/components/Select/SelectNotice.vue"
 // 地图组件
 import MapSelect from "/@/components/map/map-select.vue"
 
@@ -98,6 +99,7 @@ export default {
 		app.component("SelectCabinet", SelectCabinet)
 		app.component("SelectCanteenSupplier", SelectCanteenSupplier)
 		app.component("SelectWalletInvoice", SelectWalletInvoice)
+		app.component("SelectNotice", SelectNotice)
 
 		app.component("MapSelect", MapSelect)
 
diff --git a/src/views/act/act-cancel/form.vue b/src/views/act/act-cancel/form.vue
index 4fd8253..2517993 100644
--- a/src/views/act/act-cancel/form.vue
+++ b/src/views/act/act-cancel/form.vue
@@ -1,133 +1,166 @@
 <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-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="mchId">
-            <select-mch v-model="form.mchId" />
-          </el-form-item>
-        </el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="活动公告" prop="noticeId">
+						<select-notice v-model="form.noticeId" />
+					</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="12" class="mb20">
+					<el-form-item label="原价" prop="activeOrgPrice">
+						<el-input-number v-model="form.activeOrgPrice" placeholder="请输入原价" />
+					</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="12" class="mb20">
+					<el-form-item label="活动价" prop="activeCancelPrice">
+						<el-input-number v-model="form.activeCancelPrice" 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 :span="24" class="mb20">
+					<el-form-item label="到期时间" prop="expireTime">
+						<el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择到期时间" v-model="form.expireTime" />
+					</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 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-col :span="24" class="mb20">
+					<el-form-item label="活动标题" prop="actTitle">
+						<el-input v-model="form.actTitle" 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-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']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import * as actCancelApi from "/@/api/act/actCancel"
+import { rule } from "/@/utils/validate"
+import { storePrice, displayPrice } from "/@/utils/formatMoney"
+
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-  id: '',
-  mchId: '',
-  noticeId: '',
-  expireTime: '',
-  actStatus: '',
-  actTitle: '',
-  actContent: '',
-});
+	id: "",
+	mchId: "",
+	noticeId: "",
+	activeOrgPrice: "",
+	activeCancelPrice: "",
+	expireTime: "",
+	actStatus: "",
+	actTitle: "",
+	actContent: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
+	mchId: [{ required: true, message: "活动商户不能为空", trigger: "change" }],
+	noticeId: [{ required: true, message: "活动公告不能为空", trigger: "change" }],
+	activeCancelPrice: [{ required: true, message: "活动价不能为空", trigger: "blur" }],
+	expireTime: [{ required: true, message: "到期时间不能为空", trigger: "change" }],
+	actTitle: [{ required: true, message: "活动标题不能为空", trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
-  nextTick(() => {
-    dataFormRef.value?.resetFields();
-  });
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取actCancel信息
-  if (id) {
-    form.id = id
-    getactCancelData(id)
-  }
-};
+	// 获取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 valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
+	try {
+		loading.value = true
+		const pa = {
+			...form,
+			activeOrgPrice: storePrice(form.activeOrgPrice),
+			activeCancelPrice: storePrice(form.activeCancelPrice),
+		}
+		form.id ? await actCancelApi.putObj(pa) : await actCancelApi.addObj(pa)
+		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
-  })
-};
+	// 获取数据
+	loading.value = true
+	actCancelApi
+		.getObj(id)
+		.then((res: any) => {
+			if (res.data) {
+				if (res.data.activeOrgPrice) {
+					res.data.activeOrgPrice = displayPrice(res.data.activeOrgPrice, "")
+				}
+				if (res.data.activeCancelPrice) {
+					res.data.activeCancelPrice = displayPrice(res.data.activeCancelPrice, "")
+				}
+			}
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
-</script>
\ No newline at end of file
+	openDialog,
+})
+</script>
diff --git a/src/views/act/act-cancel/index.vue b/src/views/act/act-cancel/index.vue
index c93abb8..2d296bd 100644
--- a/src/views/act/act-cancel/index.vue
+++ b/src/views/act/act-cancel/index.vue
@@ -1,80 +1,125 @@
 <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>
+	<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="merchantName" label="活动商户" show-overflow-tooltip />
+				<el-table-column prop="actTitle" label="活动标题" show-overflow-tooltip />
+				<el-table-column prop="expireTime" label="到期时间" show-overflow-tooltip />
+				<el-table-column prop="actStatus" label="活动状态" show-overflow-tooltip>
+					<template #default="{ row }">
+						<dict-tag :options="act_status" :value="row.actStatus" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="actStatus" label="活动状态" min-width="120" align="center">
+					<template #default="{ row }">
+						<el-switch
+							active-value="1"
+							inactive-value="2"
+							active-text="开启活动"
+							inactive-text="关闭活动"
+							v-model="row.actStatus"
+							@change="updateActStatusChange(row)"
+						/>
+					</template>
+				</el-table-column>
+				<el-table-column prop="actStatus" label="预约总数" show-overflow-tooltip>
+					<template #default="{ row }">
+						<span>{{ row.countVo?.totalCount ?? 0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="actStatus" label="核销总数" show-overflow-tooltip>
+					<template #default="{ row }">
+						<span>{{ row.countVo?.cancelCount ?? 0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="actStatus" label="未核销总数" show-overflow-tooltip>
+					<template #default="{ row }">
+						<span>{{ row.countVo?.cancelAwaitCount ?? 0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="150">
+					<template #default="{ row }">
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_actCancel_edit'" @click="formDialogRef.openDialog(row.id)">
+							编辑
+						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_actCancel_del'" @click="handleDelete([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>
+		<!-- 编辑、新增  -->
+		<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';
+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 FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
-
+const { act_status } = useDict("act_status")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -85,54 +130,68 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: actCancelApi.fetchList
+	queryForm: {},
+	pageList: actCancelApi.fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/wallet/actCancel/export', Object.assign(state.queryForm, { ids: selectObjs }), 'actCancel.xlsx')
+	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;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 修改是否在正元显示
+const isSyncZyChange = async (row: any) => {
+	try {
+		await mchManangeApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	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
+	try {
+		await actCancelApi.delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+
+const updateActStatusChange = async (row: any) => {
+	try {
+		await actCancelApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
+</script>
diff --git a/src/views/mch/mch-manage/index.vue b/src/views/mch/mch-manage/index.vue
index 8ae05d3..b658e0e 100644
--- a/src/views/mch/mch-manage/index.vue
+++ b/src/views/mch/mch-manage/index.vue
@@ -1,8 +1,7 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<el-form v-if="showSearch" ref="queryRef" :inline="true" :model="state.queryForm"
-				@keyup.enter="getDataList">
+			<el-form v-if="showSearch" ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 				<el-row>
 					<el-form-item style="width: 250px" label="商户名" prop="name">
 						<el-input v-model="state.queryForm.name" placeholder="商户名" />
@@ -29,22 +28,41 @@
 			</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_mchManage_add'">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchManage_add'">
 						新 增
 					</el-button>
-					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_mchManage_del'"
-						@click="handleDelete(selectObjs)">
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'wallet_mchManage_del'"
+						@click="handleDelete(selectObjs)"
+					>
 						删 除
 					</el-button>
-					<right-toolbar v-model:showSearch="showSearch" :export="'wallet_mchManage_export'"
-						@exportExcel="exportExcel" class="ml10 mr20" style="float: right" @queryTable="getDataList" />
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'wallet_mchManage_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					/>
 				</div>
 			</el-row>
-			<el-table :data="state.dataList" v-loading="state.loading" :header-cell-style="tableStyle.headerCellStyle"
-				:row-class-name="tableRowClassName" @selection-change="selectionChangHandle"
-				@sort-change="sortChangeHandle" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-				:default-expand-all="false" :indent="30" row-key="id">
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				:header-cell-style="tableStyle.headerCellStyle"
+				:row-class-name="tableRowClassName"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+				:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+				:default-expand-all="false"
+				:indent="30"
+				row-key="id"
+			>
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="50" align="center" />
 				<el-table-column prop="name" label="商户名" align="left" min-width="160" />
@@ -63,8 +81,7 @@
 				<el-table-column prop="collectionUrlCode" width="150" align="center" label="商户url收款码">
 					<template #default="{ row }">
 						<div class="flex flex-col justify-center items-center">
-							<preview-image :src="row.collectionUrlCode" download
-								:downloadName="`${row.name} 商户url收款码`" />
+							<preview-image :src="row.collectionUrlCode" download :downloadName="`${row.name} 商户url收款码`" />
 						</div>
 					</template>
 				</el-table-column>
@@ -82,15 +99,24 @@
 				</el-table-column>
 				<el-table-column prop="isSyncZy" label="是否同步正元" min-width="120" align="center">
 					<template #default="{ row }">
-						<el-switch :disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
-							active-value="1" inactive-value="0" v-model="row.isSyncZy" @change="isSyncZyChange(row)" />
+						<el-switch
+							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
+							active-value="1"
+							inactive-value="0"
+							v-model="row.isSyncZy"
+							@change="isSyncZyChange(row)"
+						/>
 					</template>
 				</el-table-column>
 				<el-table-column label="是否在移动端展示" min-width="150" align="center">
 					<template #default="{ row }">
-						<el-switch :disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
-							active-value="1" inactive-value="0" v-model="row.visibleMobile"
-							@change="visibleMobileChange(row)" />
+						<el-switch
+							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
+							active-value="1"
+							inactive-value="0"
+							v-model="row.visibleMobile"
+							@change="visibleMobileChange(row)"
+						/>
 					</template>
 				</el-table-column>
 				<el-table-column width="200" label="支付默认钱包" align="center">
@@ -124,29 +150,28 @@
 				</el-table-column>
 				<el-table-column prop="addressDes" label="地址" :min-width="160" align="center" />
 				<el-table-column prop="createTime" label="创建时间" :min-width="160" align="center" />
-				<el-table-column label="操作" fixed="right"
+				<el-table-column
+					label="操作"
+					fixed="right"
 					v-auths="['wallet_mchManage_refresh_qrcode', 'wallet_mchManage_setting', 'wallet_mchManage_edit', 'wallet_mchManage_del']"
-					min-width="300" align="center">
+					min-width="300"
+					align="center"
+				>
 					<template #default="{ row }">
-						<el-button icon="RefreshRight" text type="primary" v-auth="'wallet_mchManage_refresh_qrcode'"
-							@click="refreshQrcode(row)">
+						<el-button icon="RefreshRight" text type="primary" v-auth="'wallet_mchManage_refresh_qrcode'" @click="refreshQrcode(row)">
 							刷新二维码
 						</el-button>
-						<el-button icon="setting" text type="primary" v-auth="'wallet_mchManage_setting'"
-							@click="settingDialogRef.openDialog(row.id)">
+						<el-button icon="setting" text type="primary" v-auth="'wallet_mchManage_setting'" @click="settingDialogRef.openDialog(row.id)">
 							配置
 						</el-button>
-						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'"
-							@click="formDialogRef.openDialog(row.id)">
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'" @click="formDialogRef.openDialog(row.id)">
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'"
-							@click="handleDelete([row.id])"> 删除 </el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_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>
 
 		<!-- 编辑、新增  -->
diff --git a/src/views/wallet/wallet-setting/components/recharge-package/form.vue b/src/views/wallet/wallet-setting/components/recharge-package/form.vue
index 15fbbf9..7d2bf9c 100644
--- a/src/views/wallet/wallet-setting/components/recharge-package/form.vue
+++ b/src/views/wallet/wallet-setting/components/recharge-package/form.vue
@@ -1,6 +1,7 @@
 <template>
 	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+		<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="name">
@@ -89,7 +90,7 @@ const openDialog = (id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 
 	try {