HI-VPN/hi-frontend
4
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix/52 首页用户管理交互调整 #2

Closed
kxswman wants to merge 5 commits from fix/52-首页用户管理交互调整 into main
pull from: fix/52-首页用户管理交互调整
merge into: HI-VPN:main
Conversation 0 Commits 5 Files Changed 37
+2582 -177
kxswman commented 2026-06-23 10:45:14 -04:00
Owner
Copy Link
Copy Source

💻 变更类型 | Change Type

  • [ ] ✨ feat
  • [ ] 🐛 fix
  • [ ] 💄 style
  • [ ] 🔨 chore
  • [ ] 📝 docs

🔀 变更说明 | Description of Change

📝 补充信息 | Additional Information

#### 💻 变更类型 | Change Type <!-- For change type, change [ ] to [x]. --> - \[ ] ✨ feat - \[ ] 🐛 fix - \[ ] 💄 style - \[ ] 🔨 chore - \[ ] 📝 docs #### 🔀 变更说明 | Description of Change <!-- Thank you for your Pull Request. Please provide a description above. --> #### 📝 补充信息 | Additional Information <!-- Add any other context about the Pull Request here. -->
kxswman added 5 commits 2026-06-23 10:45:14 -04:00
新功能(#113): 新增促销管理后台页面
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Details
c46944aae1
修复(#122): 合并促销价档位提交到测试环境
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Details
23f51a1ef4
修复(#134): 促销前端展示对齐 (expires_at / billing 补 promo_discount / 类型补字段)
PR Check / Lint, Check, Test and Build (push) Has been cancelled
Details
1834b97fe2 
Squash merge of fix/134-促销前端展示对齐 (4702dee).

HIF-79/HIF-113 落地后前端有三处对齐缺失：

- promo-info.tsx 仍读 promo.end_time，但后端 SubscribeDiscountPromo
  JSON 字段是 expires_at（×2 处）
- billing.tsx 缺 Promo Discount 行，PreOrderResponse 拿到 promo_discount
  时无处可渲染
- typings.d.ts: SubscribeDiscountPromo 缺 expires_at/rule_type,
  PreOrderResponse 缺 promo_discount

本次仅修字段对齐与展示行，不动业务逻辑、不动 OrderDetail 类型 (后端
当前未透出 promo_discount)。新增 billing.promoDiscount 中英文文案。
修复(#52): 调整首页与用户管理交互 f9c3b18249
修复(#52): 补齐首页与用户状态文案
PR Check / Lint, Check, Test and Build (pull_request) Has been cancelled
Details
Dependabot Auto Merge / Dependabot Auto Merge (pull_request_target) Has been cancelled
Details
7505d37af6
kxswman closed this pull request 2026-06-23 11:16:52 -04:00
Some checks are pending
PR Check / Lint, Check, Test and Build (pull_request) Has been cancelled
Details
Dependabot Auto Merge / Dependabot Auto Merge (pull_request_target) Has been cancelled
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
kxswman pignored9 sepakeloudest shanshanzhong147
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: HI-VPN/hi-frontend#2
Delete Branch "fix/52-首页用户管理交互调整"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?