wikiboss/Henglianshutong
1
0
派生 0
代码 工单 合并请求 Actions 软件包 项目 版本发布 百科 动态

feat: 支持角色身份自定义名称全链路配置与动态展示

浏览代码
这个提交包含在：
chen
2026-09-17 15:40:47 +08:00
父节点 06e98c57e0
当前提交 f8179706b3
共有 24 个文件被更改，包括 508 次插入 和 110 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

32
application/admin/view/shopro/commission/agent/detail.html
查看文件

@@ -314,26 +314,36 @@
</el-form-item>
<div style="font-weight: 600; font-size: 13px; color: var(--sa-title); margin: 16px 0 10px; padding-bottom: 4px; border-bottom: 1px solid var(--sa-border);" class="sa-flex sa-row-between">
<span>合伙股东身份（会员进阶身份）</span>
<span>角色身份与进阶权益</span>
{if $auth->check('shopro/commission/agent/edit')}
<el-button type="primary" size="small" link @click="onOpenIdentity">开通 / 调整身份</el-button>
{/if}
</div>
<template v-if="state.data.is_partner">
<el-form-item label="合伙股东身份:">
<template v-if="state.data.is_advanced">
<el-form-item label="身份标签:">
<el-tag type="warning" effect="dark" size="small">{{ state.data.identity_text }}</el-tag>
</el-form-item>
<el-form-item label="酒道馆:">
<el-form-item :label="(state.data.custom_role_names?.maker || '创客') + '等级:'">
<el-tag size="small" :type="Number(state.data.level) >= 2 ? 'primary' : 'info'">
{{ Number(state.data.level) >= 2 ? (state.data.maker_level_name || (state.data.custom_role_names?.maker || '创客') + 'V' + (Number(state.data.level) - 1)) : '未升级' + (state.data.custom_role_names?.maker || '创客') }}
</el-tag>
</el-form-item>
<el-form-item :label="(state.data.custom_role_names?.venue || '酒道馆') + ':'">
<el-tag size="small" :type="state.data.is_venue ? 'success' : 'info'">
{{ state.data.is_venue ? '已开通' : '未开通' }}
</el-tag>
</el-form-item>
<el-form-item label="区县代理:">
<el-form-item :label="(state.data.custom_role_names?.county || '区县代理') + ':'">
<el-tag size="small" :type="state.data.is_county ? 'warning' : 'info'">
{{ state.data.is_county ? '已开通' + (state.data.county_code ? ' (' + state.data.county_code + ')' : '') : '未开通' }}
</el-tag>
</el-form-item>
<el-form-item :label="(state.data.custom_role_names?.partner || '合伙股东') + ':'">
<el-tag size="small" :type="state.data.is_partner ? 'danger' : 'info'">
{{ state.data.is_partner ? '已授予' + (state.data.custom_role_names?.partner || '合伙股东') : '未开通' }}
</el-tag>
</el-form-item>
<el-form-item label="30天自购考核:">
<span v-if="state.data.active_30d" style="color: #52c41a; font-weight: 500;">
🟢 正常领取
@@ -358,17 +368,17 @@
</template>
<template v-else>
<el-form-item label="进阶身份:">
<el-tag type="info" effect="plain" size="small">基础会员 · 品酒师（暂未开通合伙股东）</el-tag>
<el-form-item label="当前身份:">
<el-tag type="info" effect="plain" size="small">{{ state.data.identity_text || ('基础会员 · ' + (state.data.custom_role_names?.taster || '品酒师')) }}</el-tag>
</el-form-item>
<div style="font-size: 12px; color: var(--sa-subfont); line-height: 1.6; background: #f8fafc; border: 1px dashed var(--sa-border); border-radius: 4px; padding: 8px 12px; margin: 4px 0 10px;">
💡 <strong>「合伙股东」是会员专属进阶身份</strong>：当会员升级创客(V1~V6)或开通酒道馆、区县代理时自动附加合伙股东身份标签，并享有团队分润与平台日结分红。当前会员为基础会员，享有推三返一，<strong>免自购考核</strong>。
💡 <strong>进阶角色体系说明</strong>：系统拥有{{ state.data.custom_role_names?.maker || '创客' }}(V1~V6)、{{ state.data.custom_role_names?.venue || '酒道馆' }}、{{ state.data.custom_role_names?.county || '区县代理' }}、{{ state.data.custom_role_names?.partner || '合伙股东' }}等独立进阶角色，享有团队分润与平台日结分红。当前会员为基础会员，享有推三返一，<strong>免自购考核</strong>。
</div>
<el-form-item label="自购考核要求:">
<el-tag size="small" type="info">免自购考核 (基础会员/品酒师)</el-tag>
<el-tag size="small" type="info">免自购考核 (基础会员/{{ state.data.custom_role_names?.taster || '品酒师' }})</el-tag>
</el-form-item>
<el-form-item label="合伙股东权益:">
<span style="color: var(--sa-subfont);">晋升创客或开通馆/县后即可享有团队奖、极差奖与马豆分红</span>
<el-form-item label="进阶权益:">
<span style="color: var(--sa-subfont);">升级创客或开通馆/县/股东后即可享有团队奖、极差奖与马豆分红</span>
</el-form-item>
</template>

