fix(dashboard): 规范会员身份与合伙股东概念，彻底清理误导性合伙人词汇并优化自购考核雷达
这个提交包含在：
chen
@@ -90,7 +90,7 @@
|
||||
.dashboard-index .font-bold { font-weight: 600; }
|
||||
.dashboard-index .cursor-pointer { cursor: pointer; }
|
||||
|
||||
/* 合伙人网络卡片 */
|
||||
/* 合伙股东与角色身份网络卡片 */
|
||||
.dashboard-index .network-card {
|
||||
padding: 14px 16px;
|
||||
min-height: 98px;
|
||||
@@ -505,7 +505,7 @@
|
||||
<span class="currency">¥</span>{{ state.finance.rigid_cash_liability }}
|
||||
</div>
|
||||
<div class="finance-sub-metric sa-flex sa-row-between">
|
||||
<span>① 用户未提现分润 (随时可提现)：</span>
|
||||
<span>① 用户未提现收益 (随时可提现)：</span>
|
||||
<strong class="text-warning">¥{{ state.finance.commission_float }}</strong>
|
||||
</div>
|
||||
<div class="finance-sub-metric sa-flex sa-row-between">
|
||||
@@ -547,13 +547,13 @@
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
<!-- 创客合伙人梯队 -->
|
||||
<!-- 创客骨干梯队 (合伙股东) -->
|
||||
<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
|
||||
<div class="network-card card">
|
||||
<div class="sa-flex sa-row-between mb-2">
|
||||
<div class="sa-flex">
|
||||
<span class="network-badge bg-cyan mr-2">创</span>
|
||||
<span class="font-bold text-dark" style="font-size: 14px;">创客合伙骨干 (V1~V6)</span>
|
||||
<span class="font-bold text-dark" style="font-size: 14px;">创客骨干 (V1~V6 · 合伙股东)</span>
|
||||
</div>
|
||||
<span class="text-cyan font-bold cursor-pointer" style="font-size: 18px;" @click="onOpenAgent('')">
|
||||
{{ state.partner.maker_count }} <span style="font-size: 12px; color: var(--sa-subfont);">人</span>
|
||||
@@ -608,14 +608,14 @@
|
||||
<div class="role-table-card card">
|
||||
<div class="sa-flex sa-row-between mb-3 sa-flex-wrap">
|
||||
<div>
|
||||
<span class="font-bold text-dark" style="font-size: 15px;">全角色身份会员资产与分佣统计全景矩阵</span>
|
||||
<span class="font-bold text-dark" style="font-size: 15px;">全角色身份会员资产与收益统计全景矩阵</span>
|
||||
<span style="font-size: 12px; color: var(--sa-subfont); margin-left: 12px;">
|
||||
逐一统计每一个角色身份的会员人数、持豆存量、实时市值、专属业务分润与笔数
|
||||
逐一统计每一个会员角色身份（普通会员、品酒师、合伙股东各层级）的人数、持豆存量、实时市值、专属业务收益与笔数
|
||||
</span>
|
||||
</div>
|
||||
<div class="sa-flex" style="margin-top: 4px;">
|
||||
<el-button size="small" type="primary" plain @click="onOpenAgent('')">合伙股东档案 →</el-button>
|
||||
<el-button size="small" type="success" plain @click="onOpenReward('')">全部分成流水 →</el-button>
|
||||
<el-button size="small" type="success" plain @click="onOpenReward('')">全部结算流水 →</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -659,10 +659,10 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="专属业务分佣" min-width="140" align="right">
|
||||
<el-table-column label="专属业务收益" min-width="140" align="right">
|
||||
<template #header>
|
||||
<span style="font-size: 13px;">专属业务分佣</span>
|
||||
<el-tooltip content="按各角色专属分润类型归集（如创客极差/酒道馆/区县），杜绝一人兼多职时交叉重复计算" placement="top">
|
||||
<span style="font-size: 13px;">专属业务收益</span>
|
||||
<el-tooltip content="按各角色专属奖励类型归集（如创客进阶/酒道馆/区县），杜绝一人兼多职时交叉重复计算" placement="top">
|
||||
<i class="el-icon-info text-muted" style="margin-left: 2px; cursor: pointer;"></i>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
@@ -671,7 +671,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="分佣笔数" width="100" align="center">
|
||||
<el-table-column label="结算笔数" width="100" align="center">
|
||||
<template #default="scope">
|
||||
<span class="font-bold">{{ scope.row.reward_count }}</span>
|
||||
<span style="font-size: 11px; color: var(--sa-subfont);"> 笔</span>
|
||||
@@ -679,9 +679,15 @@
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="30天自购考核" min-width="170">
|
||||
<template #header>
|
||||
<span style="font-size: 13px;">30天自购考核</span>
|
||||
<el-tooltip content="仅具备合伙股东身份（创客V1~V6、酒道馆、区县代理）需按月履行自购以维持分润资格；普通会员及品酒师属于基础会员，无需自购考核" placement="top">
|
||||
<i class="el-icon-info text-muted" style="margin-left: 2px; cursor: pointer;"></i>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.is_exempt_active" class="text-muted" style="font-size: 12px;">
|
||||
<el-tag size="mini" type="info" effect="plain">{{ scope.row.active_text || '无需自购考核' }}</el-tag>
|
||||
<el-tag size="mini" type="info" effect="plain">{{ scope.row.active_text || '无需自购考核 (基础会员)' }}</el-tag>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div class="sa-flex sa-row-between" style="font-size: 12px; margin-bottom: 3px;">
|
||||
@@ -704,7 +710,7 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- ================= 2.3 COO 运营全貌 · 用户转化漏斗、合伙人掉队雷达与库存安全 ================= -->
|
||||
<!-- ================= 2.3 COO 运营全貌 · 用户转化漏斗、合伙股东自购雷达与库存安全 ================= -->
|
||||
<el-row :gutter="16">
|
||||
<!-- 左侧：电商用户转化漏斗与复购动销 -->
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="8">
|
||||
@@ -752,14 +758,17 @@
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
<!-- 中间：合伙人 30 天自购考核与续期雷达 -->
|
||||
<!-- 中间：合伙股东身份 30 天自购考核与续期雷达 -->
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="8">
|
||||
<div class="coo-panel-card card">
|
||||
<div class="sa-flex sa-row-between mb-3">
|
||||
<div>
|
||||
<span class="font-bold text-dark" style="font-size: 14px;">合伙人 30天自购考核与续期雷达</span>
|
||||
<div class="sa-flex">
|
||||
<span class="font-bold text-dark" style="font-size: 14px;">合伙股东身份 30天自购考核与续期雷达</span>
|
||||
<el-tooltip content="合伙股东（创客/酒道馆/区县）是会员专属进阶身份，享有团队分润，需保持 30 天自购活跃；普通会员与品酒师属于基础会员，免于考核" placement="top">
|
||||
<i class="el-icon-info text-muted" style="margin-left: 4px; cursor: pointer;"></i>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
<span class="cursor-pointer text-primary" style="font-size: 12px;" @click="onOpenAgent('')">合伙团队 →</span>
|
||||
<span class="cursor-pointer text-primary" style="font-size: 12px;" @click="onOpenAgent('')">合伙股东档案 →</span>
|
||||
</div>
|
||||
|
||||
<!-- 4状态指标标签 -->
|
||||
@@ -787,7 +796,7 @@
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<div class="radar-stat-pill" style="background: #fafafa; border: 1px solid #d9d9d9; text-align: center; padding: 6px 2px;">
|
||||
<div style="font-size: 11px; color: #595959;">新成员</div>
|
||||
<div style="font-size: 11px; color: #595959;">新晋股东</div>
|
||||
<div style="font-size: 16px; font-weight: bold; color: #595959; margin-top: 2px;">{{ state.operation.new_no_order_partners }}</div>
|
||||
<div style="font-size: 10px; color: #8c8c8c;">待首购激活</div>
|
||||
</div>
|
||||
@@ -797,7 +806,7 @@
|
||||
<!-- 7天临界断档名单列表（若有则提醒续期，若无则展示待续期列表） -->
|
||||
<div v-if="state.operation.warning_partners > 0">
|
||||
<div class="warning-alert-row mb-2 sa-flex sa-row-between">
|
||||
<span>⚠️ <strong>续期提醒：</strong>以下合伙人自购即将到期</span>
|
||||
<span>⚠️ <strong>续期提醒：</strong>以下合伙股东自购即将到期</span>
|
||||
<span style="font-weight: bold;">{{ state.operation.warning_partners }} 人临期</span>
|
||||
</div>
|
||||
<div style="max-height: 120px; overflow-y: auto;">
|
||||
@@ -819,10 +828,10 @@
|
||||
|
||||
<div v-else>
|
||||
<div class="sa-flex sa-row-between" style="background: #f6ffed; border: 1px solid #b7eb8f; padding: 8px 12px; border-radius: 6px; font-size: 12px; color: #389e0d; margin-bottom: 8px;">
|
||||
<span>🛡️ 合伙团队在保人员健康，暂无 7 天内临期合伙人</span>
|
||||
<span>🛡️ 合伙股东在保状态健康，暂无 7 天内临期人员</span>
|
||||
<span>全部在保</span>
|
||||
</div>
|
||||
<div style="font-size: 11px; color: var(--sa-subfont); margin-bottom: 4px;">超期待续期合伙人 (自购 1 单即可恢复分润资格)：</div>
|
||||
<div style="font-size: 11px; color: var(--sa-subfont); margin-bottom: 4px;">超期待续期合伙股东 (自购 1 单即可恢复分润资格)：</div>
|
||||
<div style="max-height: 100px; overflow-y: auto;">
|
||||
<div class="sa-flex sa-row-between mb-1 pb-1" v-for="pUser in state.operation.pending_renew_list.slice(0, 3)" :key="pUser.user_id" style="border-bottom: 1px dashed #f0f2f5; font-size: 12px;">
|
||||
<div class="sa-flex">
|
||||
@@ -833,7 +842,7 @@
|
||||
<el-tag size="mini" type="info" effect="plain">{{ pUser.overdue_text }}</el-tag>
|
||||
</div>
|
||||
<div v-if="!state.operation.pending_renew_list || state.operation.pending_renew_list.length === 0" class="text-muted" style="font-size: 11px; text-align: center; padding: 8px 0;">
|
||||
暂无超期待续期合伙人
|
||||
暂无超期待续期合伙股东
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -863,7 +872,7 @@
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12" class="mb-2">
|
||||
<div style="font-size: 11px; color: var(--sa-subfont);">合伙人自购达标率</div>
|
||||
<div style="font-size: 11px; color: var(--sa-subfont);">合伙股东自购达标率</div>
|
||||
<div class="sa-flex sa-row-between mt-1">
|
||||
<strong class="text-dark" style="font-size: 14px;">{{ state.partner?.active_rate || 0 }}%</strong>
|
||||
<el-tag size="mini" :type="state.operation?.risk_indicators?.partner_active_rate?.status || 'success'">
|
||||
@@ -981,7 +990,7 @@
|
||||
</div>
|
||||
|
||||
<div class="sa-flex sa-row-between mt-3 pt-2" style="border-top: 1px dashed var(--sa-space); font-size: 12px; color: var(--sa-subfont);">
|
||||
<span>区间马豆分红：<strong class="text-purple">{{ chart.data.periodMadow }} 豆</strong></span>
|
||||
<span>区间马豆贡献：<strong class="text-purple">{{ chart.data.periodMadow }} 豆</strong></span>
|
||||
<el-button type="primary" link size="small" @click="onOpenDaily">日结池详情</el-button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -990,7 +999,7 @@
|
||||
{/if}
|
||||
|
||||
{if $auth->check('shopro/dashboard/ranking')}
|
||||
<!-- ================= 4. 合伙人收益排行 & 电商运营与风控监控 ================= -->
|
||||
<!-- ================= 4. 合伙股东收益排行 & 电商运营与风控监控 ================= -->
|
||||
<el-row :gutter="16">
|
||||
<!-- 左侧：合伙股东收益排行 TOP 5 -->
|
||||
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
|
||||
|
||||
在新工单中引用
屏蔽一个用户