feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐

这个提交包含在:
chen
2026-09-19 11:49:57 +08:00
父节点 85947e43ae
当前提交 aca0d3c671
共有 83 个文件被更改,包括 4146 次插入 和 443 次删除

查看文件

@@ -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>

查看文件

@@ -227,7 +227,7 @@
<!-- 状态为不参与时的警示提示 -->
<el-alert v-if="state.commission_goods.status == 0" type="warning" show-icon :closable="false"
title="商品未参与计奖"
description="当前商品已关闭计奖,会员或下级购买该商品时将不产生推荐开拓奖、创客极差、酒道馆/区县团队奖及兑换券,亦不进入全网日结均分奖池。"
description="当前商品已关闭计奖,会员或下级购买该商品时将不产生推荐提成、创客极差、酒道馆/区县管理奖及兑换券,亦不进入全网日结均分奖池。"
style="margin-bottom: 20px;">
</el-alert>
@@ -239,7 +239,7 @@
</div>
<div class="preview-list">
<div class="preview-item">
<strong>推荐开拓奖(推三返一):</strong>
<strong>推荐提成(推三返一):</strong>
循环返现 ¥{{ state.defaultPartnerRules.push3_amounts?.[0] || 398 }} / ¥{{ state.defaultPartnerRules.push3_amounts?.[1] || 400 }} / ¥{{ state.defaultPartnerRules.push3_amounts?.[2] || 600 }} 元
</div>
<div class="preview-item">
@@ -251,11 +251,11 @@
同级协同 {{ ((state.defaultPartnerRules.maker_peer_rate || 0.10) * 100).toFixed(0) }}%,超越关怀 {{ ((state.defaultPartnerRules.maker_overtaken_rate || 0.05) * 100).toFixed(0) }}%
</div>
<div class="preview-item">
<strong>渠道运营统筹奖:</strong>
酒道馆 ¥{{ state.defaultPartnerRules.venue_split || 50 }},区县统筹 ¥{{ state.defaultPartnerRules.county_full || 100 }}(有馆时各50)
<strong>实体渠道管理奖:</strong>
酒道馆 ¥{{ state.defaultPartnerRules.venue_split || 50 }},区县管理 ¥{{ state.defaultPartnerRules.county_full || 100 }}(有馆时各50)
</div>
<div class="preview-item">
<strong>馆/县平级协同奖:</strong>
<strong>馆/县平级奖:</strong>
酒道馆 {{ ((state.defaultPartnerRules.venue_peer_rate || 0.10) * 100).toFixed(0) }}%,区县代理 {{ ((state.defaultPartnerRules.county_peer_rate || 0.10) * 100).toFixed(0) }}%
</div>
<div class="preview-item">
@@ -300,10 +300,10 @@
<!-- 当前激活的表单对象引用 -->
<template v-for="curForm in [(state.skuMode === 'sku' && state.activeSkuId) ? state.skuRules[state.activeSkuId] : state.ruleForm]">
<!-- 1. 推荐开拓奖(推三返一) -->
<!-- 1. 推荐提成(推三返一) -->
<div class="section-box">
<div class="section-header">
<div class="section-title">1. 推荐开拓奖(推三返一循环返现)</div>
<div class="section-title">1. 推荐提成(推三返一循环返现)</div>
<span class="section-tip">直推有效单奖励,每 3 笔订单形成一个循环返还货款</span>
</div>
<div class="rules-grid">
@@ -388,21 +388,21 @@
</div>
</div>
<!-- 3. 实体渠道与区域运营奖(团队拆分) -->
<!-- 3. 实体渠道与区域管理奖(团队拆分) -->
<div class="section-box">
<div class="section-header">
<div class="section-title">3. 实体渠道与区域运营奖(团队拆分)</div>
<div class="section-title">3. 实体渠道与区域管理奖(团队拆分)</div>
<span class="section-tip">无馆有县独享,有馆有县各分其半</span>
</div>
<div class="rules-grid-2" style="margin-bottom: 14px;">
<div class="field-item">
<div class="field-label">酒道馆运营奖基准</div>
<div class="field-label">酒道馆管理奖基准</div>
<el-input v-model="curForm.venue_split" type="number" :min="0">
<template #append>元</template>
</el-input>
</div>
<div class="field-item">
<div class="field-label">区县统筹全额(无馆时独享)</div>
<div class="field-label">区县管理全额(无馆时独享)</div>
<el-input v-model="curForm.county_full" type="number" :min="0">
<template #append>元</template>
</el-input>
@@ -410,13 +410,13 @@
</div>
<div class="rules-grid-2">
<div class="field-item">
<div class="field-label">酒道馆平级协同比例</div>
<div class="field-label">酒道馆平级比例</div>
<el-input v-model="curForm.venue_peer_rate" type="number" :min="0" :max="100">
<template #append>%</template>
</el-input>
</div>
<div class="field-item">
<div class="field-label">区县代理平级协同比例</div>
<div class="field-label">区县代理平级比例</div>
<el-input v-model="curForm.county_peer_rate" type="number" :min="0" :max="100">
<template #append>%</template>
</el-input>

查看文件

@@ -6,6 +6,7 @@
<div class="sa-title sa-flex sa-row-between">
<div class="sa-title-left">
<div class="left-name">历史佣金</div>
<el-tag size="small" type="info" style="margin-left: 10px;">注:当前收益分成已全额直入商城余额,历史未转佣金可批量转入余额</el-tag>
<sa-filter-condition v-model="state.filter" @filter-delete="onChangeFilter">
</sa-filter-condition>
</div>