diff --git a/src/api/wallet/mch-dept-user.ts b/src/api/wallet/mch-dept-user.ts
new file mode 100644
index 0000000..3265ca5
--- /dev/null
+++ b/src/api/wallet/mch-dept-user.ts
@@ -0,0 +1,56 @@
+import request from "/@/utils/request"
+
+export function asyncAll(query?: Object) {
+	return request({
+		url: "/wallet/mch-dept-user/sync-all",
+		method: "get",
+		params: query,
+	})
+}
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/mch-dept-user/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function pageJoin(query?: Object) {
+	return request({
+		url: "/wallet/mch-dept-user/page-join",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/mch-dept-user",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/mch-dept-user/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/mch-dept-user",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/mch-dept-user",
+		method: "put",
+		data: obj,
+	})
+}
diff --git a/src/views/mch/mch-dept-user/form.vue b/src/views/mch/mch-dept-user/form.vue
new file mode 100644
index 0000000..75b0331
--- /dev/null
+++ b/src/views/mch/mch-dept-user/form.vue
@@ -0,0 +1,109 @@
+<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="12" 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="12" class="mb20">
+					<el-form-item label="用户id" prop="userId">
+						<el-input v-model="form.userId" placeholder="请输入用户id" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="用户部门id" prop="userDeptId">
+						<el-input v-model="form.userDeptId" placeholder="请输入用户部门id" />
+					</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="MchDeptUserDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/wallet/mch-dept-user"
+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: "",
+	userId: "",
+	userDeptId: "",
+})
+
+// 定义校验规则
+const dataRules = ref({})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.id = ""
+
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+
+	// 获取mchDeptUser信息
+	if (id) {
+		form.id = id
+		getmchDeptUserData(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 getmchDeptUserData = (id: string) => {
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>
diff --git a/src/views/mch/mch-dept-user/index.vue b/src/views/mch/mch-dept-user/index.vue
new file mode 100644
index 0000000..ff51b6e
--- /dev/null
+++ b/src/views/mch/mch-dept-user/index.vue
@@ -0,0 +1,174 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="RefreshLeft" type="primary" class="ml10" @click="syncAll"> 同步全部 </el-button>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchDeptUser_add'">
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'wallet_mchDeptUser_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'wallet_mchDeptUser_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="商户">
+					<template #default="{ row }">
+						<div class="status">
+							<span>商户id</span>
+							<span>1111</span>
+						</div>
+						<div class="status">
+							<span>商户名</span>
+							<span>1111</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="userId" label="用户">
+					<template #default="{ row }">
+						<div class="status">
+							<span>用户id</span>
+							<span>1111</span>
+						</div>
+						<div class="status">
+							<span>用户名</span>
+							<span>1111</span>
+						</div></template
+					>
+				</el-table-column>
+				<el-table-column prop="userId" label="用户部门">
+					<template #default="{ row }">
+						<div class="status">
+							<span>用户部门id</span>
+							<span>1111</span>
+						</div>
+						<div class="status">
+							<span>用户部门</span>
+							<span>1111</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'wallet_mchDeptUser_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_mchDeptUser_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="systemMchDeptUser">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as mchDeptUserApi from "/@/api/wallet/mch-dept-user"
+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: mchDeptUserApi.pageJoin,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 同步全部
+const syncAll = async () => {
+	try {
+		await useMessageBox().confirm("是否同步全部")
+	} catch {
+		return
+	}
+	mchDeptUserApi.asyncAll()
+}
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/wallet/mchDeptUser/export", Object.assign(state.queryForm, { ids: selectObjs }), "mchDeptUser.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 mchDeptUserApi.delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+</script>
diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue
index 17b4819..aaad5da 100644
--- a/src/views/mch/mch-manage/form.vue
+++ b/src/views/mch/mch-manage/form.vue
@@ -1,127 +1,178 @@
 <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-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="110px" v-loading="loading">
 			<el-row :gutter="24">
-				<el-col :span="12" class="mb20">
-					<el-form-item label="绑定的部门id" prop="deptId">
-						<el-select v-model="form.deptId" placeholder="请选择绑定的部门id">
-							<el-option label="请选择">0</el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
+				<el-col :span="24" class="mb20">
 					<el-form-item label="商户名" prop="name">
-						<el-input v-model="form.name" placeholder="请输入商户名" />
+						<el-input v-model.trim="form.name" placeholder="请输入商户名" />
 					</el-form-item>
 				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="店铺类型,逗号分隔" prop="types">
-						<el-select v-model="form.types" placeholder="请选择店铺类型,逗号分隔">
-							<el-option label="请选择">0</el-option>
-						</el-select>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="部门" prop="deptId">
+						<select-dept v-model="form.deptId" placeholder="请选择部门" />
 					</el-form-item>
 				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="商户logo图片" prop="logoPic">
-						<upload-img v-model="form.logoPic"></upload-img>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="商户类型" prop="merchantType">
+						<el-radio-group v-model="form.merchantType">
+							<el-radio
+								:label="item.value"
+								:disabled="merchantTypeRadioDisabled"
+								v-for="(item, index) in merchant_type"
+								border
+								:key="index"
+								@click="handleClickRadio(item.value)"
+							>
+								{{ item.label }}
+							</el-radio>
+						</el-radio-group>
 					</el-form-item>
 				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="商户轮播图,逗号分隔" prop="swiperPic">
-						<upload-img v-model="form.swiperPic"></upload-img>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="商户logo" prop="logoPic">
+						<upload-img v-model:imageUrl="form.logoPic" />
 					</el-form-item>
 				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="商户手机号" prop="phone">
-						<el-input v-model="form.phone" placeholder="请输入商户手机号" />
+				<el-col :span="24" class="mb20">
+					<el-form-item label="轮播图" prop="swiperPic">
+						<upload-imgs v-model="form.swiperPic" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="12" class="mb20">
-					<el-form-item label="商户开始营业时间" prop="jobStartTime">
-						<el-input v-model="form.jobStartTime" placeholder="请输入商户开始营业时间" />
+					<el-form-item prop="sort">
+						<template #label>
+							<span>排序</span>
+							<tip content="越大越在前" />
+						</template>
+						<el-input-number v-model="form.sort" placeholder="" />
 					</el-form-item>
 				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="商户结束营业时间" prop="jobEndTime">
-						<el-input v-model="form.jobEndTime" placeholder="请输入商户结束营业时间" />
+				<el-col :span="24" class="mb20">
+					<el-form-item label="联系电话" prop="phone">
+						<el-input v-model.trim="form.phone" placeholder="请输入联系电话" />
 					</el-form-item>
 				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="商户地址" prop="addressDes">
-						<el-input type="textarea" v-model="form.addressDes" placeholder="请输入商户地址" />
+				<el-col :span="24" class="mb20">
+					<el-form-item label="营业时间：" class="my-0" />
+					<el-form-item class="ml-2" label="早上" prop="jobTime">
+						<el-time-picker
+							v-model="jobTime.morning"
+							placeholder="请选择营业时间"
+							is-range
+							range-separator="至"
+							start-placeholder="开始日期"
+							end-placeholder="结束日期"
+							value-format="HH:mm"
+							format="HH:mm"
+						/>
+					</el-form-item>
+					<el-form-item class="ml-2" label="中午" prop="jobTime">
+						<el-time-picker
+							v-model="jobTime.noon"
+							placeholder="请选择营业时间"
+							is-range
+							range-separator="至"
+							start-placeholder="开始日期"
+							end-placeholder="结束日期"
+							value-format="HH:mm"
+							format="HH:mm"
+						/>
+					</el-form-item>
+					<el-form-item class="ml-2" label="晚上" prop="jobTime">
+						<el-time-picker
+							v-model="jobTime.evening"
+							placeholder="请选择营业时间"
+							is-range
+							range-separator="至"
+							start-placeholder="开始日期"
+							end-placeholder="结束日期"
+							value-format="HH:mm"
+							format="HH:mm"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="店铺地址" prop="addressDes">
+						<el-input type="textarea" v-model.trim="form.addressDes" 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>
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
 		</template>
 	</el-dialog>
 </template>
 
-<script setup lang="ts" name="MchManageDialog">
+<script setup lang="ts" name="MerchantInfoDialog">
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "../../../api/mch/mch-manage"
-import { rule } from "/@/utils/validate"
+import { getObj, addObj, putObj } from "/@/api/wallet/mch-manage"
 const emit = defineEmits(["refresh"])
+import { useUserInfo } from "/@/stores/userInfo"
 
 // 定义变量内容
 const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
+
 // 定义字典
+const { merchant_type } = useDict("merchant_type")
 
 // 提交表单数据
 const form = reactive({
 	id: "",
 	deptId: "",
 	name: "",
-	types: "",
+	merchantType: "",
 	logoPic: "",
+	collectMoneyCode: "",
 	swiperPic: "",
+	isSyncZy: "0",
+	visibleMobile: "0",
 	phone: "",
-	jobStartTime: "",
-	jobEndTime: "",
+	businessTime: "",
 	addressDes: "",
+	sort: 0,
 })
+const jobTime = reactive<{
+	[key: string]: string[]
+}>({
+	morning: [],
+	noon: [],
+	evening: [],
+})
+const merchantTypeRadioDisabled = ref(false)
 
 // 定义校验规则
 const dataRules = ref({
-	name: [
-		{ required: true, message: "商户名不能为空", trigger: "blur" },
-		{ validator: rule.chinese, trigger: "blur" },
-	],
-	types: [{ required: true, message: "店铺类型,逗号分隔不能为空", trigger: "blur" }],
-	logoPic: [{ required: true, message: "商户logo图片不能为空", trigger: "blur" }],
-	phone: [{ validator: rule.mobilePhone, trigger: "blur" }],
+	name: [{ required: true, message: "商户名不能为空", trigger: "blur" }],
+	types: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
+	logoPic: [{ required: true, message: "请上传商户logo", trigger: "blur" }],
+	swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "blur" }],
+	rangeDate: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
+	deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
+	merchantType: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
+	sort: [{ required: true, message: "请输入排序", trigger: "blur" }],
+	// jobTime: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
 })
 
 // 打开弹窗
-const openDialog = (id: string) => {
+const openDialog = async (id: string) => {
 	visible.value = true
 	form.id = ""
 
 	// 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields()
-	})
+	dataFormRef.value?.resetFields()
+	for (const key in jobTime) {
+		jobTime[key] = []
+	}
 
-	// 获取mchManage信息
+	// 获取merchantInfo信息
 	if (id) {
 		form.id = id
-		getmchManageData(id)
+		await getmerchantInfoData(id)
 	}
 }
 
