feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐
这个提交包含在:
@@ -186,7 +186,7 @@
|
||||
<el-dropdown-item command="money">充值余额 (元)</el-dropdown-item>
|
||||
<el-dropdown-item command="madow">充值马豆 (颗)</el-dropdown-item>
|
||||
<el-dropdown-item command="score">充值积分 (分)</el-dropdown-item>
|
||||
<el-dropdown-item command="voucher">充值兑换券 (元)</el-dropdown-item>
|
||||
<el-dropdown-item command="voucher">充值兑换券 (个)</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
@@ -418,18 +418,18 @@
|
||||
<div class="card-title">二开核心资产中枢</div>
|
||||
<div class="card-section">
|
||||
<el-row :gutter="12">
|
||||
<!-- 资产 1: 收益钱包 -->
|
||||
<!-- 资产 1: 收益中心 -->
|
||||
<el-col :xs="24" :sm="12" :md="6">
|
||||
<div class="asset-card-box">
|
||||
<div class="asset-card-label">可提现收益 (钱包现金)</div>
|
||||
<div class="asset-card-label">收益中心累计收益 (元)</div>
|
||||
<div class="asset-card-num" style="color: #409eff;">
|
||||
¥{{ state.detail.commission || '0.00' }}
|
||||
¥{{ state.detail.total_income || state.detail.income_total_cash || '0.00' }}
|
||||
</div>
|
||||
<div class="asset-card-desc">
|
||||
累计总现金: ¥{{ state.detail.income_total_cash || '0.00' }}
|
||||
当前商城余额: ¥{{ state.detail.money || '0.00' }}
|
||||
</div>
|
||||
<div class="asset-card-desc">
|
||||
进阶加权奖: ¥{{ state.detail.partner_exclusive_cash || '0.00' }}
|
||||
历史未转佣金: ¥{{ state.detail.commission || '0.00' }}
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
@@ -465,13 +465,13 @@
|
||||
{/if}
|
||||
</div>
|
||||
<div class="asset-card-num" style="color: #e6a23c;">
|
||||
¥{{ state.detail.voucher_available || '0.00' }}
|
||||
{{ state.detail.voucher_available || '0.00' }} 个
|
||||
</div>
|
||||
<div class="asset-card-desc">
|
||||
计划总额: ¥{{ state.detail.voucher_total || '0.00' }}
|
||||
计划总额: {{ state.detail.voucher_total || '0.00' }} 个
|
||||
</div>
|
||||
<div class="asset-card-desc">
|
||||
已释放: ¥{{ state.detail.voucher_released || '0.00' }} / 已用: ¥{{ state.detail.voucher_used || '0.00' }}
|
||||
已释放: {{ state.detail.voucher_released || '0.00' }} 个 / 已用: {{ state.detail.voucher_used || '0.00' }} 个
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
@@ -517,7 +517,7 @@
|
||||
<el-tab-pane label="收益中心流水" name="partner_reward"></el-tab-pane>
|
||||
<el-tab-pane label="兑换券释放计划" name="voucher_plan"></el-tab-pane>
|
||||
<el-tab-pane label="直推团队成员" name="team"></el-tab-pane>
|
||||
<el-tab-pane label="佣金记录" name="commission"></el-tab-pane>
|
||||
<el-tab-pane label="佣金与收益流水" name="commission"></el-tab-pane>
|
||||
<el-tab-pane label="余额记录" name="money"></el-tab-pane>
|
||||
<el-tab-pane label="积分记录" name="score"></el-tab-pane>
|
||||
<el-tab-pane label="商城订单" name="order"></el-tab-pane>
|
||||
@@ -541,6 +541,13 @@
|
||||
</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="入账账户" min-width="110">
|
||||
<template #default="scope">
|
||||
<el-tag size="small" :type="scope.row.wallet_type === 'money' ? 'success' : (scope.row.wallet_type === 'madow' ? 'primary' : (scope.row.wallet_type === 'commission' ? 'warning' : 'info'))">
|
||||
{{ scope.row.wallet_type_text || (Number(scope.row.amount) > 0 ? '商城余额' : (Number(scope.row.madow) > 0 ? '分红马豆' : '消费补贴')) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="madow" label="结算马豆" min-width="90"></el-table-column>
|
||||
<el-table-column label="买家" min-width="140">
|
||||
<template #default="scope">
|
||||
@@ -582,12 +589,12 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="total_fee" label="计划总额" min-width="110">
|
||||
<template #default="scope">
|
||||
<b>¥{{ scope.row.total_fee }}</b>
|
||||
<b>{{ scope.row.total_fee }} 个</b>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="day_amount" label="每日释放" min-width="100">
|
||||
<template #default="scope">
|
||||
¥{{ scope.row.day_amount }}
|
||||
{{ scope.row.day_amount }} 个
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="释放进度" min-width="140">
|
||||
@@ -598,10 +605,14 @@
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="released_amount" label="已释放金额" min-width="110"></el-table-column>
|
||||
<el-table-column prop="voucher_available" label="当前可用额" min-width="110">
|
||||
<el-table-column label="已释放" min-width="110">
|
||||
<template #default="scope">
|
||||
<span style="color: #67c23a; font-weight: 600;">¥{{ scope.row.voucher_available }}</span>
|
||||
{{ scope.row.released_amount }} 个
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="voucher_available" label="当前可用" min-width="110">
|
||||
<template #default="scope">
|
||||
<span style="color: #67c23a; font-weight: 600;">{{ scope.row.voucher_available }} 个</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="start_date" label="开始日期" width="120"></el-table-column>
|
||||
@@ -651,6 +662,13 @@
|
||||
<el-table-column prop="amount" label="变动金额/积分" min-width="120"></el-table-column>
|
||||
<el-table-column prop="before" label="变动前" min-width="120"></el-table-column>
|
||||
<el-table-column prop="after" label="变动后" min-width="120"></el-table-column>
|
||||
<el-table-column label="钱包类别" min-width="110" v-if="log.tabActive=='commission'">
|
||||
<template #default="scope">
|
||||
<el-tag size="small" :type="scope.row.type == 'money' ? 'success' : 'warning'">
|
||||
{{ scope.row.type == 'money' ? '商城余额' : '佣金钱包' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作人" min-width="160">
|
||||
<template #default="scope">
|
||||
<sa-user-profile type="oper" :user="scope.row.oper" :id="scope.row.oper_id">
|
||||
|
||||
@@ -151,17 +151,17 @@
|
||||
|
||||
<el-table-column label="收益中心资产" min-width="190">
|
||||
<template #default="scope">
|
||||
<div><span class="asset-sub">可提现收益:</span> <b>¥{{ scope.row.commission || '0.00' }}</b></div>
|
||||
<div class="asset-sub">马豆: {{ scope.row.madow || 0 }} (约 ¥{{ scope.row.madow_value || '0.00' }})</div>
|
||||
<div class="asset-sub">可用券: ¥{{ scope.row.voucher_available || '0.00' }}</div>
|
||||
<div><span class="asset-sub">累计收益:</span> <b style="color: #409eff;">¥{{ scope.row.total_income || scope.row.income_total_cash || '0.00' }}</b></div>
|
||||
<div class="asset-sub">商城余额: ¥{{ scope.row.money || '0.00' }}</div>
|
||||
<div class="asset-sub">未转佣金: ¥{{ scope.row.commission || '0.00' }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="商城钱包与消费" min-width="160">
|
||||
<el-table-column label="马豆与补贴券" min-width="170">
|
||||
<template #default="scope">
|
||||
<div><span class="asset-sub">余额:</span> ¥{{ scope.row.money || '0.00' }}</div>
|
||||
<div class="asset-sub">积分: {{ scope.row.score || 0 }}</div>
|
||||
<div class="asset-sub">消费: ¥{{ scope.row.total_consume || '0.00' }}</div>
|
||||
<div><span class="asset-sub">分红马豆:</span> {{ scope.row.madow || 0 }} 颗</div>
|
||||
<div class="asset-sub">马豆估值: ¥{{ scope.row.madow_value || '0.00' }}</div>
|
||||
<div class="asset-sub">可用券: {{ scope.row.voucher_available || '0.00' }} 个</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
<el-col :span="6">
|
||||
<div style="background: #ffffff; padding: 8px 10px; border-radius: 6px; border: 1px solid #edf2f7; text-align: center;">
|
||||
<div style="font-size: 11px; color: #64748b;">可用兑换券</div>
|
||||
<div style="font-size: 13px; font-weight: 600; color: #ea580c; margin-top: 2px;">¥{{ state.user.voucher_available || '0.00' }}</div>
|
||||
<div style="font-size: 13px; font-weight: 600; color: #ea580c; margin-top: 2px;">{{ state.user.voucher_available || '0.00' }} 个</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -54,7 +54,7 @@
|
||||
<el-radio-button label="money">余额 (元)</el-radio-button>
|
||||
<el-radio-button label="madow">马豆 (颗)</el-radio-button>
|
||||
<el-radio-button label="score">积分 (分)</el-radio-button>
|
||||
<el-radio-button label="voucher">兑换券 (元)</el-radio-button>
|
||||
<el-radio-button label="voucher">兑换券 (个)</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
<span v-if="form.model.type === 'money'">¥{{ currentBalance }}</span>
|
||||
<span v-else-if="form.model.type === 'madow'">{{ currentBalance }} 颗 (实时估值 ¥{{ state.user ? state.user.madow_value : '0.00' }})</span>
|
||||
<span v-else-if="form.model.type === 'score'">{{ currentBalance }} 积分</span>
|
||||
<span v-else-if="form.model.type === 'voucher'">¥{{ currentBalance }} (计划总额 ¥{{ state.user ? state.user.voucher_total : '0.00' }})</span>
|
||||
<span v-else-if="form.model.type === 'voucher'">{{ currentBalance }} 个 (计划总额 {{ state.user ? state.user.voucher_total : '0.00' }} 个)</span>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户