From 2bc5b4ab196cac22e0b8abfc4966b31078bcad21 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 28 Jun 2024 11:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E9=85=92=E9=81=93?=
 =?UTF-8?q?=E9=A6=86=E5=92=8C=E8=81=94=E7=9B=9F=E5=95=86=E5=AE=B6=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=AD=90=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/merchant/application/index.vue | 32 ++++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index f64f590..d287234 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -95,8 +95,8 @@
       </div>
       <!--表单-->
       <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" highlight-current-row class="switchTable">
-        <el-table-column prop="mer_intention_id" label="ID" min-width="60" align="center" />
-        <el-table-column label="申请人" min-width="280" align="center">
+        <el-table-column prop="mer_intention_id" label="ID" min-width="50" align="center" />
+        <el-table-column label="申请人" min-width="230" align="center">
           <template slot-scope="scope">
             <div class="user-content" v-if="scope.row.applicant">
               <div class="user-avatar" v-if="scope.row.applicant.avatar && scope.row.applicant.avatar != 1">
@@ -109,7 +109,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="管理员" min-width="280" align="center">
+        <el-table-column label="管理员" min-width="230" align="center">
           <template slot-scope="scope">
             <div class="user-content" v-if="scope.row.manage">
               <div class="user-avatar" v-if="scope.row.manage.avatar && scope.row.manage.avatar != 1">
@@ -124,26 +124,35 @@
         </el-table-column>
         <el-table-column label="商户信息" min-width="180" align="left">
           <template slot-scope="scope">
-            名称：{{ scope.row.mer_name || '' }}<br />
-            分类：{{ scope.row.category_name || '' }}<br />
-            类型：{{ scope.row.type_name || '' }}<br />
+            商户名称：{{ scope.row.mer_name || '' }}<br />
+            <template v-if="[0,2].includes(Number(tableFrom.merchant_type))">
+              商户分类：{{ scope.row.category_name || '' }}<br />
+              经营类型：{{ scope.row.type_name || '' }}<br />
+            </template>
+            <template v-if="[0,1].includes(Number(tableFrom.merchant_type))">
+              <!--'商户子类型：0=默认，1=酒道馆/大型餐厅，2=小酒馆/中小型餐厅'-->
+              <span v-if="tableFrom.merchant_type == 0 && scope.row.merchant_sub_type == 1">商户类型：大型餐厅</span>
+              <span v-else-if="tableFrom.merchant_type == 0 && scope.row.merchant_sub_type == 2">商户类型：中小型餐厅</span>
+              <span v-else-if="tableFrom.merchant_type == 1 && scope.row.merchant_sub_type == 1">商户类型：酒道馆</span>
+              <span v-else-if="tableFrom.merchant_type == 1 && scope.row.merchant_sub_type == 2">商户类型：小酒馆</span>
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="联系人信息" min-width="120" align="center">
+        <el-table-column label="联系人信息" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.name || '' }}<br />
             {{ scope.row.phone || '' }}<br />
           </template>
         </el-table-column>
         <el-table-column prop="create_time" label="申请时间" min-width="150" align="center" />
-        <el-table-column label="资质图片" min-width="110">
+        <el-table-column label="资质图片" min-width="80" align="center" >
           <template slot-scope="scope">
             <div class="qualification-image">
               <el-image v-for="(item, index) in scope.row.images" :key="index" :src="item" class="mr5" :preview-src-list="[item]" />
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="状态" min-width="150" align="center">
+        <el-table-column label="状态" min-width="80" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status == 1" type="success">通过</el-tag>
             <el-tag v-if="scope.row.status == 0" type="info">未处理</el-tag>
@@ -339,11 +348,9 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
-
 /deep/ table .el-image {
   display: inline-block !important;
 }
-
 .user-content {
   --user-content-height-: 80px;
 
@@ -399,4 +406,7 @@ export default {
     }
   }
 }
+/deep/ .cell{
+  padding: 0!important;
+}
 </style>