From 89db89d0f708803a0375dd9c931d04dce35e840f Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 27 Dec 2023 15:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=8B=9B=E5=95=86=E5=91=98?=
 =?UTF-8?q?=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 | 84 ++++++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 19 deletions(-)

diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 6d39f22..2f8c787 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -106,19 +106,11 @@
         </div>
         <el-button size="small" type="primary" @click="onAdd">添加商户</el-button>
       </div>
-      <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" />
-        <el-table-column prop="mer_name" label="商户名称" min-width="150" />
-        <el-table-column prop="real_name" label="商户姓名" min-width="150" />
-
-        <el-table-column prop="status" label="推荐" min-width="100">
+      <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="商户名称" min-width="150" align="center"/>
+        <el-table-column prop="real_name" label="商户姓名" min-width="150" align="center"/>
+        <el-table-column prop="status" label="推荐" min-width="100" align="center">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.is_best"
@@ -131,7 +123,7 @@
             />
           </template>
         </el-table-column>
-         <el-table-column prop="status" label="开启/关闭" min-width="100">
+         <el-table-column prop="status" label="开启/关闭" min-width="100" align="center">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.status"
@@ -144,16 +136,28 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="create_time" label="创建时间" min-width="150" />
-        <el-table-column prop="margin" label="保证金" min-width="150">
+        <el-table-column prop="create_time" 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="sort" label="排序" min-width="100" />
-        <el-table-column prop="mark" label="备注" min-width="200" />
-
+        <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 label="招商员" prop="nickname" min-width="280" align="center">
+          <template slot-scope="scope">
+            <div class="user-content" v-if="scope.row.spread">
+              <div class="user-avatar" v-if="scope.row.spread.avatar">
+                <img :src="scope.row.spread.avatar" />
+              </div>
+              <div class="user-info">
+                <div class="nickname">{{ scope.row.spread.nickname }}</div>
+                <div class="user-id">ID：{{ scope.row.spread.uid }}</div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" min-width="150" fixed="right" align="center">
           <template slot-scope="scope">
             <!-- <router-link
@@ -429,4 +433,46 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.user-content{
+  --user-content-height-: 80px;
+
+  height: var(--user-content-height-);
+  width: 100%;
+  display: inline-flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: center;
+  align-items: center;
+  .user-avatar{
+    height: var(--user-content-height-);
+    width: var(--user-content-height-);
+    display: inline-flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: center;
+    align-items: center;
+    img{
+      height: 80%!important;
+      width: 80%!important;
+      border-radius: 50% !important;
+    }
+  }
+  .user-info{
+    height: var(--user-content-height-);
+    display: inline-flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    justify-content: center;
+    align-items: flex-start;
+    .nickname{
+      font-size: 15px;
+      font-weight: bold;
+      line-height: calc(var(--user-content-height- * 65%));
+    }
+    .user-id{
+      font-size: 13px;
+      line-height: calc(var(--user-content-height- * 35%));
+    }
+  }
+}
 </style>