jacy/dukang
1
0
Fork 0
Code Issues Pull Requests 1 Actions 10 Packages Projects Releases Wiki Activity
699 Commits 4 Branches 28 Tags
d5552402953703b373cee1968cb40bce27a42fcf
Commit Graph

388 Commits

Author SHA1 Message Date
jacy f35e1a3ba5 feat(settlement): v4.0.6 酒厂 T+3 每 3 天出一期并与订单完全比对 
含现场提货入账、零应付仍出账、核对补生成，以及线上历史账单修复 SQL。
 2026-08-31 17:27:38 +08:00
jacy ac94f5f5de feat(ops): v4.0.4 开发任务多行与版本状态同步、合伙人/门店删除、账单合伙人列 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-31 16:08:55 +08:00
jacy e26206b93c v4.0.3版本
CI / verify (pull_request) Waiting to run
Details 
总部后端，开发计划-任务列表-来源工单支持链接
总部端-开发计划-任务列表-编辑任务-增加“开发中”状态
账单日期修正
 2026-08-31 14:22:49 +08:00
jacy 3166467518 feat(ops): v4.0.2 活动图模板、合伙人选择持久化与用户管理主图 
HQ 上传底图与码栏；合伙人单选写入 partner_account.activity_poster_id，用户管理下次登录仍显示同一张图。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-30 21:36:43 +08:00
jacy 0ff61c2cd1 chore(deploy): shop/partner/admin 禁止搜索引擎抓取 
nginx 直出 robots.txt 并加 X-Robots-Tag，避免内部三端被收录。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-30 15:50:22 +08:00
jacy e68eb4d38c feat(settlement): 门店账单确认打款支持上传凭证照片 
财务确认打款与提现通过可附带 OSS 凭证图，详情与导出展示。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-30 15:25:56 +08:00
jacy b375fab44a v3.5.16小程序首页动画 2026-08-30 15:07:58 +08:00
jacy 9c8d5f2cad feat(assoc): v4.0.1 合伙人关联码、分佣账单与 H5 用户管理 
订单佣金只认关联用户；合伙人备注写入独立表；H5 增加用户管理与首页统计。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-30 14:35:39 +08:00
jacy 3b669f7e38 fix(settlement): 门店 T+1 出账日改为窗口中的今天 
HQ 门店账单列名改为出账日；billDate 记今日（昨日 00:00–今日 00:00 右端），启动时把旧数据从核销自然日对齐过来。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 14:12:35 +08:00
jacy da19c39965 feat(admin): v3.5.18 用户详情明文手机、任务关联版本与核销快链 
HQ 后台：用户/核销记录展示完整手机号；任务列表与编辑可关联版本；账单核销单号与券号/用户可快链；门店账单日标明为出账自然日；技术支持操作按钮右对齐。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 13:58:08 +08:00
jacy b226af2adc feat(admin): 订单页筛选改版并支持用户与商品模糊搜索 
收起次要筛选项，去掉过滤测试；列表可按用户编号/昵称/备注/手机与商品名称/规格查询。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 13:10:36 +08:00
jacy fccfd7abbe feat(promo): HQ 推广码订单只计已完成并补扫码订单快链 
列表与详情的订单数/转化率按 COMPLETED 实时统计；扫码、订单、事件 ID 可跳到对应页。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-28 12:55:19 +08:00
jacy 58a8b47532 feat(admin): v3.5.12 大屏BGM、中文展示、分类删除修复与侧栏顺序 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-26 10:54:19 +08:00
jacy 632539e8dc 增加现场提货的配置 2026-08-26 09:22:29 +08:00
jacy c7cd0f6cf2 C端SKU数量小于等于1不展示chip 
后端修复规格轴数据错乱显示问题
 2026-08-26 07:43:26 +08:00
jacy 1f4506f60b 小程序版本号
CI / verify (pull_request) Has been cancelled
Details
2026-08-26 07:13:54 +08:00
jacy cc0c0a6ef8 feat(fulfillment): 同城运费与路由修复，配送单展示商品用户地址 
同城 MANUAL/ZZXFX 按小飞侠价规计费，路由查询回退仓配凭证；HQ 配送单补商品、用户和收货地址。门店核销回跳与小程序核销码一并带上。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-25 21:12:36 +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) Has been cancelled
Details
2026-08-25 12:38:21 +08:00
jacy 282da24bc4 给用户增加“备注”列
CI / verify (pull_request) Has been cancelled
Details
2026-08-25 10:09:05 +08:00
jacy 5935024ea8 v3.5.8和v3.5.9版本更新
CI / verify (pull_request) Has been cancelled
Details
2026-08-25 09:20:32 +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 7e12eb3ca6 v3.5.6版本迭代
CI / verify (pull_request) Has been cancelled
Details
2026-08-23 16:41:22 +08:00
jacy 22cd00da42 v3.5.5版本上传
CI / verify (pull_request) Has been cancelled
Details
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 版本号小程序 2026-08-21 17:49:53 +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
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 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 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 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 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