@@ -129,10 +180,15 @@ const openDialog = (id: string) => {
 const onSubmit = async () => {
 	const valid = await dataFormRef.value.validate().catch(() => {})
 	if (!valid) return false
-
+	const _pa = {
+		...form,
+		isSyncZy: form.isSyncZy ? "1" : "0",
+		types: form.merchantType,
+		jobTime: (jobTime.morning?.join("-") || "") + "," + (jobTime.noon?.join("-") || "") + "," + (jobTime.evening?.join("-") || ""),
+	}
 	try {
 		loading.value = true
-		form.id ? await putObj(form) : await addObj(form)
+		form.id ? await putObj(_pa) : await addObj(_pa)
 		useMessage().success(form.id ? "修改成功" : "添加成功")
 		visible.value = false
 		emit("refresh")
@@ -144,16 +200,37 @@ const onSubmit = async () => {
 }
 
 // 初始化表单数据
-const getmchManageData = (id: string) => {
-	// 获取数据
+const getmerchantInfoData = async (id: string) => {
 	loading.value = true
-	getObj(id)
-		.then((res: any) => {
-			Object.assign(form, res.data)
-		})
-		.finally(() => {
-			loading.value = false
-		})
+	try {
+		const res = await getObj(id)
+		if (res.code === 0) {
+			const regex = /^.*?,.*?,.*?$/
+			const resJobTime = res.data.jobTime && regex.test(res.data.jobTime) ? res.data.jobTime.split(",") : []
+			Object.assign(form, res.data, {
+				merchantType: res.data.types,
+				isSyncZy: res.data.isSyncZy == "1" ? true : false,
+			})
+			jobTime.morning = resJobTime[0]?.split("-") ?? []
+			jobTime.noon = resJobTime[1]?.split("-") ?? []
+			jobTime.evening = resJobTime[2]?.split("-") ?? []
+		}
+	} catch (error: any) {
+		useMessage().error(error.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 点击商户类型单选按钮
+const handleClickRadio = (radioItemValue: string) => {
+	if (radioItemValue === form.merchantType) {
+		form.merchantType = ""
+		merchantTypeRadioDisabled.value = true
+		setTimeout(() => {
+			merchantTypeRadioDisabled.value = false
+		}, 0)
+	}
 }
 
 // 暴露变量
diff --git a/src/views/mch/mch-manage/index.vue b/src/views/mch/mch-manage/index.vue
index 3d318d1..a4451c4 100644
--- a/src/views/mch/mch-manage/index.vue
+++ b/src/views/mch/mch-manage/index.vue
@@ -1,22 +1,51 @@
 <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="name">
+						<el-input v-model="state.queryForm.name" placeholder="商户名" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="商户类型" prop="types">
+						<dict-select v-model="state.queryForm.types" dict-code="merchant_type" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="是否显示在移动端" prop="visibleMobile">
+						<dict-select v-model="state.queryForm.visibleMobile" dict-code="yes_no_type" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="是否同步正元" prop="isSyncZy">
+						<dict-select v-model="state.queryForm.isSyncZy" dict-code="yes_no_type" />
+					</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="'mch_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="'mch_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="'mch_mchManage_export'"
+						:export="'wallet_mchManage_export'"
 						@exportExcel="exportExcel"
 						class="ml10 mr20"
 						style="float: right"
 						@queryTable="getDataList"
-					></right-toolbar>
+					/>
 				</div>
 			</el-row>
 			<el-table
@@ -29,16 +58,95 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
-				<el-table-column prop="deptId" label="绑定的部门id" show-overflow-tooltip />
-				<el-table-column prop="name" label="商户名" show-overflow-tooltip />
-				<el-table-column prop="types" label="店铺类型,逗号分隔" show-overflow-tooltip />
-				<el-table-column label="操作" width="150">
-					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'mch_mchManage_edit'" @click="formDialogRef.openDialog(scope.row.id)"
-							>编辑</el-button
-						>
-						<el-button icon="delete" text type="primary" v-auth="'mch_mchManage_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+				<el-table-column type="index" label="#" width="50" />
+				<el-table-column prop="name" label="商户名" min-width="120" />
+				<el-table-column prop="logoPic" label="logo">
+					<template #default="{ row }">
+						<preview-image :src="row.logoPic" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="collectionCode" width="150" label="商户收款二维码" show-overflow-tooltip>
+					<template #default="{ row }">
+						<div class="flex flex-col justify-center items-center">
+							<preview-image :src="row.collectionCode" />
+							<el-button size="small" type="primary" link @click="downloadCollectionCode(row)">下载</el-button>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip :min-width="100">
+					<template #default="{ row }">
+						<div class="flex justify-center items-center">
+							<div v-for="(v, i) in row.types?.split(',')" :key="i" class="mr-1">
+								<dict-tag :options="merchant_type" :value="v" />
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="200" label="支付默认钱包">
+					<template #default="{ row }">
+						<div class="flex items-center justify-center">
+							<div class="color-primary">{{ row.walletTypeName }}</div>
+							<div class="flex items-center just ml5">
+								<dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="deptName" label="部门" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="phone" label="联系电话" :min-width="120" />
+				<el-table-column prop="sort" label="排序" :min-width="100">
+					<template #default="{ row }">
+						<span class="color-success">{{ row.sort }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="mchCount" label="分店数量" :min-width="100">
+					<template #default="{ row }">
+						<span class="color-primary">{{ row.mchCount || 0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="businessTime" label="营业时间" :min-width="160">
+					<template #default="{ row }">
+						<div>{{ row.jobTime?.split(",")[0] ? "早上：" + row.jobTime?.split(",")[0] : "" }}</div>
+						<div>{{ row.jobTime?.split(",")[1] ? "中午：" + row.jobTime?.split(",")[1] : "" }}</div>
+						<div>{{ row.jobTime?.split(",")[2] ? "晚上：" + row.jobTime?.split(",")[2] : "" }}</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="addressDes" label="地址" show-overflow-tooltip :min-width="160" />
+				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" />
+				<el-table-column prop="isSyncZy" label="是否同步正元" min-width="120">
+					<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)"
+						/>
+					</template>
+				</el-table-column>
+				<el-table-column label="是否在移动端展示" min-width="150">
+					<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)"
+						/>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" fixed="right" min-width="300">
+					<template #default="{ 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>
+						<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>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -47,21 +155,27 @@
 
 		<!-- 编辑、新增  -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+		<!-- 商户配置 -->
+		<Setting ref="settingDialogRef" @refresh="getDataList(false)" />
 	</div>
 </template>
 
-<script setup lang="ts" name="systemMchManage">
+<script setup lang="ts" name="MchManage">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "../../../api/mch/mch-manage"
+import * as mchManangeApi from "/@/api/wallet/mch-manage"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
+import FormDialog from "./form.vue"
+import Setting from "./setting.vue"
+import { useUserInfo } from "/@/stores/userInfo"
+import { downBlobFile as downCollectionCodeBlobFile } from "/@/utils/other"
 
-// 引入组件
-const FormDialog = defineAsyncComponent(() => import("./form.vue"))
-// 定义查询字典
+const { merchant_type, wallet_type, yes_no_type } = useDict("merchant_type", "wallet_type", "yes_no_type")
 
 // 定义变量内容
 const formDialogRef = ref()
+const settingDialogRef = ref()
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
@@ -71,7 +185,7 @@ const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
-	pageList: fetchList,
+	pageList: mchManangeApi.pageJoin,
 })
 
 //  table hook
@@ -86,9 +200,47 @@ const resetQuery = () => {
 	getDataList()
 }
 
+// 重新生成正元二位啊吗
+const refreshQrcode = async (row: any) => {
+	try {
+		await useMessageBox().confirm("是否重新生成正元二维码")
+	} catch (e) {
+		return
+	}
+	try {
+		await mchManangeApi.refreshQrcode({ mchId: row.id })
+		getDataList()
+		useMessage().success("生成成功")
+	} catch (e) {
+		useMessage().error("生成失败")
+	}
+}
+
+// 修改是否在正元显示
+const isSyncZyChange = async (row: any) => {
+	try {
+		await mchManangeApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
+
+// 修改是否在移动端显示
+const visibleMobileChange = async (row: any) => {
+	try {
+		await mchManangeApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
+
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/mch/mchManage/export", Object.assign(state.queryForm, { ids: selectObjs }), "商户管理.xlsx")
+	downBlobFile("/canteen/merchantInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "商户管理.xlsx")
 }
 
 // 多选事件
@@ -113,4 +265,36 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
+
+// 点击二维码下载
+const downloadCollectionCode = (row: any) => {
+	if (!row.collectionCode) return useMessage().error("二维码链接不存在")
+	downCollectionCodeBlobFile(row.collectionCode, {}, `${row.name} 收款二维码.png`)
+}
 </script>
+
+<style scoped lang="scss">
+.status {
+	display: flex;
+	align-items: center;
+	margin-bottom: 2px;
+
+	span {
+		display: inline-block;
+	}
+
+	span:nth-child(1) {
+		min-width: 60px;
+		max-width: 100px;
+		text-align: left;
+	}
+
+	span:nth-child(2) {
+		flex: 1;
+		min-width: 50px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+}
+</style>
diff --git a/src/views/wallet/mch-manage/mch-rule-config-form.vue b/src/views/mch/mch-manage/mch-rule-config-form.vue
similarity index 100%
rename from src/views/wallet/mch-manage/mch-rule-config-form.vue
rename to src/views/mch/mch-manage/mch-rule-config-form.vue
diff --git a/src/views/wallet/mch-manage/mch-rule-config.vue b/src/views/mch/mch-manage/mch-rule-config.vue
similarity index 100%
rename from src/views/wallet/mch-manage/mch-rule-config.vue
rename to src/views/mch/mch-manage/mch-rule-config.vue
diff --git a/src/views/wallet/mch-manage/setting.vue b/src/views/mch/mch-manage/setting.vue
similarity index 100%
rename from src/views/wallet/mch-manage/setting.vue
rename to src/views/mch/mch-manage/setting.vue
diff --git a/src/views/wallet/mch-manage/form.vue b/src/views/wallet/mch-manage/form.vue
deleted file mode 100644
index aaad5da..0000000
--- a/src/views/wallet/mch-manage/form.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-	<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="110px" v-loading="loading">
-			<el-row :gutter="24">
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商户名" prop="name">
-						<el-input v-model.trim="form.name" placeholder="请输入商户名" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" class="mb20">
-					<el-form-item label="部门" prop="deptId">
-						<select-dept v-model="form.deptId" placeholder="请选择部门" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商户类型" prop="merchantType">
-						<el-radio-group v-model="form.merchantType">
-							<el-radio
-								:label="item.value"
-								:disabled="merchantTypeRadioDisabled"
-								v-for="(item, index) in merchant_type"
-								border
-								:key="index"
-								@click="handleClickRadio(item.value)"
-							>
-								{{ item.label }}
-							</el-radio>
-						</el-radio-group>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商户logo" prop="logoPic">
-						<upload-img v-model:imageUrl="form.logoPic" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" class="mb20">
-					<el-form-item label="轮播图" prop="swiperPic">
-						<upload-imgs v-model="form.swiperPic" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="12" class="mb20">
-					<el-form-item prop="sort">
-						<template #label>
-							<span>排序</span>
-							<tip content="越大越在前" />
-						</template>
-						<el-input-number v-model="form.sort" placeholder="" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" class="mb20">
-					<el-form-item label="联系电话" prop="phone">
-						<el-input v-model.trim="form.phone" placeholder="请输入联系电话" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" class="mb20">
-					<el-form-item label="营业时间：" class="my-0" />
-					<el-form-item class="ml-2" label="早上" prop="jobTime">
-						<el-time-picker
-							v-model="jobTime.morning"
-							placeholder="请选择营业时间"
-							is-range
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							value-format="HH:mm"
-							format="HH:mm"
-						/>
-					</el-form-item>
-					<el-form-item class="ml-2" label="中午" prop="jobTime">
-						<el-time-picker
-							v-model="jobTime.noon"
-							placeholder="请选择营业时间"
-							is-range
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							value-format="HH:mm"
-							format="HH:mm"
-						/>
-					</el-form-item>
-					<el-form-item class="ml-2" label="晚上" prop="jobTime">
-						<el-time-picker
-							v-model="jobTime.evening"
-							placeholder="请选择营业时间"
-							is-range
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							value-format="HH:mm"
-							format="HH:mm"
-						/>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" class="mb20">
-					<el-form-item label="店铺地址" prop="addressDes">
-						<el-input type="textarea" v-model.trim="form.addressDes" placeholder="请输入店铺地址" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<template #footer>
-			<el-button @click="visible = false">取消</el-button>
-			<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-		</template>
-	</el-dialog>
-</template>
-
-<script setup lang="ts" name="MerchantInfoDialog">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/wallet/mch-manage"
-const emit = defineEmits(["refresh"])
-import { useUserInfo } from "/@/stores/userInfo"
-
-// 定义变量内容
-const dataFormRef = ref()
-const visible = ref(false)
-const loading = ref(false)
-
-// 定义字典
-const { merchant_type } = useDict("merchant_type")
-
-// 提交表单数据
-const form = reactive({
-	id: "",
-	deptId: "",
-	name: "",
-	merchantType: "",
-	logoPic: "",
-	collectMoneyCode: "",
-	swiperPic: "",
-	isSyncZy: "0",
-	visibleMobile: "0",
-	phone: "",
-	businessTime: "",
-	addressDes: "",
-	sort: 0,
-})
-const jobTime = reactive<{
-	[key: string]: string[]
-}>({
-	morning: [],
-	noon: [],
-	evening: [],
-})
-const merchantTypeRadioDisabled = ref(false)
-
-// 定义校验规则
-const dataRules = ref({
-	name: [{ required: true, message: "商户名不能为空", trigger: "blur" }],
-	types: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
-	logoPic: [{ required: true, message: "请上传商户logo", trigger: "blur" }],
-	swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "blur" }],
-	rangeDate: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
-	deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
-	merchantType: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
-	sort: [{ required: true, message: "请输入排序", trigger: "blur" }],
-	// jobTime: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
-})
-
-// 打开弹窗
-const openDialog = async (id: string) => {
-	visible.value = true
-	form.id = ""
-
-	// 重置表单数据
-	dataFormRef.value?.resetFields()
-	for (const key in jobTime) {
-		jobTime[key] = []
-	}
-
-	// 获取merchantInfo信息
-	if (id) {
-		form.id = id
-		await getmerchantInfoData(id)
-	}
-}
-
-// 提交
-const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
-	if (!valid) return false
-	const _pa = {
-		...form,
-		isSyncZy: form.isSyncZy ? "1" : "0",
-		types: form.merchantType,
-		jobTime: (jobTime.morning?.join("-") || "") + "," + (jobTime.noon?.join("-") || "") + "," + (jobTime.evening?.join("-") || ""),
-	}
-	try {
-		loading.value = true
-		form.id ? await putObj(_pa) : await addObj(_pa)
-		useMessage().success(form.id ? "修改成功" : "添加成功")
-		visible.value = false
-		emit("refresh")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	} finally {
-		loading.value = false
-	}
-}
-
-// 初始化表单数据
-const getmerchantInfoData = async (id: string) => {
-	loading.value = true
-	try {
-		const res = await getObj(id)
-		if (res.code === 0) {
-			const regex = /^.*?,.*?,.*?$/
-			const resJobTime = res.data.jobTime && regex.test(res.data.jobTime) ? res.data.jobTime.split(",") : []
-			Object.assign(form, res.data, {
-				merchantType: res.data.types,
-				isSyncZy: res.data.isSyncZy == "1" ? true : false,
-			})
-			jobTime.morning = resJobTime[0]?.split("-") ?? []
-			jobTime.noon = resJobTime[1]?.split("-") ?? []
-			jobTime.evening = resJobTime[2]?.split("-") ?? []
-		}
-	} catch (error: any) {
-		useMessage().error(error.msg)
-	} finally {
-		loading.value = false
-	}
-}
-
-// 点击商户类型单选按钮
-const handleClickRadio = (radioItemValue: string) => {
-	if (radioItemValue === form.merchantType) {
-		form.merchantType = ""
-		merchantTypeRadioDisabled.value = true
-		setTimeout(() => {
-			merchantTypeRadioDisabled.value = false
-		}, 0)
-	}
-}
-
-// 暴露变量
-defineExpose({
-	openDialog,
-})
-</script>
diff --git a/src/views/wallet/mch-manage/index.vue b/src/views/wallet/mch-manage/index.vue
deleted file mode 100644
index 085ef6d..0000000
--- a/src/views/wallet/mch-manage/index.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<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="name">
-						<el-input v-model="state.queryForm.name" placeholder="商户名" />
-					</el-form-item>
-					<el-form-item style="width: 300px" label="商户类型" prop="types">
-						<dict-select v-model="state.queryForm.types" dict-code="merchant_type" />
-					</el-form-item>
-					<el-form-item style="width: 300px" label="是否显示在移动端" prop="visibleMobile">
-						<dict-select v-model="state.queryForm.visibleMobile" dict-code="yes_no_type" />
-					</el-form-item>
-					<el-form-item style="width: 300px" label="是否同步正元" prop="isSyncZy">
-						<dict-select v-model="state.queryForm.isSyncZy" dict-code="yes_no_type" />
-					</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_mchManage_add'">
-						新 增
-					</el-button>
-					<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"
-					/>
-				</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="50" />
-				<el-table-column prop="name" label="商户名" min-width="120" />
-				<el-table-column prop="logoPic" label="logo">
-					<template #default="{ row }">
-						<preview-image :src="row.logoPic" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="collectionCode" width="150" label="商户收款二维码" show-overflow-tooltip>
-					<template #default="{ row }">
-						<div class="flex flex-col justify-center items-center">
-							<preview-image :src="row.collectionCode" />
-							<el-button size="small" type="primary" link @click="downloadCollectionCode(row)">下载</el-button>
-						</div>
-					</template>
-				</el-table-column>
-				<el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip :min-width="100">
-					<template #default="{ row }">
-						<div class="flex justify-center items-center">
-							<div v-for="(v, i) in row.types?.split(',')" :key="i" class="mr-1">
-								<dict-tag :options="merchant_type" :value="v" />
-							</div>
-						</div>
-					</template>
-				</el-table-column>
-				<el-table-column width="200" label="支付默认钱包">
-					<template #default="{ row }">
-						<div class="flex items-center justify-center">
-							<div class="color-primary">{{ row.walletTypeName }}</div>
-							<div class="flex items-center just ml5">
-								<dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
-							</div>
-						</div>
-					</template>
-				</el-table-column>
-				<el-table-column prop="deptName" label="部门" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="phone" label="联系电话" :min-width="120" />
-				<el-table-column prop="sort" label="排序" :min-width="100">
-					<template #default="{ row }">
-						<span class="color-success">{{ row.sort }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="mchCount" label="分店数量" :min-width="100">
-					<template #default="{ row }">
-						<span class="color-primary">{{ row.mchCount || 0 }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column prop="businessTime" label="营业时间" :min-width="160">
-					<template #default="{ row }">
-						<div>{{ row.jobTime?.split(",")[0] ? "早上：" + row.jobTime?.split(",")[0] : "" }}</div>
-						<div>{{ row.jobTime?.split(",")[1] ? "中午：" + row.jobTime?.split(",")[1] : "" }}</div>
-						<div>{{ row.jobTime?.split(",")[2] ? "晚上：" + row.jobTime?.split(",")[2] : "" }}</div>
-					</template>
-				</el-table-column>
-				<el-table-column prop="addressDes" label="地址" show-overflow-tooltip :min-width="160" />
-				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" />
-				<el-table-column prop="isSyncZy" label="是否同步正元" min-width="120">
-					<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)"
-						/>
-					</template>
-				</el-table-column>
-				<el-table-column label="是否在移动端展示" min-width="150">
-					<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)"
-						/>
-					</template>
-				</el-table-column>
-				<el-table-column label="操作" fixed="right" min-width="300">
-					<template #default="{ 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>
-						<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>
-					</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)" />
-
-		<!-- 商户配置 -->
-		<Setting ref="settingDialogRef" @refresh="getDataList(false)" />
-	</div>
-</template>
-
-<script setup lang="ts" name="MchManage">
-import { BasicTableProps, useTable } from "/@/hooks/table"
-import * as mchManangeApi from "/@/api/wallet/mch-manage"
-import { useMessage, useMessageBox } from "/@/hooks/message"
-import { useDict } from "/@/hooks/dict"
-import FormDialog from "./form.vue"
-import Setting from "./setting.vue"
-import { useUserInfo } from "/@/stores/userInfo"
-import { downBlobFile as downCollectionCodeBlobFile } from "/@/utils/other"
-
-const { merchant_type, wallet_type, yes_no_type } = useDict("merchant_type", "wallet_type", "yes_no_type")
-
-// 定义变量内容
-const formDialogRef = ref()
-const settingDialogRef = ref()
-// 搜索变量
-const queryRef = ref()
-const showSearch = ref(true)
-// 多选变量
-const selectObjs = ref([]) as any
-const multiple = ref(true)
-
-const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
-	pageList: mchManangeApi.pageJoin,
-})
-
-//  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
-
-// 清空搜索条件
-const resetQuery = () => {
-	// 清空搜索条件
-	queryRef.value?.resetFields()
-	// 清空多选
-	selectObjs.value = []
-	getDataList()
-}
-
-// 重新生成正元二位啊吗
-const refreshQrcode = async (row: any) => {
-	try {
-		await useMessageBox().confirm("是否重新生成正元二维码")
-	} catch (e) {
-		return
-	}
-	try {
-		await mchManangeApi.refreshQrcode({ mchId: row.id })
-		getDataList()
-		useMessage().success("生成成功")
-	} catch (e) {
-		useMessage().error("生成失败")
-	}
-}
-
-// 修改是否在正元显示
-const isSyncZyChange = async (row: any) => {
-	try {
-		await mchManangeApi.putObj(row)
-		getDataList()
-		useMessage().success("操作成功")
-	} catch (e) {
-		useMessage().error("操作错误")
-	}
-}
-
-// 修改是否在移动端显示
-const visibleMobileChange = async (row: any) => {
-	try {
-		await mchManangeApi.putObj(row)
-		getDataList()
-		useMessage().success("操作成功")
-	} catch (e) {
-		useMessage().error("操作错误")
-	}
-}
-
-// 导出excel
-const exportExcel = () => {
-	downBlobFile("/canteen/merchantInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "商户管理.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)
-	}
-}
-
-// 点击二维码下载
-const downloadCollectionCode = (row: any) => {
-	if (!row.collectionCode) return useMessage().error("二维码链接不存在")
-	downCollectionCodeBlobFile(row.collectionCode, {}, `${row.name} 收款二维码.png`)
-}
-</script>
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 8f932fb..221d416 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -105,7 +105,12 @@
 						</el-table-column>
 						<el-table-column v-if="false" prop="activeBindStatus" width="120" label="饭卡绑定状态" />
 						<el-table-column prop="createTime" width="200" label="创建时间" />
-						<el-table-column label="操作" fixed="right" width="200">
+						<el-table-column
+							label="操作"
+							fixed="right"
+							width="200"
+							v-auths="['wallet_walletManage_edit', 'wallet_walletTransaction_update_balance']"
+						>
 							<template #default="{ row }">
 								<el-button
 									icon="InfoFilled"