From 3a7c13f02685e23359c8b9e2288bbd0a8e562395 Mon Sep 17 00:00:00 2001
From: chen <chen@example.com>
Date: Tue, 29 Sep 2026 21:28:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(commission):=20=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E9=94=80=E5=95=86=E5=8D=87=E7=BA=A7=E9=94=81=E5=AE=9A=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E4=B8=8E=E9=9B=B7=E8=BE=BE=E6=A0=87=E8=AF=86=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E6=8F=90=E7=A4=BA=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=AF=AF?=
 =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/shopro/commission/agent/detail.html  | 20 ++++++++++++++-----
 .../view/shopro/commission/agent/index.html   | 10 ++++++++--
 tests/test_agent_upgrade_cumulative.php       |  4 ++--
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/application/admin/view/shopro/commission/agent/detail.html b/application/admin/view/shopro/commission/agent/detail.html
index f08cb60..7e3d873 100644
--- a/application/admin/view/shopro/commission/agent/detail.html
+++ b/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>
diff --git a/application/admin/view/shopro/commission/agent/index.html b/application/admin/view/shopro/commission/agent/index.html
index f81fd12..831a117 100644
--- a/application/admin/view/shopro/commission/agent/index.html
+++ b/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>
diff --git a/tests/test_agent_upgrade_cumulative.php b/tests/test_agent_upgrade_cumulative.php
index 7ba05a3..fd18c08 100644
--- a/tests/test_agent_upgrade_cumulative.php
+++ b/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");