2024.07.25

- 佣金记录页修复字段显示bug；

src/views/relationshipChainManagement/commissionLog/components/DetailModal.vue

@@ -16,13 +16,18 @@
       <el-form-item label="ID" prop="commissionLogId">
         {{ formData.commissionLogId || '--' }}
       </el-form-item>
-      <el-form-item label="分佣类型" prop="commissionType">
-        <span v-if="formData.commissionType === 1">社区订单</span>
-        <span v-else-if="formData.commissionType === 2">商圈订单</span>
-        <span v-else-if="formData.commissionType === 3">商城订单</span>
-        <span v-else-if="formData.commissionType === 4">团长升级</span>
-        <span v-else-if="formData.commissionType === 5">充值赠送代金券</span>
-        <span v-else-if="formData.commissionType === 6">赠送佣金活动</span>
+      <el-form-item label="活动配置类型" prop="commissionType">
+        <span v-if="formData.commissionType === 1">升级活动</span>
+        <span v-else-if="formData.commissionType === 2">分佣活动</span>
+        <span v-else-if="formData.commissionType === 3">社区活动</span>
+        <span v-else-if="formData.commissionType === 4">赠券活动</span>
+        <span v-else-if="formData.commissionType === 5">赠金活动</span>
+        <span v-else-if="formData.commissionType === 6">商圈订单</span>
+        <span v-else-if="formData.commissionType === 7">爆品家具</span>
+        <span v-else-if="formData.commissionType === 8">社区订单</span>
+        <span v-else-if="formData.commissionType === 9">用户代金券转增</span>
+        <span v-else-if="formData.commissionType === 10">商家代金券转赠</span>
+        <span v-else-if="formData.commissionType === 11">同城联盟卡</span>
         <span v-else>--</span>
       </el-form-item>
       <el-form-item label="交易时间" prop="tradeTime">
@@ -43,11 +48,11 @@
       <el-form-item label="佣金比例/金额" prop="orderProportion">
         {{ formData.orderProportion || '--' }}
       </el-form-item>
-      <el-form-item label="团长ID" prop="tId">
-        {{ formData.tId || '--' }}
+      <el-form-item label="上级ID" prop="tid">
+        {{ formData.tid || '--' }}
       </el-form-item>
-      <el-form-item label="团长手机号" prop="tPhone">
-        {{ formData.tPhone || '--' }}
+      <el-form-item label="上级手机号" prop="tphone">
+        {{ formData.tphone || '--' }}
       </el-form-item>
       <el-form-item label="用于分佣的佣金总额" prop="commissionPrice">
         {{ formData.commissionPrice || '--' }}
@@ -80,8 +85,8 @@ export default {
         phone: '',
         orderPrice: '',
         orderProportion: '',
-        tId: '',
-        tPhone: '',
+        tid: '',
+        tphone: '',
         commissionPrice: '',
         commissionDetail: ''
       }

src/views/relationshipChainManagement/commissionLog/index.vue

@@ -28,12 +28,17 @@
         <el-table-column align="center" width="100" label="ID" prop="commissionLogId" fixed="left" />
         <el-table-column align="center" label="分佣类型" prop="commissionType">
           <template slot-scope="{ row }">
-            <el-tag v-if="row.commissionType === 1" effect="plain">社区订单</el-tag>
-            <el-tag v-else-if="row.commissionType === 2" effect="plain">商圈订单</el-tag>
-            <el-tag v-else-if="row.commissionType === 3" effect="plain">商城订单</el-tag>
-            <el-tag v-else-if="row.commissionType === 4" effect="plain">团长升级</el-tag>
-            <el-tag v-else-if="row.commissionType === 5" effect="plain">充值赠送代金券</el-tag>
-            <el-tag v-else-if="row.commissionType === 6" effect="plain">赠送佣金活动</el-tag>
+            <el-tag v-if="row.commissionType === 1" effect="plain">升级活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 2" effect="plain">分佣活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 3" effect="plain">社区活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 4" effect="plain">赠券活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 5" effect="plain">赠金活动</el-tag>
+            <el-tag v-else-if="row.commissionType === 6" effect="plain">商圈订单</el-tag>
+            <el-tag v-else-if="row.commissionType === 7" effect="plain">爆品家具</el-tag>
+            <el-tag v-else-if="row.commissionType === 8" effect="plain">社区订单</el-tag>
+            <el-tag v-else-if="row.commissionType === 9" effect="plain">用户代金券转增</el-tag>
+            <el-tag v-else-if="row.commissionType === 10" effect="plain">商家代金券转赠</el-tag>
+            <el-tag v-else-if="row.commissionType === 11" effect="plain">同城联盟卡</el-tag>
             <span v-else>--</span>
           </template>
         </el-table-column>
@@ -43,8 +48,8 @@
         <el-table-column align="center" width="150" label="下单用户号码" prop="phone" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="支付金额" prop="orderPrice" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="佣金比例/金额" prop="orderProportion" show-overflow-tooltip />
-        <el-table-column align="center" width="100" label="团长ID" prop="tId" show-overflow-tooltip />
-        <el-table-column align="center" width="120" label="团长手机号" prop="tPhone" show-overflow-tooltip />
+        <el-table-column align="center" width="100" label="上级ID" prop="tid" show-overflow-tooltip />
+        <el-table-column align="center" width="120" label="上级手机号" prop="tphone" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="用于分佣的佣金总额" prop="commissionPrice" show-overflow-tooltip />
         <!-- <el-table-column align="center" width="100" label="佣金分配详情" prop="commissionDetail" show-overflow-tooltip /> -->
         <el-table-column align="center" label="操作" width="220" fixed="right" class-name="small-padding fixed-width">