From 8f31cc5c76ae8b97fb4cf1c67c5a3636d2070789 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Sat, 23 Mar 2024 18:01:02 +0800
Subject: [PATCH] 1

---
 src/views/merchant/shoptype/index.vue | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/views/merchant/shoptype/index.vue b/src/views/merchant/shoptype/index.vue
index 0ebc191..3a576b5 100644
--- a/src/views/merchant/shoptype/index.vue
+++ b/src/views/merchant/shoptype/index.vue
@@ -28,6 +28,19 @@
                 <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="type_name" label="商户类型" min-width="150" />
+                
+                <el-table-column label="申请人姓名" min-width="150">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.name">{{ scope.row.name }}</span>
+                        <span v-else>-</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="申请人手机号" min-width="150">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.phone">{{ scope.row.phone }}</span>
+                        <span v-else>-</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="status" label="审核状态" min-width="100">
                     <template slot-scope="scope">
                         <span class="t-color gray" v-if="scope.row.status == 0">待审核</span>
@@ -35,18 +48,6 @@
                         <span class="t-color red" v-if="scope.row.status == 2">审核不通过</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="审核人姓名" min-width="150">
-                    <template slot-scope="scope">
-                        <span class="t-color red" v-if="scope.row.check_name">{{ scope.row.check_name }}</span>
-                        <span v-else>-</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="审核人手机号" min-width="150">
-                    <template slot-scope="scope">
-                        <span v-if="scope.row.check_name">{{ scope.row.check_phone }}</span>
-                        <span v-else>-</span>
-                    </template>
-                </el-table-column>
                 <el-table-column prop="create_time" label="申请时间" min-width="150" />
                 <el-table-column prop="update_time" label="审核时间" min-width="150">
                     <template slot-scope="scope">