From 8b0e8418e47a8149f5e17179d846b941efbcd8fe Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 2 Feb 2024 15:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=E6=B8=B2=E6=9F=93=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=AF=BC=E8=87=B4=E5=86=85=E5=AE=B9=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=E4=BC=98=E5=8C=96=EF=BC=9A=E4=BD=A3=E9=87=91?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0=E5=8F=91=E8=B5=B7=E4=BA=BA?=
 =?UTF-8?q?=E4=BD=A3=E9=87=91=E5=92=8C=E5=A4=96=E5=8B=A4=E4=BD=A3=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/agent/apply/index.vue     | 12 ++---
 .../marketing/agent/commission/index.vue      | 48 +++++++++++++++++--
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/views/marketing/agent/apply/index.vue b/src/views/marketing/agent/apply/index.vue
index fc9a8b2..436af20 100644
--- a/src/views/marketing/agent/apply/index.vue
+++ b/src/views/marketing/agent/apply/index.vue
@@ -9,10 +9,10 @@
               <el-input style="width: 350px" v-model="tableFrom.uid" placeholder="请输入申请人uid" class="selWidth"></el-input>
             </el-form-item>
             <el-form-item label="联系人姓名：" label-width="100px" style="display: inline-block;">
-              <el-input style="width: 350px" v-model="tableFrom.contacts_name" placeholder="请输入联系人姓名" class="selWidth"></el-input>
+              <el-input style="width: 350px" v-model="tableFrom.contact_name" placeholder="请输入联系人姓名" class="selWidth"></el-input>
             </el-form-item>
             <el-form-item label="联系电话：" label-width="100px" style="display: inline-block;">
-              <el-input style="width: 350px" v-model="tableFrom.contacts_phone" placeholder="请输入联系电话" class="selWidth"></el-input>
+              <el-input style="width: 350px" v-model="tableFrom.contact_phone" placeholder="请输入联系电话" class="selWidth"></el-input>
             </el-form-item>
             <el-form-item label="状态：" label-width="100px" style="display: inline-block;">
               <el-select v-model="tableFrom.status" clearable filterable placeholder="请选择" class="selWidth">
@@ -108,7 +108,7 @@
         </el-table-column>
         <el-table-column label="状态" min-width="100" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.orderInfo.status != 3" type="info">待支付</el-tag>
+            <el-tag v-if="scope.row.orderInfo && scope.row.orderInfo.status != 3" type="info">待支付</el-tag>
             <template v-else>
               <el-tag v-if="scope.row.status == 0" type="primary">待审核</el-tag>
               <el-tag v-if="scope.row.status == 1" type="success">已通过</el-tag>
@@ -119,7 +119,7 @@
         <el-table-column label="申请时间" prop="create_time" min-width="150" align="center"/>
         <el-table-column label="操作" min-width="280" fixed="right" align="center">
           <template slot-scope="scope">
-            <template v-if="scope.row.status == 0 && scope.row.orderInfo.status == 3">
+            <template v-if="scope.row.status == 0 && scope.row.orderInfo && scope.row.orderInfo.status == 3">
               <el-button type="success" size="small" @click="toExamine(scope.row.id, 1)">通过</el-button>
               <el-button type="danger" size="small" @click="toExamine(scope.row.id, 2)">驳回</el-button>
             </template>
@@ -256,8 +256,8 @@ export default {
         page: 1,
         limit: 20,
         uid: "",
-        contacts_name: "",
-        contacts_phone: "",
+        contact_name: "",
+        contact_phone: "",
         status: "",
         agent_type: ""
       },
diff --git a/src/views/marketing/agent/commission/index.vue b/src/views/marketing/agent/commission/index.vue
index d50721a..48cbdb9 100644
--- a/src/views/marketing/agent/commission/index.vue
+++ b/src/views/marketing/agent/commission/index.vue
@@ -21,11 +21,17 @@
       <!--表格信息-->
       <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
         <el-table-column prop="id" label="ID" min-width="50" align="center"/>
-        <el-table-column label="订单信息" min-width="160" align="center">
+        <el-table-column label="订单信息" min-width="180" align="center">
           <template slot-scope="scope">
             <div class="order-content">
-              {{ scope.row.userOrder.title}} <br />
-              {{ scope.row.userOrder.order_sn}}
+              <template v-if="scope.row.source == 1">
+                邀请代理奖励 <br />
+                {{ scope.row.storeOrder ? scope.row.storeOrder.order_sn : ''}}
+              </template>
+              <template v-else>
+                {{ scope.row.userOrder ? scope.row.userOrder.title : ''}} <br />
+                {{ scope.row.userOrder ? scope.row.userOrder.order_sn : ''}}
+              </template>
             </div>
           </template>
         </el-table-column>
@@ -137,6 +143,42 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="发起人佣金" min-width="200" align="center">
+          <template slot-scope="scope">
+            <div class="user-content">
+              <div class="user-avatar" v-if="scope.row.initiator">
+                <img :src="scope.row.initiator.avatar || moren" />
+              </div>
+              <div class="user-info">
+                <div class="nickname" v-if="scope.row.initiator">
+                  {{ scope.row.initiator.nickname }}
+                  <div class="user-id">{{ scope.row.initiator.uid }}</div>
+                </div>
+                <div class="agent-type-text">
+                  <el-tag type="info" effect="dark" size="small">{{ scope.row.initiator_brokerage || 0.00 }}</el-tag>
+                </div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="外勤佣金" min-width="200" align="center">
+          <template slot-scope="scope">
+            <div class="user-content">
+              <div class="user-avatar" v-if="scope.row.fieldStaff">
+                <img :src="scope.row.fieldStaff.avatar || moren" />
+              </div>
+              <div class="user-info">
+                <div class="nickname" v-if="scope.row.fieldStaff">
+                  {{ scope.row.fieldStaff.nickname }}
+                  <div class="user-id">{{ scope.row.fieldStaff.uid }}</div>
+                </div>
+                <div class="agent-type-text">
+                  <el-tag type="info" effect="dark" size="small">{{ scope.row.field_staff_brokerage || 0.00 }}</el-tag>
+                </div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="平台佣金" prop="platform_brokerage" min-width="130" align="center"/>
         <el-table-column label="下单时间" prop="create_time" min-width="150" align="center"/>
       </el-table>