From 19964f65280e4895bb922da8bb1895507e053c50 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 4 Jun 2024 14:45:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=93=81=E7=89=8C=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E4=B8=8D=E5=9C=A8=E6=98=BE=E7=A4=BA=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E9=87=91=E5=92=8C=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/merchant/list/index.vue | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 81c8d70..32e7d8d 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -111,7 +111,12 @@
       <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="small" highlight-current-row class="switchTable">
         <el-table-column prop="mer_id" label="ID" min-width="60" align="center"/>
         <el-table-column prop="mer_name" :label="merchantTitle + '名称'" min-width="150" align="center"/>
-        <el-table-column prop="real_name" :label="merchantTitle + '姓名'" min-width="150" align="center"/>
+        <el-table-column prop="real_name" label="负责人信息" min-width="150" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.real_name || ''}}<br />
+            {{ scope.row.mer_phone || ''}}
+          </template>
+        </el-table-column>
         <el-table-column prop="status" label="推荐" min-width="100" align="center">
           <template slot-scope="scope">
             <el-switch
@@ -125,7 +130,7 @@
             />
           </template>
         </el-table-column>
-         <el-table-column prop="status" label="开启/关闭" min-width="100" align="center">
+        <el-table-column prop="status" label="开启/关闭" min-width="100" align="center">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.status"
@@ -139,14 +144,18 @@
           </template>
         </el-table-column>
         <el-table-column prop="create_time" label="创建时间" min-width="150"  align="center"/>
-        <el-table-column prop="margin" label="保证金" min-width="150" align="center">
+        <!--<el-table-column prop="margin" label="保证金" min-width="150" align="center">-->
+        <!--  <template slot-scope="scope">-->
+        <!--    <span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span>-->
+        <!--  </template>-->
+        <!--</el-table-column>-->
+        <el-table-column prop="margin" label="品牌" min-width="150" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span>
-
+            <span v-if="scope.row.brand">{{ scope.row.brand.title || '' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="sort" label="排序" min-width="100"  align="center"/>
-        <el-table-column prop="mark" label="备注" min-width="200"  align="center"/>
+        <!--<el-table-column prop="mark" label="备注" min-width="200"  align="center"/>-->
         <el-table-column label="操作" min-width="150" fixed="right" align="center">
           <template slot-scope="scope">
             <!-- <router-link