7
application/admin/view/shopro/commission/agent/index.html
查看文件

@@ -61,14 +61,15 @@
<template #default="scope">
<div>{{ scope.row.identity_text || '-' }}</div>
<div>
<el-tag v-if="scope.row.is_venue" size="small" type="success">酒道馆</el-tag>
<el-tag v-if="scope.row.is_county" size="small" type="warning">区县</el-tag>
<el-tag v-if="scope.row.is_venue" size="small" type="success">{{ scope.row.role_names?.venue || '酒道馆' }}</el-tag>
<el-tag v-if="scope.row.is_county" size="small" type="warning">{{ scope.row.role_names?.county || '区县代理' }}</el-tag>
<el-tag v-if="scope.row.is_partner" size="small" type="danger">{{ scope.row.role_names?.partner || '合伙股东' }}</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="30日活跃" min-width="100">
<template #default="scope">
<template v-if="scope.row.is_partner">
<template v-if="scope.row.is_advanced">
<span class="sa-flex sa-col-center">
<i class="active-dot" :class="scope.row.active_30d ? 'is-on' : 'is-off'"></i>
{{ scope.row.active_30d ? '有自购' : '已暂停' }}

17
application/admin/view/shopro/config/index.html
查看文件

@@ -885,6 +885,23 @@
<div class="tip">partner_mode=1 时新单不再写百分比佣金</div>
</div>
</el-form-item>
<div class="sa-title is-line">角色身份自定义名称</div>
<el-form-item label="品酒师自定义名称">
<el-input class="sa-w-360" v-model="form.model.partner_role_name_taster" placeholder="默认：品酒师"></el-input>
<div class="tip">基础会员身份名称，如自定义为「品鉴官」，为空时恢复默认「品酒师」</div>
</el-form-item>
<el-form-item label="创客自定义基础名称">
<el-input class="sa-w-360" v-model="form.model.partner_role_name_maker" placeholder="默认：创客"></el-input>
<div class="tip">创客基础称谓，系统自动衍生各等级（如输入「服务商」，将展示为 服务商V1 ~ 服务商V6）</div>
</el-form-item>
<el-form-item label="酒道馆自定义名称">
<el-input class="sa-w-360" v-model="form.model.partner_role_name_venue" placeholder="默认：酒道馆"></el-input>
<div class="tip">实体枢纽身份名称，如自定义为「星级体验馆」，为空时恢复默认「酒道馆」</div>
</el-form-item>
<el-form-item label="区县代理自定义名称">
<el-input class="sa-w-360" v-model="form.model.partner_role_name_county" placeholder="默认：区县代理"></el-input>
<div class="tip">区域渠道领头人身份名称，如自定义为「城市合伙人」，为空时恢复默认「区县代理」</div>
</el-form-item>
<div class="sa-title is-line">计单 / 活跃</div>
<el-form-item label="合格订单口径">
<el-radio-group v-model="form.model.partner_count_type">

