feat(hjf): H5路由修复、分销等级显示优化、个人中心等级徽章

H5 部署与路由：
- manifest.json: router.base 改为 "/" 适配 public/ 根目录部署
- nginx-crmeb.conf: 恢复与 feature/fsgx 一致的原始配置
- App.vue: PC端重定向路径改为动态推导，修复死循环加载问题
- static/html/pc.html: 动态推导 H5 根路径，适配本地/云端两种部署

H5登录：
- pages/users/login/index.vue: H5端获取验证码跳过安全验证（条件编译）

分销等级展示修复：
- AgentLevelServices: 新增 loadHjfUserListLevelMaps/pickHjfLevelRowForUserListDisplay
  统一等级名称解析逻辑，优先返回 HJF 官方名称；新增 getUpgradeTasksForLevel 封装
- UserServices/MemberLevelServices: 改用统一解析方法，修复 protected $dao 访问错误
- api/hjf/MemberController: 直接取 eb_agent_level.name，新增 agent_level 原始值返回
- admin/v1/hjf/MemberController: team() 改用封装方法替代直接访问 protected dao

个人中心等级徽章：
- pages/user/index.vue + member/index.vue: memberInfo 沿链路透传
- member/template1.vue: UID右侧显示HjfMemberBadge，直接读 userInfo.agent_level_name
  无需等待异步 memberInfo，agentLevelGrade 计算属性从名称推导颜色等级

商品列表修复：
- BaseController.php/Common.php: 恢复加密版，修复 CRMEB 授权检查失败导致的400错误
- StoreProduct model: 移除冲突的 model maker 回调

数据库：
- hjf_migration.sql: 完善会员等级体系迁移脚本
- eb_agent_level.sql: 新增等级初始数据脚本

Made-with: Cursor

pro_v3.5.1/app/services/user/UserServices.php

