From afb4afee316e519f382c2515b45dddb77a83a738 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Thu, 25 Apr 2024 09:14:59 +0800
Subject: [PATCH] 1

---
 src/views/merchant/list/handle/merEditForm.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index f7908e2..1a1ea08 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -35,7 +35,7 @@
           </el-row>
           <el-row :gutter="24" class="mt20">
             <el-col :span="12">
-              <el-form-item label="企业名称：" prop="ext.com.contact" v-if="merData.ext&&merData.ext.com">
+              <el-form-item label="企业名称：" prop="ext.com.name" v-if="merData.ext&&merData.ext.com">
                 <el-input
                   size="small"
                   v-model="merData.ext.com.name"
@@ -543,7 +543,7 @@ export default {
       activeName: 'detail',
       ruleValidate: {
         mer_name: [
-          { required: true, message: '请输入商户名称', trigger: 'blur' }
+          { required: true, message: '请输入店铺名称', trigger: 'change' }
         ],
         'ext.com.contact': [
           { required: true, message: '请输入企业名称', trigger: 'blur' }
@@ -608,10 +608,10 @@ export default {
             });
         } else {
           if(!this.merData.mer_name)return this.$message.error('请填写基本信息-商户名称');
-          if(!this.merData.category_id)return this.$message.error('请选择基本信息-商户分类');
+          // if(!this.merData.category_id)return this.$message.error('请选择基本信息-商户分类');
           if(!this.merData.type_id)return this.$message.error('请选择基本信息-店铺类型');
           if(!this.merData.mer_account)return this.$message.error('请填写账号信息-商户账号');
-          if(!this.merData.mer_phone)return this.$message.error('请填写账号信息-联系电话');
+          // if(!this.merData.mer_phone)return this.$message.error('请填写账号信息-联系电话');
         }
       });
     }