16
application/admin/view/shopro/dashboard/index.html
查看文件

@@ -528,8 +528,8 @@
<div class="network-card card">
<div class="sa-flex sa-row-between mb-2">
<div class="sa-flex">
<span class="network-badge bg-primary mr-2">品</span>
<span class="font-bold text-dark" style="font-size: 14px;">品酒师会员</span>
<span class="network-badge bg-primary mr-2">{{ (state.partner.role_names?.taster || '品').substr(0, 1) }}</span>
<span class="font-bold text-dark" style="font-size: 14px;">{{ state.partner.role_names?.taster || '品酒师' }}会员</span>
</div>
<span class="text-primary font-bold cursor-pointer" style="font-size: 18px;" @click="onOpenAgent(1)">
{{ state.partner.taster_count }} <span style="font-size: 12px; color: var(--sa-subfont);">人</span>
@@ -552,8 +552,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="network-badge bg-cyan mr-2">{{ (state.partner.role_names?.maker || '创').substr(0, 1) }}</span>
<span class="font-bold text-dark" style="font-size: 14px;">{{ state.partner.role_names?.maker || '创客' }}骨干梯队 (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>
@@ -584,15 +584,15 @@
<span class="font-bold text-dark" style="font-size: 14px;">实体与区域渠道</span>
</div>
<div class="sa-flex">
<span class="text-orange font-bold mr-2" style="font-size: 14px;">馆 {{ state.partner.venue_count }} 家</span>
<span class="text-purple font-bold" style="font-size: 14px;">县 {{ state.partner.county_count }} 个</span>
<span class="text-orange font-bold mr-2" style="font-size: 14px;">{{ (state.partner.role_names?.venue || '馆').substr(0, 1) }} {{ state.partner.venue_count }} 家</span>
<span class="text-purple font-bold" style="font-size: 14px;">{{ (state.partner.role_names?.county || '县').substr(0, 1) }} {{ state.partner.county_count }} 个</span>
</div>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px;">
<span>酒道馆：持豆 <strong class="text-purple">{{ state.partner.role_stats?.venue?.madow_total || '0.00' }}</strong> / 收益 <strong class="text-warning">¥{{ state.partner.role_stats?.venue?.reward_amount || '0.00' }}</strong></span>
<span>{{ state.partner.role_names?.venue || '酒道馆' }}：持豆 <strong class="text-purple">{{ state.partner.role_stats?.venue?.madow_total || '0.00' }}</strong> / 收益 <strong class="text-warning">¥{{ state.partner.role_stats?.venue?.reward_amount || '0.00' }}</strong></span>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px; margin-top: 6px;">
<span>区县代理：持豆 <strong class="text-purple">{{ state.partner.role_stats?.county?.madow_total || '0.00' }}</strong> / 收益 <strong class="text-warning">¥{{ state.partner.role_stats?.county?.reward_amount || '0.00' }}</strong></span>
<span>{{ state.partner.role_names?.county || '区县代理' }}：持豆 <strong class="text-purple">{{ state.partner.role_stats?.county?.madow_total || '0.00' }}</strong> / 收益 <strong class="text-warning">¥{{ state.partner.role_stats?.county?.reward_amount || '0.00' }}</strong></span>
</div>
<div class="sa-flex sa-row-between text-muted" style="font-size: 12px; margin-top: 6px;">
<span>享团队级差分润 + 平台日结均分池</span>

2
application/admin/view/shopro/partner/reward/index.html
查看文件

@@ -48,7 +48,7 @@
</template>
</el-table-column>
<el-table-column prop="reward_type_text" label="奖励类型" min-width="120"></el-table-column>
<el-table-column prop="role_text" label="合伙身份" min-width="80"></el-table-column>
<el-table-column prop="role_text" label="受益身份" min-width="80"></el-table-column>
<el-table-column label="结算金额" min-width="90">
<template #default="scope"> {{ scope.row.amount }} </template>
</el-table-column>