jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 12 Packages Projects Releases Wiki Activity
615 Commits 4 Branches 17 Tags
6973e3d7f5768fb14c6591a62bfa2d04831f3504
Commit Graph

615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jacy 6973e3d7f5 Merge pull request '修改订单导出时间错误' (#40) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/40
 2026-08-23 17:34:21 +08:00
jacy 114d77ca48 修改订单导出时间错误
CI / verify (pull_request) Waiting to run
Details
2026-08-23 17:33:20 +08:00
jacy a144a35c3d Merge pull request 'Dev jacy v3.5.6 版本迭代' (#38) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/38
 2026-08-23 16:43:07 +08:00
jacy 7e12eb3ca6 v3.5.6版本迭代
CI / verify (pull_request) Waiting to run
Details
2026-08-23 16:41:22 +08:00
jacy 608e3e5ec5 整理发布脚本 2026-08-23 14:37:36 +08:00
jacy d98b0aefb0 整理上下文 2026-08-23 14:37:29 +08:00
jacy 012626f6bd Merge pull request 'v3.5.5版本上传' (#36) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/36
 2026-08-23 12:29:33 +08:00
jacy 22cd00da42 v3.5.5版本上传
CI / verify (pull_request) Waiting to run
Details
v3.5.5 		2026-08-23 12:26:57 +08:00
jacy 3004a65b35 Merge branches 'dev_jacy' and 'dev' of git.yqidian.com:jacy/dukang into dev 2026-08-21 23:52:37 +08:00
jacy f9161368e1 feat(admin): show HQ product list as SPU with expandable SKUs 
Group catalog rows by product, add paid bottle sales, and keep multi-SKU fulfillment on SKU rows only.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-21 23:52:28 +08:00
jacy 8a061f085f 提交v3.5.4 版本号小程序 v3.5.4 2026-08-21 17:49:53 +08:00
jacy b20e566a65 logo3 2026-08-21 17:39:11 +08:00
jacy 7d2e4ef57e merge(dev_jacy): v3.5.4 规格主图与门店使用规则 2026-08-21 17:37:09 +08:00
jacy 4d434c9c67 v3.5.4 规格主图、门店使用规则与收银台 logo 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-21 17:36:53 +08:00
jacy 73fd27bdf6 Merge pull request 'v3.5.4版本提交，修改api' (#34) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/34
 2026-08-21 16:23:54 +08:00
jacy 62e61a9e63 v3.5.4版本提交，修改api
CI / verify (pull_request) Has been cancelled
Details
2026-08-21 16:22:53 +08:00
jacy cd9696bc1c Merge pull request 'v3.5.4版本提交' (#32) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/32
 2026-08-21 15:50:07 +08:00
jacy a01217539c v3.5.4版本提交
CI / verify (pull_request) Has been cancelled
Details
2026-08-21 15:48:15 +08:00
jacy b5d4f8b27c Merge pull request 'v3.5.3版本更新2' (#30) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/30
 2026-08-20 20:23:03 +08:00
jacy 26334ed072 v3.5.3版本更新2
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 20:09:05 +08:00
jacy 9a80f0f8d6 Merge pull request 'v3.5.3版本更新1' (#29) from dev_jacy into dev 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/29
 2026-08-20 18:55:43 +08:00
jacy fc2e5b65de v3.5.3版本更新1
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 18:54:15 +08:00
jacy e8b585e623 Merge pull request '增加音效逻辑' (#26) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/26
 2026-08-20 15:06:07 +08:00
jacy ee493823bf 增加音效逻辑
CI / verify (pull_request) Has been cancelled
Details
v3.5.2 		2026-08-20 15:04:54 +08:00
jacy 5702266276 Merge pull request 'Dev jacy' (#25) from dev_jacy into dev 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/25
 2026-08-20 13:43:29 +08:00
jacy 8b5bb6a981 大屏显示优化
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 13:41:50 +08:00
jacy 0a36188b35 调整优化大屏 2026-08-20 12:55:11 +08:00
jacy a8a37fbc4a Merge pull request 'v3.5.2 大屏调整' (#22) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/22
 2026-08-20 12:00:57 +08:00
jacy 6cf66c722c v3.5.2 大屏调整
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 11:58:15 +08:00
jacy e34416a9b3 Merge pull request 'Dev jacy mock 支付调整' (#20) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/20
 2026-08-20 00:54:17 +08:00
jacy 4db21cf1a1 mockpay功能调试
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 00:51:18 +08:00
jacy 2f633b307c 删除h5user端和hq小程序端 2026-08-19 16:21:06 +08:00
jacy 62353a6800 整理开发文档 2026-08-19 16:20:33 +08:00
jacy 6c44e9c56f Merge pull request 'v3.5.1 版本更新' (#18) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/18
 2026-08-19 16:00:56 +08:00
jacy 233ed0af3b v3.5.1 版本更新
CI / verify (pull_request) Has been cancelled
Details
2026-08-19 15:54:51 +08:00
jacy 905e145af3 Merge pull request 'v3.4.18' (#16) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/16
 2026-08-17 23:45:00 +08:00
jacy 7dd5fdfb12 优化门店端结算页面的UI
CI / verify (pull_request) Has been cancelled
Details
2026-08-17 23:43:45 +08:00
jacy 48d6900ab6 fix(iam): 合伙人登录双拦截——子账号status=DISABLED 与 主账号bindingStatus=PAUSED 均拒绝登录
CI / verify (push) Has been cancelled
Details
2026-08-17 23:39:53 +08:00
jacy 5ca9aa00aa fix(h5-partner): 微信OAuth回跳错误不再吞没，DISABLED提示可见
CI / verify (push) Has been cancelled
Details 
- 合伙人端 PartnerSessionContext 微信回跳 catch 原把后端
  「该账号已暂停使用，请联系客服人员」错误整体吞掉，导致
  DISABLED 账号微信登录无任何反馈
- 改为用 toastError 显式提示，与短信路径一致（微信同理）

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>
 2026-08-17 23:22:04 +08:00
jacy c0d04ee500 fix(h5-shop): 门店 PAUSED 时点击扫码即弹窗，前置到首页
CI / verify (push) Has been cancelled
Details 
- 门店临时闭店/休息中（非 OPEN）点击首页「扫码核销」立即弹
  「门店目前休息中无法核销，是否开启营业」，不进入扫码流程
- 开张成功后刷新门店状态，可再次扫码
- 修正此前“扫码后才提示”的方案偏差；文档 E 节同步更新

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>
 2026-08-17 23:03:55 +08:00
jacy 3ac008a217 fix(h5-shop): 修复闭店/休息中扫码核销弹窗不触发
CI / verify (push) Has been cancelled
Details 
- 根因：门店非OPEN时后端 preview 拦截，preview 为 null 导致确认按钮 disabled，弹窗永远触发不了
- RedeemConfirmPage：storeClosed 时确认按钮可点→弹开张框；开张后重拉预览并继续核销
- 弹窗文案对齐「门店目前休息中无法核销，是否开启营业」

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>
 2026-08-17 22:50:22 +08:00
jacy cd1e9ae488 refactor(mini-user): 门店套餐图改用 swiper auto-height 自适应（方案A）
CI / verify (push) Has been cancelled
Details 
- 移除手算高度逻辑，自适应模式启用 swiper 原生 autoHeight
- image 保持 mode=widthFix，完整展示不裁切
- 删除 .detail-carousel-wrap 固定比例/高度的覆盖依赖

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>
 2026-08-17 22:20:05 +08:00
jacy 18147e157f fix(mini-user): 门店套餐图片自适应完整显示，不再裁剪
CI / verify (push) Has been cancelled
Details 
- ProductCarousel 新增 imageFit="adaptive"（widthFix + 动态高度）
- 门店套餐详情按图片真实比例自适应高度，完整显示不裁剪
- 补充 v3.4.18 文档 F 项

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>
 2026-08-17 21:48:06 +08:00
jacy f7c94b4f16 Merge commit '984dec79ee1944e2c21ed2e564cac09ae893afa3' into dev_jacy 2026-08-17 21:40:44 +08:00
jacy cc750dc1d6 feat: v3.4.18 门店体验与登录态优化 
- mini-user 门店座机电话中间四位脱敏（保留区号与前后位）
- mini-user 套餐详情图增加 1/N 计数与自动轮播
- h5-partner 账号暂停(DISABLED)禁止登录并提示客服
- h5-shop 提现/筛选栏左右留白与页面一致
- h5-shop 休息中核销改为弹「是否开启营业」并支持开张后继续

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>
 2026-08-17 21:34:40 +08:00
jacy 984dec79ee Merge pull request 'Dev v3.4.17 版本发布' (#15) from dev into main
CI / verify (push) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/15
v3.4.17 		2026-08-16 12:31:16 +08:00
jacy f84614bbb4 Merge pull request 'v3.4.17版本发布' (#14) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/14
 2026-08-16 12:30:21 +08:00
jacy c0ce494732 提交workbuddy记忆缓存
CI / verify (pull_request) Has been cancelled
Details
2026-08-16 12:29:07 +08:00
jacy 69e201f927 fix(h5-partner): 门店套餐编辑按钮改为紧凑型并贴右对齐
CI / verify (push) Has been cancelled
Details
2026-08-16 12:22:54 +08:00
jacy ecd9973d8f feat(admin): 套餐变更对比逐字差异定位 + 开发计划并入v3.4.17
CI / verify (push) Has been cancelled
Details
2026-08-16 12:17:34 +08:00