添加：商户支持编辑招商员

src/views/merchant/list/handle/merInfo.vue

@@ -193,12 +193,27 @@
               <div class="value">{{merData.mer_integral_merchant_rate}} : 1</div>
             </li>
           </ul>-->
-          <div class="title">平台抽成设置</div>
           <ul class="list">
             <li class="item">
               <div>平台抽成比例：</div>
               <div class="value">{{merData.platform_commission}}%</div>
             </li>
+            <li class="item">
+              <div>招商员：</div>
+              <div class="value">
+                <div class="top-user">
+                  <div class="user-content" v-if="merData.spread">
+                    <div class="user-avatar">
+                      <img :src="merData.spread.avatar || moren" />
+                    </div>
+                    <div class="user-info">
+                      <div class="nickname">{{ merData.spread.nickname }}</div>
+                      <div class="user-id">{{ merData.spread.uid }}</div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </li>
           </ul>
         </div>
       </el-tab-pane>
@@ -313,5 +328,65 @@ export default {
 .gary {
   color: #aaa;
 }
+.top-user{
+  display: inline-flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  .user-content{
+    --user-content-height-: 80px;
 
+    height: var(--user-content-height-);
+    width: 100%;
+    margin-right: 30px;
+    display: inline-flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    flex-wrap: nowrap;
+
+    .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{
+      width: calc(100% - var(--user-content-height-));
+      height: var(--user-content-height-);
+      display: inline-flex;
+      flex-direction: column;
+      flex-wrap: nowrap;
+      justify-content: center;
+      align-items: flex-start;
+      .nickname{}
+      .user-id{
+        color: #fff;
+        background-color: #409eff;
+        border-color: #409eff;
+        height: 18px;
+        line-height: 20px;
+        font-size: 13px;
+        padding: 0 5px;
+        border-radius: 5px;
+        width: max-content!important;
+      }
+      .user-id{
+        width: 100%;
+        text-align: left;
+        font-size: 13px;
+        line-height: calc(var(--user-content-height- * 35%));
+      }
+    }
+  }
+}
 </style>

src/views/merchant/list/index.vue

@@ -108,9 +108,27 @@
       </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" align="center"/>
+        <el-table-column label="招商员" min-width="230" align="center">
+          <template slot-scope="scope">
+            <div class="user-content" v-if="scope.row.spread">
+              <div class="user-avatar">
+                <img :src="scope.row.spread.avatar || moren" />
+              </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 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="real_name" label="联系人" min-width="100" align="center">
-        <el-table-column prop="status" label="推荐" min-width="100" 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="80" align="center">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.is_best"
@@ -123,7 +141,7 @@
             />
           </template>
         </el-table-column>
-         <el-table-column prop="status" label="开启/关闭" min-width="100" align="center">
+        <el-table-column prop="status" label="开启/关闭" min-width="80" align="center">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.status"
@@ -137,27 +155,14 @@
           </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="100" 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" align="center"/>
+        <el-table-column prop="sort" label="排序" min-width="80" 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="招商员" 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
@@ -240,6 +245,7 @@ export default {
   components: { merDetail },
   data() {
     return {
+      moren: require("@/assets/images/f.png"),
       fromList: fromList,
       roterPre: roterPre,
       isChecked: false,
@@ -475,4 +481,7 @@ export default {
     }
   }
 }
+.selWidth{
+  margin-bottom: 10px!important;
+}
 </style>