jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 23 Packages Projects Releases Wiki Activity
738 Commits 6 Branches 37 Tags
42c1b656327f3870893695401de992855b5aefe7
Commit Graph

738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jacy 42c1b65632 Merge pull request 'Dev' (#67) from dev into main
CI / verify (push) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/67
v4.0.14 		2026-09-02 21:13:16 +08:00
jacy de7bd34aa8 Merge pull request 'v4.0.14概览和日报' (#66) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/66
 2026-09-02 21:13:02 +08:00
jacy 68a4b7f984 v4.0.14概览和日报
CI / verify (pull_request) Waiting to run
Details
2026-09-02 21:11:58 +08:00
jacy e5fe8b903a feat(courier): 小飞侠签收照联调与 OSS 失败回退
CI / verify (push) Waiting to run
Details 
补齐 admin 100108 联调入口；track 优先用缓存签收照，上传失败回退 dataURI，日志截断大图。

Co-authored-by: Cursor <cursoragent@cursor.com>
v4.0.13 		2026-09-02 17:57:10 +08:00
jacy c6b01def4c feat(trade): v4.0.13 收货禁全市与小飞侠拒单可感知
CI / verify (push) Waiting to run
Details 
拦截伪区县写入与下单；推单失败挂 fulfillmentHold，HQ 可见超区/推单失败。

Co-authored-by: Cursor <cursoragent@cursor.com>
v4.0.12 		2026-09-02 17:20:40 +08:00
jacy 63fcf33416 v4.0.10版本更新 
要求门店支持多个分类；
小程序C端“瓶”位置调整；
商品单元“立即购买”直接跳转到“确认订单”页；
 2026-09-02 16:25:59 +08:00
jacy 101b27c92c Merge pull request 'Dev' (#65) from dev into main
CI / verify (push) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/65
v4.0.11 		2026-09-02 15:58:25 +08:00
jacy 5ed9f79a5e Merge pull request 'Dev jacy' (#64) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/64
 2026-09-02 15:58:12 +08:00
jacy 6880b5daf4 v4.0.11HQ后端优化（快链、账单日等）
CI / verify (pull_request) Waiting to run
Details
2026-09-02 15:45:12 +08:00
jacy 1000b489a0 v4.0.10版本package.json更新 v4.0.10 2026-09-02 11:29:22 +08:00
jacy 72fef35807 Merge pull request 'v4.0.9版本更新-门店分类支持多选' (#63) from dev into main
CI / verify (push) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/63
 2026-09-02 11:14:36 +08:00
jacy f570383717 Merge pull request 'v4.0.9版本更新-门店分类支持多选' (#62) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/62
 2026-09-02 11:14:10 +08:00
jacy fe557c912d v4.0.9版本更新-门店分类支持多选
CI / verify (pull_request) Waiting to run
Details
2026-09-02 11:12:51 +08:00
developer_liu 77e9917a18 Merge branch 'dev' of git.yqidian.com:jacy/dukang into dev-v4.0.10 2026-09-02 09:50:08 +08:00
developer_liu 44bfbe0bef v4.0.10 2026-09-02 09:49:33 +08:00
jacy 84fb2f314a Merge pull request 'Dev' (#61) from dev into main
CI / verify (push) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/61
v4.0.9 		2026-09-02 09:48:34 +08:00
jacy 11a9bb2414 Merge pull request 'Dev jacy' (#60) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/60
 2026-09-02 09:48:16 +08:00
jacy a4530a64df Merge commit 'c1f502a5e31f72209af49d1d6e094afa7c5ed6d7' into dev_jacy
CI / verify (pull_request) Waiting to run
Details
2026-09-02 09:47:28 +08:00
jacy c905b3f930 V4.0.9版本更新合伙人H5端调整 2026-09-02 09:46:41 +08:00
jacy af3c4b6f08 Merge commit '52816e38748a2b0cee764da08e906017019c5ce4' into dev_jacy 2026-09-02 08:44:21 +08:00
developer_liu c1f502a5e3 Merge commit '52816e38748a2b0cee764da08e906017019c5ce4' into dev-v4.0.10 2026-09-02 06:55:54 +08:00
jacy 52816e3874 Merge pull request 'Dev' (#59) from dev into main
CI / verify (push) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/59
v4.0.8 		2026-09-02 06:30:44 +08:00
jacy 7f7719f281 Merge pull request 'Dev jacy' (#58) from dev_jacy into dev
CI / verify (pull_request) Waiting to run
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/58
 2026-09-02 06:30:29 +08:00
jacy a88fd6c29a v4.0.8任务和版本状态增加“已停止”
CI / verify (pull_request) Waiting to run
Details
2026-09-02 06:28:47 +08:00
jacy bbb13cfd1a Merge commit '2e0518b5b7069f9bffd20612c2049b6d8545822d' into dev_jacy 2026-09-02 05:23:48 +08:00
jacy 2e0518b5b7 Merge remote-tracking branch 'origin/main' into dev-v4.0.8
CI / verify (pull_request) Waiting to run
Details
2026-09-02 05:21:23 +08:00
jacy f8f652a0a6 v4.0.8 客服卡片主包落地与微信内保存海报
CI / verify (pull_request) Waiting to run
Details
2026-09-02 05:20:53 +08:00
jacy 04d903c554 merge(dev): v4.0.8 客服卡片主包落地与微信内保存海报
CI / verify (push) Has been cancelled
Details
v4.0.7 		2026-09-01 15:24:31 +08:00
jacy 30bfcc0d93 merge(dev_jacy): v4.0.8 客服卡片主包落地与微信内保存海报
CI / verify (pull_request) Has been cancelled
Details
2026-09-01 15:24:19 +08:00
jacy 283e6651aa feat(mini): v4.0.8 客服卡片主包落地、定位误报修复，合伙人微信内预览保存海报 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-01 15:23:52 +08:00
jacy 0e883d3e70 merge(dev): v4.0.7 HQ 活动图快链与勾选导出
CI / verify (push) Has been cancelled
Details
v4.0.6 		2026-09-01 15:12:48 +08:00
jacy 6a95f47860 merge(dev_jacy): v4.0.7 HQ 活动图快链与勾选导出
CI / verify (pull_request) Has been cancelled
Details
2026-09-01 15:12:28 +08:00
jacy cdc4b82931 feat(ops): v4.0.7 HQ 活动图快链与勾选导出 
HQ 指定一张活动图为勾选主合伙人合成 PNG/zip；城市合伙人页增加快链与单下/导出。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-09-01 15:12:10 +08:00
jacy 9a35c4aea9 merge(dev): 后台反收录与百度校验文件
CI / verify (push) Has been cancelled
Details
2026-09-01 09:12:11 +08:00
jacy 99c7f8caea merge(dev_jacy): 后台反收录与百度校验文件
CI / verify (pull_request) Has been cancelled
Details
2026-09-01 09:12:08 +08:00
jacy eeee55e215 fix(admin): 后台校验文件避免 301，并让搜索引擎读到 noindex 
serve -s 会把 .html 301 去后缀，百度站长验证失败；同时放开 robots 抓取，避免旧标题一直留在 SERP。
 2026-09-01 09:11:43 +08:00
jacy 971b8aaa7b merge(dev): v4.0.6 酒厂账单与订单完全比对
CI / verify (push) Has been cancelled
Details
2026-08-31 17:28:09 +08:00
jacy d555240295 merge(dev_jacy): v4.0.6 酒厂账单与订单完全比对
CI / verify (pull_request) Has been cancelled
Details
2026-08-31 17:28:00 +08:00
jacy f35e1a3ba5 feat(settlement): v4.0.6 酒厂 T+3 每 3 天出一期并与订单完全比对 
含现场提货入账、零应付仍出账、核对补生成，以及线上历史账单修复 SQL。
 2026-08-31 17:27:38 +08:00
jacy 4b9ab79acb merge(dev): v4.0.4 开发任务/合伙人删除/账单合伙人列
CI / verify (push) Has been cancelled
Details
v4.0.4 		2026-08-31 16:09:20 +08:00
jacy d9725b1914 merge(dev_jacy): v4.0.4 开发任务/合伙人删除/账单合伙人列
CI / verify (pull_request) Has been cancelled
Details
2026-08-31 16:09:09 +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 874ae93a9b Merge pull request 'v4.0.3版本' (#55) from dev_jacy into dev
CI / verify (pull_request) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/55
 2026-08-31 14:27:47 +08:00
jacy fbb92e00d5 Merge pull request 'v4.0.3版本' (#54) from dev_jacy into main
CI / verify (push) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/54
v4.0.3 		2026-08-31 14:27:26 +08:00
jacy e26206b93c v4.0.3版本
CI / verify (pull_request) Has been cancelled
Details 
总部后端，开发计划-任务列表-来源工单支持链接
总部端-开发计划-任务列表-编辑任务-增加“开发中”状态
账单日期修正
 2026-08-31 14:22:49 +08:00
jacy bb831f0580 merge(dev_jacy): v4.0.2 活动图模板与合伙人选择持久化
CI / verify (push) Has been cancelled
Details
v4.0.2 		2026-08-30 21:37:04 +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 fb66258b6a merge(dev_jacy): 门店账单确认打款支持上传凭证照片
CI / verify (push) Has been cancelled
Details
2026-08-30 15:26:32 +08:00
jacy e68eb4d38c feat(settlement): 门店账单确认打款支持上传凭证照片 
财务确认打款与提现通过可附带 OSS 凭证图，详情与导出展示。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-30 15:25:56 +08:00