feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐
这个提交包含在:
@@ -304,7 +304,7 @@
|
||||
<el-form-item label="直推奖(推三返一):">
|
||||
<div>第 {{ state.data.direct_order_seq || 0 }} 单,{{ state.data.next_push3_text || '' }}</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="累计直推开拓奖:">
|
||||
<el-form-item label="累计推荐提成:">
|
||||
<div>{{ state.data.push3_cash_income || '0.00' }} 元</div>
|
||||
</el-form-item>
|
||||
|
||||
@@ -357,8 +357,8 @@
|
||||
{{ state.data.madow || 0 }}(约合 ¥{{ state.data.madow_value || '0.00' }})
|
||||
</el-form-item>
|
||||
<el-form-item label="消费补贴兑换券:">
|
||||
总额 {{ state.data.voucher_total || 0 }} / 已释放 {{ state.data.voucher_released || 0 }} /
|
||||
已使用 {{ state.data.voucher_used || 0 }} / 可用 {{ state.data.voucher_available || 0 }}
|
||||
总额 {{ state.data.voucher_total || 0 }} 个 / 已释放 {{ state.data.voucher_released || 0 }} 个 /
|
||||
已使用 {{ state.data.voucher_used || 0 }} 个 / 可用 {{ state.data.voucher_available || 0 }} 个
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
@@ -382,9 +382,10 @@
|
||||
</div>
|
||||
<el-form-item label="收益中心累计现金:">
|
||||
<span style="font-size: 16px; font-weight: 600; color: #f56c6c;">
|
||||
{{ state.data.income_total_cash || state.data.partner_cash_income || '0.00' }}
|
||||
{{ state.data.total_income || state.data.income_total_cash || '0.00' }}
|
||||
</span>
|
||||
<span class="ml-1" style="font-size: 12px; color: var(--sa-subfont);">元</span>
|
||||
<el-tag size="small" type="success" style="margin-left: 8px;">直入商城余额</el-tag>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" link
|
||||
@@ -617,21 +618,28 @@
|
||||
<span>资产信息</span>
|
||||
</div>
|
||||
<el-row>
|
||||
<el-col class="item" :xs="12" :sm="8" :md="8" :lg="8" :xl="8">
|
||||
<div class="left">累计佣金:</div>
|
||||
<el-col class="item" :xs="12" :sm="6" :md="6" :lg="6" :xl="6">
|
||||
<div class="left">累计收益/佣金:</div>
|
||||
<div class="right">
|
||||
{{ state.data.total_income }}
|
||||
<span class="unit">元</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col class="item" :xs="12" :sm="8" :md="8" :lg="8" :xl="8">
|
||||
<div class="left">待入账佣金:</div>
|
||||
<div class="right">
|
||||
{{ state.data.pending_reward }}
|
||||
<el-col class="item" :xs="12" :sm="6" :md="6" :lg="6" :xl="6">
|
||||
<div class="left">商城可用余额:</div>
|
||||
<div class="right" style="color: #67c23a;">
|
||||
{{ state.data.user?.money || state.data.user_money || '0.00' }}
|
||||
<span class="unit">元</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col class="item" :xs="12" :sm="8" :md="8" :lg="8" :xl="8">
|
||||
<el-col class="item" :xs="12" :sm="6" :md="6" :lg="6" :xl="6">
|
||||
<div class="left">历史未转佣金:</div>
|
||||
<div class="right" style="color: #e6a23c;">
|
||||
{{ state.data.user?.commission || state.data.user_commission || '0.00' }}
|
||||
<span class="unit">元</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col class="item" :xs="12" :sm="6" :md="6" :lg="6" :xl="6">
|
||||
<div class="left">消费金额:</div>
|
||||
<div class="right">
|
||||
{{ state.data.user?.total_consume || 0 }}
|
||||
@@ -646,7 +654,7 @@
|
||||
<el-tabs class="sa-tabs" v-model="log.tabActive" @tab-change="onChangeTab">
|
||||
<el-tab-pane label="分销动态" name="log"></el-tab-pane>
|
||||
<el-tab-pane label="分销订单" name="order"></el-tab-pane>
|
||||
<el-tab-pane label="佣金明细" name="reward"></el-tab-pane>
|
||||
<el-tab-pane label="历史分销佣金" name="reward"></el-tab-pane>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
<el-table v-if="log.tabActive=='log'" class="sa-table" :data="log.data" stripe>
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="可用兑换券" min-width="110">
|
||||
<template #default="scope"> {{ scope.row.voucher_available || 0 }} </template>
|
||||
<template #default="scope"> {{ scope.row.voucher_available || 0 }} 个 </template>
|
||||
</el-table-column>
|
||||
<el-table-column label="累计佣金" min-width="120">
|
||||
<template #default="scope"> {{ scope.row.total_income }}元 </template>
|
||||
|
||||
在新工单中引用
屏蔽一个用户