Commit Graph

Select branches

Hide Pull Requests

dev

dev_jacy

dev_ljy

main

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#32

#33

#34

#35

#5

#6

#7

#8

#9

v3.3

v3.4

v3.4.10

v3.4.11

v3.4.12

v3.4.13

v3.4.15

v3.4.17

v3.4.18

v3.4.9

v3.5.1

v3.5.2

v3.5.3

Mono Color

• 8a061f085f 提交v3.5.4 版本号小程序 dev_jacy jacy 2026-08-21 17:49:53 +08:00
• b20e566a65 logo3 jacy 2026-08-21 17:39:11 +08:00
• 5fdddae41c merge(dev): v3.5.4 规格主图与门店使用规则 main jacy 2026-08-21 17:37:20 +08:00
• 7d2e4ef57e merge(dev_jacy): v3.5.4 规格主图与门店使用规则 dev jacy 2026-08-21 17:37:09 +08:00
• 4d434c9c67 v3.5.4 规格主图、门店使用规则与收银台 logo jacy 2026-08-21 17:36:53 +08:00
• 22c0b03a47 Merge pull request 'Dev' (#35) from dev into main jacy 2026-08-21 16:24:07 +08:00
• 73fd27bdf6 Merge pull request 'v3.5.4版本提交，修改api' (#34) from dev_jacy into dev jacy 2026-08-21 16:23:54 +08:00
• 62e61a9e63 v3.5.4版本提交，修改api jacy 2026-08-21 16:22:53 +08:00
• f2d03e2595 Merge pull request 'v3.5.4' (#33) from dev into main jacy 2026-08-21 15:50:30 +08:00
• cd9696bc1c Merge pull request 'v3.5.4版本提交' (#32) from dev_jacy into dev jacy 2026-08-21 15:50:07 +08:00
• a01217539c v3.5.4版本提交 jacy 2026-08-21 15:48:15 +08:00
• 0c28c204b2 Merge pull request 'Dev' (#31) from dev into main v3.5.3 jacy 2026-08-20 20:23:20 +08:00
• b5d4f8b27c Merge pull request 'v3.5.3版本更新2' (#30) from dev_jacy into dev jacy 2026-08-20 20:23:03 +08:00
• 26334ed072 v3.5.3版本更新2 jacy 2026-08-20 20:09:05 +08:00
• 9a80f0f8d6 Merge pull request 'v3.5.3版本更新1' (#29) from dev_jacy into dev jacy 2026-08-20 18:55:43 +08:00
• e7f49a9639 Merge pull request 'v3.5.3版本更新1' (#28) from dev_jacy into main jacy 2026-08-20 18:55:18 +08:00
• fc2e5b65de v3.5.3版本更新1 jacy 2026-08-20 18:54:15 +08:00
• f941dcf072 Merge pull request 'Dev' (#27) from dev into main jacy 2026-08-20 15:06:24 +08:00
• e8b585e623 Merge pull request '增加音效逻辑' (#26) from dev_jacy into dev jacy 2026-08-20 15:06:07 +08:00
• ee493823bf 增加音效逻辑 v3.5.2 jacy 2026-08-20 15:04:54 +08:00
• 5702266276 Merge pull request 'Dev jacy' (#25) from dev_jacy into dev jacy 2026-08-20 13:43:29 +08:00
• 3382d36a6c Merge pull request 'Dev jacy 大屏优化' (#24) from dev_jacy into main jacy 2026-08-20 13:43:06 +08:00
• 8b5bb6a981 大屏显示优化 jacy 2026-08-20 13:41:50 +08:00
• 0a36188b35 调整优化大屏 jacy 2026-08-20 12:55:11 +08:00
• 9b8e3f1347 Merge pull request 'v3.5.2 大屏调整' (#23) from dev into main jacy 2026-08-20 12:01:21 +08:00
• a8a37fbc4a Merge pull request 'v3.5.2 大屏调整' (#22) from dev_jacy into dev jacy 2026-08-20 12:00:57 +08:00
• 6cf66c722c v3.5.2 大屏调整 jacy 2026-08-20 11:58:15 +08:00
• 1440a59fc8 Merge pull request 'Dev' (#21) from dev into main v3.5.1 jacy 2026-08-20 00:54:54 +08:00
• e34416a9b3 Merge pull request 'Dev jacy mock 支付调整' (#20) from dev_jacy into dev jacy 2026-08-20 00:54:17 +08:00
• 4db21cf1a1 mockpay功能调试 jacy 2026-08-20 00:51:18 +08:00
• 2f633b307c 删除h5user端和hq小程序端 jacy 2026-08-19 16:21:06 +08:00
• 62353a6800 整理开发文档 jacy 2026-08-19 16:20:33 +08:00
• 11659484c6 Merge pull request 'v3.5.1 版本更新' (#19) from dev into main jacy 2026-08-19 16:01:31 +08:00
• 6c44e9c56f Merge pull request 'v3.5.1 版本更新' (#18) from dev_jacy into dev jacy 2026-08-19 16:00:56 +08:00
• 233ed0af3b v3.5.1 版本更新 jacy 2026-08-19 15:54:51 +08:00
• 0fb7ab7abb Merge pull request 'v3.4.18' (#17) from dev into main v3.4.18 jacy 2026-08-17 23:45:19 +08:00
• 905e145af3 Merge pull request 'v3.4.18' (#16) from dev_jacy into dev jacy 2026-08-17 23:45:00 +08:00
• 7dd5fdfb12 优化门店端结算页面的UI jacy 2026-08-17 23:43:45 +08:00
• 48d6900ab6 fix(iam): 合伙人登录双拦截——子账号status=DISABLED 与 主账号bindingStatus=PAUSED 均拒绝登录 jacy 2026-08-17 23:39:53 +08:00
• 5ca9aa00aa fix(h5-partner): 微信OAuth回跳错误不再吞没，DISABLED提示可见 jacy 2026-08-17 23:22:04 +08:00
• c0d04ee500 fix(h5-shop): 门店 PAUSED 时点击扫码即弹窗，前置到首页 jacy 2026-08-17 23:03:55 +08:00
• 3ac008a217 fix(h5-shop): 修复闭店/休息中扫码核销弹窗不触发 jacy 2026-08-17 22:50:22 +08:00
• cd1e9ae488 refactor(mini-user): 门店套餐图改用 swiper auto-height 自适应（方案A） jacy 2026-08-17 22:20:05 +08:00
• 18147e157f fix(mini-user): 门店套餐图片自适应完整显示，不再裁剪 jacy 2026-08-17 21:48:06 +08:00
• f7c94b4f16 Merge commit '984dec79ee1944e2c21ed2e564cac09ae893afa3' into dev_jacy jacy 2026-08-17 21:40:44 +08:00
• cc750dc1d6 feat: v3.4.18 门店体验与登录态优化 jacy 2026-08-17 21:34:40 +08:00
• 984dec79ee Merge pull request 'Dev v3.4.17 版本发布' (#15) from dev into main v3.4.17 jacy 2026-08-16 12:31:16 +08:00
• f84614bbb4 Merge pull request 'v3.4.17版本发布' (#14) from dev_jacy into dev jacy 2026-08-16 12:30:21 +08:00
• c0ce494732 提交workbuddy记忆缓存 jacy 2026-08-16 12:29:07 +08:00
• 69e201f927 fix(h5-partner): 门店套餐编辑按钮改为紧凑型并贴右对齐 jacy 2026-08-16 12:22:54 +08:00
• ecd9973d8f feat(admin): 套餐变更对比逐字差异定位 + 开发计划并入v3.4.17 jacy 2026-08-16 12:17:34 +08:00
• bbd7e52e70 feat(admin): 套餐变更对比逐字段列出变动明细(v3.4.18) jacy 2026-08-16 12:09:37 +08:00
• 1c91e6bae9 v3.4.17 门店套餐审核快捷入口 jacy 2026-08-16 11:57:01 +08:00
• 029fd690a5 merge(dev): fix(admin) 套餐审核导航样式恢复一致 jacy 2026-08-16 08:56:41 +08:00
• 0bfc19b1a4 merge(dev_jacy): fix(admin) 套餐审核导航样式恢复一致 jacy 2026-08-16 08:56:28 +08:00
• bafb342600 fix(admin): 套餐审核导航恢复与子菜单一致的样式 jacy 2026-08-16 08:56:13 +08:00
• bac5c7ad80 merge(dev): 联系电话脱敏支持座机 + 套餐表单多行输入 jacy 2026-08-16 08:52:19 +08:00
• c05cd0e96d merge(dev_jacy): 联系电话脱敏支持座机 + 套餐表单多行输入 jacy 2026-08-16 08:52:01 +08:00
• 8de41796fb feat(admin,partner,shop,mini,domain): 联系电话脱敏支持座机 + 套餐表单多行输入 jacy 2026-08-16 08:51:43 +08:00
• 4b3b1f76ae merge(dev): 座机联系电话 + 套餐审核体验 jacy 2026-08-14 18:45:24 +08:00
• 75d820b574 merge(dev_jacy): 座机联系电话 + 套餐审核体验 jacy 2026-08-14 18:45:17 +08:00
• 0f48d7abda feat(admin,store): landline contact phone and package audit UX jacy 2026-08-14 18:45:10 +08:00
• 4a0e18472b merge(dev): 用户权益列 + 门店合同多图上传（需求1/2/3） jacy 2026-08-12 22:50:53 +08:00
• 491f03e825 merge(dev_jacy): 用户权益列 + 门店合同多图上传（需求1/2/3） jacy 2026-08-12 22:50:33 +08:00
• 88053353ab feat(ops,store,partner): 用户权益列 + 门店合同多图上传 jacy 2026-08-12 22:48:02 +08:00
• ceacce9ed5 merge(dev): admin contract/package/winery fixes jacy 2026-08-10 20:31:09 +08:00
• 3913bf3bf3 merge(dev_jacy): admin contract/package/winery fixes jacy 2026-08-10 20:31:05 +08:00
• 478291e2b3 fix(admin): contract preview, package audit detail, empty packages, winery status jacy 2026-08-10 20:30:55 +08:00
• 6754caf076 merge(dev): v3.4.16 partner UX and CS gate jacy 2026-08-09 16:01:04 +08:00
• 92c3175acf merge(dev_jacy): v3.4.16 partner UX and CS gate jacy 2026-08-09 16:00:57 +08:00
• 46361ec713 feat(v3.4.16): partner UX, package pricing, CS gate, HQ list polish jacy 2026-08-09 16:00:45 +08:00
• 5586ed90cd merge(dev): store contactPhone separate from login jacy 2026-08-09 07:50:53 +08:00
• 4cec5b1fe5 merge(dev_jacy): store contactPhone separate from login jacy 2026-08-09 07:50:50 +08:00
• 07630c9046 feat(store): separate login phone from public contactPhone jacy 2026-08-09 07:50:40 +08:00
• 4488b0c006 merge(dev): save packages with store 保存修改 jacy 2026-08-07 21:36:40 +08:00
• 99c74f20d2 merge(dev_jacy): save packages with store 保存修改 jacy 2026-08-07 21:36:38 +08:00
• a598d1cd30 fix(admin): save packages when clicking store 保存修改 jacy 2026-08-07 21:36:28 +08:00
• da6a38daa4 merge(dev): fix batch image upload persistence jacy 2026-08-07 21:13:45 +08:00
• c5926bd593 merge(dev_jacy): fix batch image upload persistence jacy 2026-08-07 21:13:42 +08:00
• df546ff39f fix(admin): keep all batch-uploaded images when saving packages jacy 2026-08-07 21:13:31 +08:00
• d6d4a77473 merge(dev): local API port 3010 jacy 2026-08-07 21:04:06 +08:00
• 0518976953 merge(dev_jacy): local API port 3010 jacy 2026-08-07 21:03:59 +08:00
• 8f83624ffe chore(dev): move local API default port to 3010 jacy 2026-08-07 21:03:23 +08:00
• 7c6dae472c merge(dev): persist package imageUrls on approve jacy 2026-08-07 20:46:39 +08:00
• 209db59422 merge(dev_jacy): persist package imageUrls on approve jacy 2026-08-07 20:46:36 +08:00
• 21d44026d9 fix(store): persist package imageUrls on audit approve jacy 2026-08-07 20:46:26 +08:00
• 3b192b0b88 merge(dev): store sortOrder and package gallery swipe jacy 2026-08-07 19:58:53 +08:00
• 1b3a7f3a36 merge(dev_jacy): store sortOrder and package gallery swipe jacy 2026-08-07 19:58:50 +08:00
• 34a1897c09 feat(store): add store sortOrder and swipeable package gallery jacy 2026-08-07 19:58:38 +08:00
• 36017a19b1 merge(dev): batch image upload for package/env/product jacy 2026-08-07 19:41:12 +08:00
• 9c7550a1c4 merge(dev_jacy): batch image upload for package/env/product jacy 2026-08-07 19:41:10 +08:00
• fe1c6c8158 feat(admin): batch upload for package, store env, and product images jacy 2026-08-07 19:40:59 +08:00
• acc841bb21 merge(dev): v3.4.15 store media edit and package multi-image jacy 2026-08-07 19:24:20 +08:00
• 61a99aeea9 merge(dev_jacy): v3.4.15 store media edit and package multi-image jacy 2026-08-07 19:24:17 +08:00
• 76375eff83 feat(v3.4.15): HQ store media edit and package images up to 20 jacy 2026-08-07 19:24:07 +08:00
• 713dce52b4 merge(dev): parse XFX multipart track callbacks jacy 2026-08-07 19:08:15 +08:00
• e41bf838d4 merge(dev_jacy): parse XFX multipart track callbacks jacy 2026-08-07 19:08:12 +08:00
• 0692bebf07 fix(courier): parse XFX multipart/form-data track callbacks jacy 2026-08-07 19:08:03 +08:00
• b19f875e7b merge(dev): fix XFX callback build types jacy 2026-08-07 18:58:56 +08:00
• 090002b6c0 merge(dev_jacy): fix XFX callback build types jacy 2026-08-07 18:58:54 +08:00