Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/mch/mch-manage/form.vue

@@ -188,7 +188,7 @@ const dataRules = computed(() => {
 			...dataRulesArr,
 			supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
 			cooperationStatus: [{ required: true, message: "请选择合作状态", trigger: "change" }],
-			parentId: [{ required: true, message: "请选择品牌", trigger: "change" }],
+			// parentId: [{ required: true, message: "请选择品牌", trigger: "change" }],
 		}
 	} else if (form.types == "2") {
 		return {

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="商户名" />