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

fix(commission): 优化分销商升级锁定开关与雷达标识文案提示，防止误锁定升级

浏览代码
这个提交包含在：
chen
2026-09-29 21:28:39 +08:00
父节点 511a8cb485
当前提交 3a7c13f026
共有 3 个文件被更改，包括 25 次插入 和 9 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@@ -412,9 +412,13 @@
</el-form-item>
<el-form-item label="允许自动升级:">
{if $auth->check('shopro/commission/agent/edit')}
<el-switch v-model="state.data.upgrade_lock" :active-value="0" :inactive-value="1"
@change="state.data.user_id?onEdit({upgrade_lock: state.data.upgrade_lock}): ''">
</el-switch>
<div class="sa-flex sa-flex-wrap" style="gap: 8px; align-items: center;">
<el-switch v-model="state.data.upgrade_lock" :active-value="0" :inactive-value="1"
@change="state.data.user_id?onEdit({upgrade_lock: state.data.upgrade_lock}): ''">
</el-switch>
<span style="font-size: 12px; color: #10b981;" v-if="state.data.upgrade_lock == 0">已允许 (达标自动晋升)</span>
<span style="font-size: 12px; color: #ef4444;" v-else>⚠️ 已锁定 (禁止自动晋升)</span>
</div>
{/if}
</el-form-item>
<el-form-item label="直推奖(推三返一):">
@@ -578,7 +582,7 @@
</div>
<div>
<el-tag v-if="state.data.operational_stats.upgrade_radar.upgrade_lock" type="danger" size="small">
已锁定升级
⚠️ 升级已被锁定(禁止自动晋升)
</el-tag>
<el-tag v-else-if="state.data.operational_stats.upgrade_radar.all_reached" type="success" size="small">
✓ 晋升条件全部达成
@@ -1047,8 +1051,14 @@
value: 'id', label: 'name', children: 'children', checkStrictly: true, emitPath: true
}" clearable filterable style="width:100%" @change="onIdentityAreaChange"></el-cascader>
</el-form-item>
<el-form-item label="升级锁定">
<el-form-item label="锁定升级">
<el-switch v-model="identity.form.upgrade_lock" :active-value="1" :inactive-value="0"></el-switch>
<div style="font-size:12px; color:#ef4444; margin-top:2px;" v-if="identity.form.upgrade_lock">
⚠️ 已开启锁定：该分销商将禁止自动升级（即使满足业绩条件也不会晋升）
</div>
<div style="font-size:12px; color:#10b981; margin-top:2px;" v-else>
✓ 未锁定：正常允许分销商根据业绩达标自动晋升
</div>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="identity.form.remark" type="textarea"></el-input>

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

@@ -63,7 +63,7 @@
<div>
<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>
<el-tag v-if="scope.row.is_partner" size="small" type="danger">{{ scope.row.role_names?.partner || '合伙人' }}</el-tag>
</div>
</template>
</el-table-column>
@@ -279,8 +279,14 @@
}" clearable filterable style="width:100%" @change="onIdentityAreaChange"></el-cascader>
<div class="tip" style="margin-top:4px;color:#999;font-size:12px">编码：{{ identity.form.county_code || '-' }}</div>
</el-form-item>
<el-form-item label="升级锁定">
<el-form-item label="锁定升级">
<el-switch v-model="identity.form.upgrade_lock" :active-value="1" :inactive-value="0"></el-switch>
<div style="font-size:12px; color:#ef4444; margin-top:2px;" v-if="identity.form.upgrade_lock">
⚠️ 已开启锁定：该分销商将禁止自动升级（即使满足业绩条件也不会晋升）
</div>
<div style="font-size:12px; color:#10b981; margin-top:2px;" v-else>
✓ 未锁定：正常允许分销商根据业绩达标自动晋升
</div>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="identity.form.remark" type="textarea" placeholder="如：2026-09 签约"></el-input>

4
tests/test_agent_upgrade_cumulative.php
查看文件

@@ -55,8 +55,8 @@ use app\admin\model\shopro\commission\Level as LevelModel;
echo "=== 开始分销商升级规则验证 ===" . PHP_EOL;
// 1. 获取目标测试账号（User ID 8）
$userId = 8;
// 1. 获取目标测试账号（默认为 User ID 17）
$userId = intval($argv[1] ?? 17);
$agent = AgentModel::where('user_id', $userId)->find();
if (!$agent) {
die("未找到用户 ID {$userId} 的分销商记录\n");