v #16

Merged

jacy merged 10 commits from dev_jacy into dev 2026-08-17 23:45:00 +08:00

Conversation 0 Commits 10 Files Changed 14

+588 -57

jacy commented 2026-08-17 23:44:50 +08:00

Owner

Copy Link

Copy Source

No description provided.

jacy added 10 commits 2026-08-17 23:44:50 +08:00

Merge pull request 'Dev v3.4.17 版本发布' (#15) from dev into main ... 984dec79ee

Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/15

feat: v3.4.18 门店体验与登录态优化 ... cc750dc1d6

- mini-user 门店座机电话中间四位脱敏（保留区号与前后位）
- mini-user 套餐详情图增加 1/N 计数与自动轮播
- h5-partner 账号暂停(DISABLED)禁止登录并提示客服
- h5-shop 提现/筛选栏左右留白与页面一致
- h5-shop 休息中核销改为弹「是否开启营业」并支持开张后继续

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>

Merge commit '984dec79ee1944e2c21ed2e564cac09ae893afa3' into dev_jacy f7c94b4f16

fix(mini-user): 门店套餐图片自适应完整显示，不再裁剪 ... 18147e157f

- ProductCarousel 新增 imageFit="adaptive"（widthFix + 动态高度）
- 门店套餐详情按图片真实比例自适应高度，完整显示不裁剪
- 补充 v3.4.18 文档 F 项

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>

refactor(mini-user): 门店套餐图改用 swiper auto-height 自适应（方案A） ... cd1e9ae488

- 移除手算高度逻辑，自适应模式启用 swiper 原生 autoHeight
- image 保持 mode=widthFix，完整展示不裁切
- 删除 .detail-carousel-wrap 固定比例/高度的覆盖依赖

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>

fix(h5-shop): 修复闭店/休息中扫码核销弹窗不触发 ... 3ac008a217

- 根因：门店非OPEN时后端 preview 拦截，preview 为 null 导致确认按钮 disabled，弹窗永远触发不了
- RedeemConfirmPage：storeClosed 时确认按钮可点→弹开张框；开张后重拉预览并继续核销
- 弹窗文案对齐「门店目前休息中无法核销，是否开启营业」

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>

fix(h5-shop): 门店 PAUSED 时点击扫码即弹窗，前置到首页 ... c0d04ee500

- 门店临时闭店/休息中（非 OPEN）点击首页「扫码核销」立即弹
  「门店目前休息中无法核销，是否开启营业」，不进入扫码流程
- 开张成功后刷新门店状态，可再次扫码
- 修正此前“扫码后才提示”的方案偏差；文档 E 节同步更新

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>

fix(h5-partner): 微信OAuth回跳错误不再吞没，DISABLED提示可见 ... 5ca9aa00aa

- 合伙人端 PartnerSessionContext 微信回跳 catch 原把后端
  「该账号已暂停使用，请联系客服人员」错误整体吞掉，导致
  DISABLED 账号微信登录无任何反馈
- 改为用 toastError 显式提示，与短信路径一致（微信同理）

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>

fix(iam): 合伙人登录双拦截——子账号status=DISABLED 与 主账号bindingStatus=PAUSED 均拒绝登录 48d6900ab6

优化门店端结算页面的UI 7dd5fdfb12

jacy merged commit 905e145af3 into dev 2026-08-17 23:45:00 +08:00

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

ljy jacy

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: jacy/dukang#16