@@ -766,23 +766,31 @@ class UserServices extends BaseServices
      */
     public function index(array $where)
     {
+        // 添加过滤条件
+        $where['is_filter_del'] = 1;
+
+        /** @var UserWechatuserServices $userWechatUser */
+        $userWechatUser = app()->make(UserWechatuserServices::class);
+        $fields = 'u.*,w.country,w.province,w.city,w.sex,w.unionid,w.openid,w.user_type as w_user_type,w.groupid,w.tagid_list,w.subscribe,w.subscribe_time';
+
         try {
-            // 添加过滤条件
-            $where['is_filter_del'] = 1;
-
-            /** @var UserWechatuserServices $userWechatUser */
-            $userWechatUser = app()->make(UserWechatuserServices::class);
-            $fields = 'u.*,w.country,w.province,w.city,w.sex,w.unionid,w.openid,w.user_type as w_user_type,w.groupid,w.tagid_list,w.subscribe,w.subscribe_time';
-
-            // 获取用户列表
             [$list, $count] = $userWechatUser->getWhereUserList($where, $fields);
+        } catch (\Throwable $e) {
+            Log::error('User index list query failed: ' . $e->getMessage());
 
-            if ($list) {
-                // 提取唯一 UID 列表
-                $uids = array_unique(array_column($list, 'uid'));
+            return ['count' => 0, 'list' => []];
+        }
 
-                // 获取相关服务数据
-                $userlabel = $this->getUserLablel($uids);
+        if (!$list) {
+            return compact('count', 'list');
+        }
+
+        try {
+            // 提取唯一 UID 列表
+            $uids = array_unique(array_column($list, 'uid'));
+
+            // 获取相关服务数据
+            $userlabel = $this->getUserLablel($uids);
                 $groupIds = array_unique(array_column($list, 'group_id'));
                 $userGroupService = app()->make(UserGroupServices::class);
                 $userGroup = $userGroupService->getUsersGroupName($groupIds);
@@ -799,6 +807,11 @@ class UserServices extends BaseServices
                 $clientData = $workClientService->getList(['uid' => $uids], ['id', 'uid', 'name', 'external_userid', 'corp_id', 'unionid'], false);
                 $clientlist = $clientData['list'] ?? [];
 
+                /** HJF：分销等级展示索引（is_del=0，按 id/grade 双索引，优先 HJF 官方等级名称） */
+                /** @var AgentLevelServices $agentLevelServices */
+                $agentLevelServices = app()->make(AgentLevelServices::class);
+                $hjfLevelMaps = $agentLevelServices->loadHjfUserListLevelMaps();
+
                 // 补充信息
                 $extendInfo = SystemConfigService::get('user_extend_info', []);
                 $is_extend_info = false;
@@ -826,6 +839,13 @@ class UserServices extends BaseServices
 
                 // 补充每个用户的详细信息
                 foreach ($list as &$item) {
+                    $agentLevelId = (int)($item['agent_level'] ?? 0);
+                    $hjfLevelInfo = $agentLevelServices->pickHjfLevelRowForUserListDisplay($agentLevelId, $hjfLevelMaps);
+                    $item['member_level'] = $hjfLevelInfo ? (int)$hjfLevelInfo['grade'] : 0;
+                    $item['member_level_name'] = $hjfLevelInfo ? ($hjfLevelInfo['name'] ?? '') : '普通会员';
+                    $item['available_points'] = (int)($item['available_points'] ?? 0);
+                    $item['frozen_points'] = (int)($item['frozen_points'] ?? 0);
+
                     // 地址补充
                     if (empty($item['addres'])) {
                         if (!empty($item['country']) || !empty($item['province']) || !empty($item['city'])) {
@@ -895,13 +915,13 @@ class UserServices extends BaseServices
                     // 扩展信息标志
                     $item['is_extend_info'] = $is_extend_info;
                 }
-            }
 
             return compact('count', 'list');
-        } catch (\Exception $e) {
-            // 异常处理
-            Log::error('Error in user index: ' . $e->getMessage());
-            return ['count' => 0, 'list' => []];
+        } catch (\Throwable $e) {
+            // 加工阶段失败时仍返回查询结果，避免整页空白（常见：企微/等级等扩展服务异常）
+            Log::error('User index enrichment failed: ' . $e->getMessage());
+
+            return compact('count', 'list');
         }
     }
 

pro_v3.5.1/app/services/user/UserWechatuserServices.php

@@ -12,6 +12,7 @@ declare (strict_types=1);
 
 namespace app\services\user;
 
+use app\services\agent\AgentLevelServices;
 use app\services\BaseServices;
 use app\dao\user\UserWechatUserDao;
 use think\annotation\Inject;
@@ -48,6 +49,7 @@ class UserWechatuserServices extends BaseServices
      */
     public function getWhereUserList(array $where, string $field): array
     {
+        $where = $this->normalizeHjfMemberLevelWhere($where);
         [$page, $limit] = $this->getPageValue();
         $order_string = '';
         $order_arr = ['asc', 'desc'];
@@ -58,4 +60,40 @@ class UserWechatuserServices extends BaseServices
         $count = $this->dao->getCountByWhere($where);
         return [$list, $count];
     }
+
+    /**
+     * 将会员列表筛选「HJF 等级（grade）」转为 eb_user.agent_level 条件，供 UserWechatUserDao 使用。
+     */
+    protected function normalizeHjfMemberLevelWhere(array $where): array
+    {
+        if (!array_key_exists('hjf_member_level', $where)) {
+            return $where;
+        }
+        $raw = $where['hjf_member_level'];
+        if ($raw === null) {
+            unset($where['hjf_member_level']);
+
+            return $where;
+        }
+        if (is_string($raw)) {
+            $raw = trim($raw);
+        }
+        // 空串/仅空白：不按分销等级筛选（避免 (int)' '=>0 误加 agent_level=0）
+        if ($raw === '') {
+            unset($where['hjf_member_level']);
+
+            return $where;
+        }
+        $grade = (int)$raw;
+        /** @var AgentLevelServices $agentLevel */
+        $agentLevel = app()->make(AgentLevelServices::class);
+        if ($grade === 0) {
+            $where['hjf_agent_level_id'] = 0;
+        } else {
+            $where['hjf_agent_level_id'] = $agentLevel->getLevelIdByGrade($grade) ?: -1;
+        }
+        unset($where['hjf_member_level']);
+
+        return $where;
+    }
 }