diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue
index 7c54227..17b4819 100644
--- a/src/views/mch/mch-manage/form.vue
+++ b/src/views/mch/mch-manage/form.vue
@@ -1,160 +1,163 @@
 <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="deptId">
-            <el-select v-model="form.deptId" placeholder="请选择绑定的部门id">
-              <el-option label="请选择">0</el-option>
-            </el-select>
-          </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="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-form-item label="商户名" prop="name">
-            <el-input v-model="form.name" placeholder="请输入商户名" />
-          </el-form-item>
-        </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="商户名" prop="name">
+						<el-input v-model="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-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-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-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-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-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-form-item>
+				</el-col>
 
-        <el-col :span="12" class="mb20">
-          <el-form-item label="商户手机号" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入商户手机号" />
-          </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-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>
-        </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="商户开始营业时间" prop="jobStartTime">
+						<el-input v-model="form.jobStartTime" 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-form-item>
-        </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="商户结束营业时间" prop="jobEndTime">
+						<el-input v-model="form.jobEndTime" 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-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="12" class="mb20">
+					<el-form-item label="商户地址" prop="addressDes">
+						<el-input type="textarea" v-model="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>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="MchManageDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '../../../api/mch/mch-manage'
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "../../../api/mch/mch-manage"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-  id: '',
-  deptId: '',
-  name: '',
-  types: '',
-  logoPic: '',
-  swiperPic: '',
-  phone: '',
-  jobStartTime: '',
-  jobEndTime: '',
-  addressDes: '',
-});
+	id: "",
+	deptId: "",
+	name: "",
+	types: "",
+	logoPic: "",
+	swiperPic: "",
+	phone: "",
+	jobStartTime: "",
+	jobEndTime: "",
+	addressDes: "",
+})
 
 // 定义校验规则
 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" },
+		{ validator: rule.chinese, trigger: "blur" },
+	],
+	types: [{ required: true, message: "店铺类型,逗号分隔不能为空", trigger: "blur" }],
+	logoPic: [{ required: true, message: "商户logo图片不能为空", trigger: "blur" }],
+	phone: [{ validator: rule.mobilePhone, trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
-  nextTick(() => {
-    dataFormRef.value?.resetFields();
-  });
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取mchManage信息
-  if (id) {
-    form.id = id
-    getmchManageData(id)
-  }
-};
+	// 获取mchManage信息
+	if (id) {
+		form.id = id
+		getmchManageData(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 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 getmchManageData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	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
+	openDialog,
+})
+</script>
diff --git a/src/views/wallet/mch-manage/index.vue b/src/views/wallet/mch-manage/index.vue
index 848fc41..abb2f0a 100644
--- a/src/views/wallet/mch-manage/index.vue
+++ b/src/views/wallet/mch-manage/index.vue
@@ -51,7 +51,7 @@
 				<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">
+							<div v-for="(v, i) in row.types?.split(',')" :key="i" class="mr-1">
 								<dict-tag :options="merchant_type" :value="v" />
 							</div>
 						</div>