From c4019964a1428f9ce0ad659e0959426faa3f043a Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 27 Dec 2023 16:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E6=8A=BD=E6=88=90=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commissionRecord/index.vue                | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/views/marketing/platformCommission/commissionRecord/index.vue b/src/views/marketing/platformCommission/commissionRecord/index.vue
index 4ba03ec..d817280 100644
--- a/src/views/marketing/platformCommission/commissionRecord/index.vue
+++ b/src/views/marketing/platformCommission/commissionRecord/index.vue
@@ -20,8 +20,8 @@
       </div>
       <!--列表内容-->
       <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
-        <el-table-column prop="id" label="ID" min-width="80" align="center"/>
-        <el-table-column label="用户信息" prop="nickname" min-width="280" align="center">
+        <el-table-column prop="id" label="ID" min-width="60" align="center"/>
+        <el-table-column label="用户信息" prop="nickname" min-width="260" align="center">
           <template slot-scope="scope">
             <div class="user-content">
               <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
@@ -34,7 +34,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="抽成商户" prop="mer_name" min-width="280" align="center">
+        <el-table-column label="抽成商户" prop="mer_name" min-width="260" align="center">
           <template slot-scope="scope">
             <div class="user-content">
               <div class="user-avatar" v-if="scope.row.avatar" >
@@ -47,39 +47,51 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="平台抽成" prop="mer_name" min-width="150" align="left">
+        <el-table-column label="订单信息" prop="mer_name" min-width="230" align="left">
+          <template slot-scope="scope">
+            ID：{{ scope.row.storeOrder.order_id }}<br />
+            订单号：{{ scope.row.storeOrder.order_sn }}
+          </template>
+        </el-table-column>
+        <el-table-column label="平台抽成" prop="mer_name" min-width="110" align="center">
           <template slot-scope="scope">
             <el-tag type="success" effect="plain">金额：{{ scope.row.platform_commission_money || '0.00' }}</el-tag>
+            <br />
             <el-tag effect="plain" class="rate-num">比例：{{ scope.row.platform_commission_rate || '0' }}%</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="平台分佣" prop="mer_name" min-width="150" align="left">
+        <el-table-column label="平台分佣" prop="mer_name" min-width="110" align="center">
           <template slot-scope="scope">
             <el-tag type="success" effect="plain">金额：{{ scope.row.commission_platform_money || '0.00' }}</el-tag>
+            <br />
             <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_platform_rate || '0' }}%</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="合伙人分佣" prop="mer_name" min-width="150" align="left">
+        <el-table-column label="合伙人分佣" prop="mer_name" min-width="110" align="center">
           <template slot-scope="scope">
             <el-tag type="success" effect="plain">金额：{{ scope.row.commission_partner_money || '0.00' }}</el-tag>
+            <br />
             <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_partner_rate || '0' }}%</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="招商员分佣" prop="mer_name" min-width="150" align="left">
+        <el-table-column label="招商员分佣" prop="mer_name" min-width="110" align="center">
           <template slot-scope="scope">
             <el-tag type="success" effect="plain">金额：{{ scope.row.commission_merchants_money || '0.00' }}</el-tag>
+            <br />
             <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_merchants_rate || '0' }}%</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="推广员分佣" prop="mer_name" min-width="150" align="left">
+        <el-table-column label="推广员分佣" prop="mer_name" min-width="110" align="center">
           <template slot-scope="scope">
             <el-tag type="success" effect="plain">金额：{{ scope.row.commission_promoter_money || '0.00' }}</el-tag>
+            <br />
             <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_promoter_rate || '0' }}%</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="积分释放" prop="mer_name" min-width="150" align="left">
+        <el-table-column label="积分释放" prop="mer_name" min-width="110" align="center">
           <template slot-scope="scope">
             <el-tag type="success" effect="plain">金额：{{ scope.row.commission_integral_release_money || '0.00' }}</el-tag>
+            <br />
             <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_integral_release_rate || '0' }}%</el-tag>
           </template>
         </el-table-column>
@@ -235,4 +247,7 @@ export default {
 .rate-num{
   margin-top: 10px!important;
 }
+/deep/ .cell{
+  padding: 0!important;
+}
 </style>