From d7c567ac99755805c503a6057f91f4bacd27f6b7 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Sat, 29 Mar 2025 20:35:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mch/mch-manage/form.vue  | 2 +-
 src/views/mch/mch-manage/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue
index 33b2e8a..118969e 100644
--- a/src/views/mch/mch-manage/form.vue
+++ b/src/views/mch/mch-manage/form.vue
@@ -193,7 +193,7 @@ const dataRules = computed(() => {
 	} else if (form.types == "2") {
 		return {
 			...dataRulesArr,
-			supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
+			// supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
 		}
 	} else {
 		return dataRulesArr
diff --git a/src/views/mch/mch-manage/index.vue b/src/views/mch/mch-manage/index.vue
index 6b47582..295ee8d 100644
--- a/src/views/mch/mch-manage/index.vue
+++ b/src/views/mch/mch-manage/index.vue
@@ -1,7 +1,7 @@
 <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-form v-if="showSearch" 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="商户名" />