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
This commit is contained in:
@@ -60,6 +60,64 @@
|
||||
|
||||
---
|
||||
|
||||
## 长期固定使用 PHP 8.0(推荐)
|
||||
|
||||
CRMEB Pro v3.5 官方以 **PHP 8.0** 为基准;与 **Swoole Loader**、扩展版本一一对应,建议本机 CLI 与文档统一为 **8.0**,避免混用 8.1 导致 Loader/扩展不匹配。
|
||||
|
||||
### 1. 安装并链接 Homebrew `php@8.0`
|
||||
|
||||
```bash
|
||||
brew install php@8.0
|
||||
```
|
||||
|
||||
**Intel Mac(前缀一般为 `/usr/local`)** — 让终端默认 `php` 指向 8.0:
|
||||
|
||||
```bash
|
||||
brew unlink php@8.1 2>/dev/null || true
|
||||
brew link php@8.0 --force --overwrite
|
||||
```
|
||||
|
||||
若不想改全局 link,只在当前用户把 8.0 放在 PATH 最前(写入 `~/.zshrc` 后 `source ~/.zshrc`):
|
||||
|
||||
```bash
|
||||
# Intel
|
||||
export PATH="/usr/local/opt/php@8.0/bin:/usr/local/opt/php@8.0/sbin:$PATH"
|
||||
```
|
||||
|
||||
**Apple Silicon(前缀一般为 `/opt/homebrew`)**:
|
||||
|
||||
```bash
|
||||
export PATH="/opt/homebrew/opt/php@8.0/bin:/opt/homebrew/opt/php@8.0/sbin:$PATH"
|
||||
```
|
||||
|
||||
### 2. 验证
|
||||
|
||||
```bash
|
||||
# `which php` 应指向 php@8.0,例如:
|
||||
# Intel: /usr/local/opt/php@8.0/bin/php
|
||||
# Apple 硅: /opt/homebrew/opt/php@8.0/bin/php
|
||||
which php
|
||||
php -v # 应显示 PHP 8.0.x
|
||||
php -m | grep -E 'swoole|swoole_loader'
|
||||
```
|
||||
|
||||
- **swoole**、**swoole_loader**(非企业版)均应出现;Loader 只需在 **PHP 8.0** 的 `php.ini` / `conf.d` 里配置 **一处**,避免重复加载告警。
|
||||
|
||||
### 3. 启动 API
|
||||
|
||||
始终在**项目根目录**执行:
|
||||
|
||||
```bash
|
||||
cd /path/to/pro_v3.5.1
|
||||
# 建议写死 8.0 路径,避免 PATH 里仍是 8.1:
|
||||
/usr/local/opt/php@8.0/bin/php -d memory_limit=300M think swoole
|
||||
# Apple 硅用:/opt/homebrew/opt/php@8.0/bin/php ...
|
||||
```
|
||||
|
||||
或使用 `./help/start-api.sh`(**仅**使用上述 php@8.0 路径或环境变量 `CRMEB_PHP_BIN`,不再回退到任意 `php`)。
|
||||
|
||||
---
|
||||
|
||||
## 验证与本地启动
|
||||
|
||||
### 一键检查(项目根目录执行)
|
||||
|
||||
@@ -1,7 +1,29 @@
|
||||
#!/usr/bin/env bash
|
||||
# 按 help/PHP-Setup.md 要求,以 memory_limit=300M 启动 Swoole API 服务
|
||||
# 用法:在项目根目录执行 ./help/start-api.sh,或先 cd pro_v3.5.1 再执行
|
||||
# 长期固定 PHP 8.0:优先使用 Homebrew php@8.0,避免 PATH 里误用 8.1
|
||||
# 用法:在项目根目录执行 ./help/start-api.sh
|
||||
|
||||
set -e
|
||||
cd "$(dirname "$0")/.."
|
||||
php -d memory_limit=300M think swoole
|
||||
|
||||
# 固定使用 PHP 8.0,不回退到 PATH 里的 `php`(避免误用 8.1 等)
|
||||
resolve_php80() {
|
||||
if [[ -n "${CRMEB_PHP_BIN:-}" && -x "${CRMEB_PHP_BIN}" ]]; then
|
||||
echo "${CRMEB_PHP_BIN}"
|
||||
return 0
|
||||
fi
|
||||
for candidate in \
|
||||
"/usr/local/opt/php@8.0/bin/php" \
|
||||
"/opt/homebrew/opt/php@8.0/bin/php"; do
|
||||
if [[ -x "${candidate}" ]]; then
|
||||
echo "${candidate}"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
echo "start-api.sh: 未找到 PHP 8.0,请安装: brew install php@8.0" >&2
|
||||
echo "或指定: CRMEB_PHP_BIN=/你的路径/php ./help/start-api.sh" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
PHP_BIN="$(resolve_php80)"
|
||||
exec "${PHP_BIN}" -d memory_limit=300M think swoole
|
||||
|
||||
Reference in New Issue
Block a user