From 97df1fc795a069f2eb5cd6983b41ea77807b14f4 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 6 Feb 2024 12:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant/list/handle/merEditForm.vue      | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 5e19fa8..5e34404 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -31,7 +31,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="defaultMerchantType == 0">
             <el-col :span="12">
               <el-form-item :label="mar_type_name + '分类：'" prop="category_id">
                <el-select
@@ -60,7 +60,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="12" v-if="defaultMerchantType == 0">
               <el-form-item label="店铺类型：" prop="type_id">
                 <el-select
                   v-model="merData.type_id"
@@ -132,7 +132,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="12">
+            <el-col :span="12" v-if="defaultMerchantType == 0">
               <el-form-item label="人均消费额：" prop="avg_consumption">
                 <el-input type="number" v-model="merData.avg_consumption" placeholder="请填写人均消费额" class="selWidth" />
               </el-form-item>
@@ -420,12 +420,12 @@ export default {
         mer_account: [
           { required: true, message: `请输入账号`, trigger: 'blur' }
         ],
-        category_id: [
-          { required: true, message: `请选择分类`, trigger: 'change' }
-        ],
-        type_id: [
-          { required: true, message: '请选择店铺类型', trigger: 'change' }
-        ],
+        // category_id: [
+        //   { required: true, message: `请选择分类`, trigger: 'change' }
+        // ],
+        // type_id: [
+        //   { required: true, message: '请选择店铺类型', trigger: 'change' }
+        // ],
         mer_phone: [{ required: true, validator: validatePhone, trigger: 'blur' }],
       },
     };
@@ -503,11 +503,17 @@ export default {
               this.$message.error(res.message);
             });
         } else {
-          if(!this.merData.mer_name)return this.$message.error(`请填写基本信息-${this.mar_type_name}名称`);
-          if(!this.merData.category_id)return this.$message.error(`请选择基本信息-${this.mar_type_name}分类`);
-          if(!this.merData.type_id)return this.$message.error('请选择基本信息-店铺类型');
-          if(!this.merData.mer_account)return this.$message.error(`请填写账号信息-${this.mar_type_name}账号`);
-          if(!this.merData.mer_phone)return this.$message.error('请填写账号信息-联系电话');
+          if(this.defaultMerchantType == 0){
+            if(!this.merData.mer_name)return this.$message.error(`请填写基本信息-${this.mar_type_name}名称`);
+            if(!this.merData.category_id)return this.$message.error(`请选择基本信息-${this.mar_type_name}分类`);
+            if(!this.merData.type_id)return this.$message.error('请选择基本信息-店铺类型');
+            if(!this.merData.mer_account)return this.$message.error(`请填写账号信息-${this.mar_type_name}账号`);
+            if(!this.merData.mer_phone)return this.$message.error('请填写账号信息-联系电话');
+          }else{
+            if(!this.merData.mer_name)return this.$message.error(`请填写基本信息-${this.mar_type_name}名称`);
+            if(!this.merData.mer_account)return this.$message.error(`请填写账号信息-${this.mar_type_name}账号`);
+            if(!this.merData.mer_phone)return this.$message.error('请填写账号信息-联系电话');
+          }
         }
       });
     },