From a0aeecd584536d34cabf7fd5c09c4cbe25c32e6f Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 5 Mar 2025 16:18:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/Images.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Upload/Images.vue b/src/components/Upload/Images.vue
index 2eef8b2..a04bad4 100644
--- a/src/components/Upload/Images.vue
+++ b/src/components/Upload/Images.vue
@@ -47,7 +47,7 @@ const props = withDefaults(defineProps<UploadFileProps>(), {
 	borderRadius: "8px",
 })
 
-const imageUrls = defineModel<string>()
+const imageUrls = defineModel("modelValue", { default: "" })
 
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
 const dialogVisible = ref(false)
@@ -162,7 +162,7 @@ const self_disabled = computed(() => {
 watch(
 	() => imageUrls.value,
 	(newValue) => {
-		if (!newValue) {
+		if (!newValue || Object.prototype.toString.call(newValue) !== "[object String]") {
 			fileList.value = []
 			return
 		}

From cf57e818e85b92562b4a2364a4c3aee8af8a7917 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 5 Mar 2025 16:20:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=BB=98=E8=AE=A4=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wallet/mch-manage/form.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/views/wallet/mch-manage/form.vue b/src/views/wallet/mch-manage/form.vue
index d1b6435..ee777cf 100644
--- a/src/views/wallet/mch-manage/form.vue
+++ b/src/views/wallet/mch-manage/form.vue
@@ -1,6 +1,6 @@
 <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" formDialogRef label-width="90px" v-loading="loading">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户名" prop="name">
@@ -71,10 +71,8 @@
 			</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>
@@ -104,7 +102,7 @@ const form = reactive({
 	merchantType: [],
 	logoPic: "",
 	collectMoneyCode: "",
-	swiperPic: [],
+	swiperPic: "",
 	phone: "",
 	businessTime: "",
 	address: "",
@@ -132,9 +130,7 @@ const openDialog = (id: string) => {
 	form.id = ""
 
 	// 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields()
-	})
+	dataFormRef.value?.resetFields()
 
 	// 获取merchantInfo信息
 	if (id) {