From 91d68c97f017db64c2d8a0d0a499b83e721666ca Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Mon, 22 Apr 2024 09:54:44 +0800
Subject: [PATCH] 1

---
 src/views/merchant/application/index.vue       | 2 +-
 src/views/merchant/list/handle/merEditForm.vue | 2 +-
 src/views/merchant/list/handle/merInfo.vue     | 6 +++---
 src/views/merchant/list/index.vue              | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 4e10434..83d8345 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -98,7 +98,7 @@
       >
         <el-table-column prop="mer_intention_id" label="ID" min-width="60" />
         <el-table-column prop="mer_name" label="店铺名称" min-width="150" />
-        <el-table-column prop="ext.com.contact" label="企业名称" min-width="150" />
+        <el-table-column prop="com.name" label="企业名称" min-width="150" />
         <!-- <el-table-column prop="category_name" label="商户分类" min-width="150" /> -->
         <el-table-column prop="type_name" label="店铺类型" min-width="150" />
         <el-table-column prop="com.contact" label="对接人姓名" min-width="100" />
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index fdf3fab..0e1e414 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -38,7 +38,7 @@
               <el-form-item label="企业名称：" prop="ext.com.contact" v-if="merData.ext&&merData.ext.com">
                 <el-input
                   size="small"
-                  v-model="merData.ext.com.contact"
+                  v-model="merData.ext.com.name"
                   placeholder="请填写企业名称"
                   class="selWidth"
                 />
diff --git a/src/views/merchant/list/handle/merInfo.vue b/src/views/merchant/list/handle/merInfo.vue
index 9014ca1..6311ffe 100644
--- a/src/views/merchant/list/handle/merInfo.vue
+++ b/src/views/merchant/list/handle/merInfo.vue
@@ -14,7 +14,7 @@
             <li class="item" v-if="merData.ext">
               <div>企业名称：</div>
               <div class="value">
-                {{merData.ext.com?merData.ext.com.contact:'无'}}
+                {{merData.ext.com?merData.ext.com.name:'无'}}
               </div>
             </li>
             <li class="item">
@@ -236,14 +236,14 @@
               <div class="value">{{merData.mer_password}}</div>
               
             </li>
-            <li class="item">
+            <!-- <li class="item">
               <div>联系人：</div>
               <div class="value">{{merData.real_name}}</div>
             </li>
             <li class="item">
               <div>联系电话：</div>
               <div class="value">{{merData.mer_phone}}</div>
-            </li> 
+            </li>  -->
             <!-- <li class="item">
               <div>绑定手机号：</div>
               <div class="value">{{merData.real_name}}</div>
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 994ddb1..306df5d 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -131,8 +131,8 @@
       >
         <el-table-column prop="mer_id" label="ID" min-width="60" />
         <el-table-column prop="mer_name" label="店铺名称" min-width="150" />
-        <el-table-column prop="ext.com.contact" label="企业名称" min-width="150" />
-        <el-table-column prop="type_name" label="店铺类型" min-width="150" />
+        <el-table-column prop="ext.com.name" label="企业名称" min-width="150" />
+        <el-table-column prop="merchantType.type_name" label="店铺类型" min-width="150" />
         <el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100">
           <template slot-scope="scope">
             <span>{{scope.row.is_huimei == 1 ? '是' : '否'}}</span>