jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 16 Packages Projects Releases Wiki Activity
608 Commits 4 Branches 21 Tags
52a7d3789d1c26f2e35514db2f5428adb8c5ea20
Commit Graph

608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jacy 52a7d3789d fix(ops): 补承运商删除操作常量以便生产构建 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 14:32:08 +08:00
jacy 797b20979d feat(mini-user): v3.5.10 同城配送提示可配置并支持换行 
承运商 HTML 按收货市下发；textarea 回车在 C 端转成换行。含门店去掉分享按钮与小程序企微客服。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 14:29:48 +08:00
jacy fed8ff3d3a fix(admin): 列设置靠右并支持订单状态多选 
HQ 列表主操作居右、列设置贴最右侧；订单筛选状态可多选，导出同步过滤。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 14:19:49 +08:00
jacy f4da71e952 v3.5.9版本迭代列表优化
CI / verify (pull_request) Waiting to run
Details
2026-08-25 12:38:21 +08:00
jacy 282da24bc4 给用户增加“备注”列
CI / verify (pull_request) Waiting to run
Details
2026-08-25 10:09:05 +08:00
jacy 5935024ea8 v3.5.8和v3.5.9版本更新
CI / verify (pull_request) Waiting to run
Details
2026-08-25 09:20:32 +08:00
jacy 7304c7a8e1 chore(ops): 增加生产库备份/回滚与按 isTest 清理脚本 
只入库通用运维能力，不提交写死手机号的一次性清理脚本与 dump。

Co-authored-by: Cursor <cursoragent@cursor.com>
清除测试数据-数据库 		2026-08-23 22:03:35 +08:00
jacy a3f17cbf94 v3.5.7版本迭代
CI / verify (pull_request) Has been cancelled
Details 
门店端UI修改
 2026-08-23 19:26:12 +08:00
jacy 114d77ca48 修改订单导出时间错误
CI / verify (pull_request) Has been cancelled
Details
2026-08-23 17:33:20 +08:00
jacy 7e12eb3ca6 v3.5.6版本迭代
CI / verify (pull_request) Has been cancelled
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 22cd00da42 v3.5.5版本上传
CI / verify (pull_request) Has been cancelled
Details
v3.5.5 		2026-08-23 12:26:57 +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 4d434c9c67 v3.5.4 规格主图、门店使用规则与收银台 logo 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-21 17:36:53 +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 a01217539c v3.5.4版本提交
CI / verify (pull_request) Has been cancelled
Details
2026-08-21 15:48:15 +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 fc2e5b65de v3.5.3版本更新1
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 18:54:15 +08:00
jacy ee493823bf 增加音效逻辑
CI / verify (pull_request) Has been cancelled
Details
v3.5.2 		2026-08-20 15:04:54 +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 6cf66c722c v3.5.2 大屏调整
CI / verify (pull_request) Has been cancelled
Details
2026-08-20 11:58:15 +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 233ed0af3b v3.5.1 版本更新
CI / verify (pull_request) Has been cancelled
Details
2026-08-19 15:54:51 +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
jacy bbd7e52e70 feat(admin): 套餐变更对比逐字段列出变动明细(v3.4.18)
CI / verify (push) Has been cancelled
Details
2026-08-16 12:09:37 +08:00
jacy 1c91e6bae9 v3.4.17 门店套餐审核快捷入口
CI / verify (push) Has been cancelled
Details
2026-08-16 11:57:01 +08:00
jacy 029fd690a5 merge(dev): fix(admin) 套餐审核导航样式恢复一致
CI / verify (push) Has been cancelled
Details
2026-08-16 08:56:41 +08:00
jacy 0bfc19b1a4 merge(dev_jacy): fix(admin) 套餐审核导航样式恢复一致 2026-08-16 08:56:28 +08:00
jacy bafb342600 fix(admin): 套餐审核导航恢复与子菜单一致的样式 
- 移除对「套餐审核」文字的强制白色处理，文字随菜单主题正常继承 normal/hover/selected 颜色
- 徽章仅作为待审数量提示图标，pendingCount>0 时才显示，不参与文字着色

Co-Authored-By: WorkBuddy <workbuddy@tencent.com>
 2026-08-16 08:56:13 +08:00
jacy bac5c7ad80 merge(dev): 联系电话脱敏支持座机 + 套餐表单多行输入
CI / verify (push) Has been cancelled
Details
2026-08-16 08:52:19 +08:00
jacy c05cd0e96d merge(dev_jacy): 联系电话脱敏支持座机 + 套餐表单多行输入 2026-08-16 08:52:01 +08:00