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

• c89560e4f8 merge(dev): 门店手动提现 OPT-010 jacy 2026-08-03 15:32:17 +08:00
• f3353bbce5 feat(settlement): 门店未出账手动提现与总部审核（OPT-010） jacy 2026-08-03 15:32:01 +08:00
• 666bcb8633 小程序端门店核销记录走马灯效果 jacy 2026-08-03 15:12:30 +08:00
• ffed560d43 merge(dev): 小程序 Intl 兜底 jacy 2026-08-03 14:54:02 +08:00
• a7a0a54688 fix(mini-user): 微信小程序补 Intl 兜底并去掉 toLocaleString jacy 2026-08-03 14:53:54 +08:00
• 5199b495e0 merge(dev): 门店核销走马灯兼容 H5/小程序 jacy 2026-08-03 14:48:41 +08:00
• 04fd4d50d0 fix(mini-user): 门店核销走马灯兼容 H5 与微信小程序 jacy 2026-08-03 14:48:28 +08:00
• 82b98aa4e3 merge(dev): 修复 Intl is not defined jacy 2026-08-03 14:37:48 +08:00
• 2088a1ee19 fix(mini-user): 去掉 Intl，兼容微信小程序无 Intl 环境 jacy 2026-08-03 14:37:44 +08:00
• 7dffd40f3f merge(dev): 走马灯 JS 实现 jacy 2026-08-03 14:33:35 +08:00
• 021b9e0329 fix(mini-user): 门店核销走马灯改用 JS 位移 jacy 2026-08-03 14:33:31 +08:00
• 0304201e80 merge(dev): 发版默认生产约定 jacy 2026-08-03 14:29:55 +08:00
• fd05621660 chore(cursor): 发版默认改为生产环境 jacy 2026-08-03 14:29:53 +08:00
• dd4362c397 merge(dev): 门店详情修复 jacy 2026-08-03 14:29:03 +08:00
• 2ebdb08a2f fix(mini-user): 门店详情加载、标题居中与走马灯展示 jacy 2026-08-03 14:28:59 +08:00
• 87515decb3 merge(dev): 核销时间格式与门店走马灯 jacy 2026-08-03 14:20:36 +08:00
• 4a5b9eaffa feat(store): 门店详情核销记录走马灯 jacy 2026-08-03 14:16:06 +08:00
• e06d9f4711 小程序端日期时间显示格式 jacy 2026-08-03 14:03:45 +08:00
• 28ef916a22 merge(dev): 门店可见白名单 jacy 2026-08-03 13:58:47 +08:00
• fa3484041e feat(store): 门店可见白名单（对齐商品） jacy 2026-08-03 13:58:35 +08:00
• 06cbcdeb9c 首页商品：对齐门店「当次会话」——首次进入 / 城市变化 / 登录态变化 / 下拉刷新才拉列表，切 Tab 不再重复请求；退出登录会清缓存。 核销成功时间：按 Asia/Shanghai 格式化为「2026年8月3日 13点45分」。 核销码编号：单行省略显示，双击复制（有「双击复制」提示）。 jacy 2026-08-03 13:51:29 +08:00
• ebd8c07147 数量加减：同城/跨城/现场取货确认页加减号不再置灰；点减到低于起购时 toast，数量仍可降到 1（不能到 0）。 支付后返回：支付成功进详情带 from=pay；返回一律 switchTab 首页（失败则 reLaunch），避免栈只有一页时 navigateBack 退出小程序。订单列表返回同样加固。 jacy 2026-08-03 13:22:12 +08:00
• 39e38aac7e merge(dev): mini-user eight fixes and catalog whitelist jacy 2026-08-03 13:12:40 +08:00
• 87c4af7364 客服电话 → 13203801799（CUSTOMER_SERVICE_PHONE，协议文案走常量自动同步） 权益页去掉分享按钮，菜单分享保留 支付成功改 reLaunch 清栈；订单列表返回首页 减数量低于起购时 toast「同城/跨城/现场提货至少购买 N 瓶」 核销成功可评星并 POST /redeem/ratings；HQ 新增「门店评价」页 /store-ratings 成功页「回到首页」改用 .redeem-cancel-btn，不再撑破布局 历史记录改为核销流水：GET /redeem/records；生产库已有 2 笔（用户 13073729990）可验证。权益明细字段映射也一并修了 我的页头像提高点击层级，避免被卡片遮挡 jacy 2026-08-03 13:09:59 +08:00
• 9f67221457 商品白名单 jacy 2026-08-03 12:53:39 +08:00
• 23587418c1 门店端调用相机功能提示修改 jacy 2026-08-03 12:37:01 +08:00
• daf534b4db merge(dev): skip WeCom audit client-error noise jacy 2026-08-02 21:52:18 +08:00
• 0621ac18fb fix(ops): skip WeCom alerts for mini-program audit navigate noise jacy 2026-08-02 21:52:13 +08:00
• 442f1ea842 该商品不支持跨城配送，请更换为开城城市内的收货地址 jacy 2026-08-02 21:41:50 +08:00
• 8e25e23e81 商品只支持现场提货的功能修改 jacy 2026-08-02 21:39:22 +08:00
• 118993a01f merge(dev): deploy default DB sync jacy 2026-08-02 18:12:37 +08:00
• a017a27b60 fix(deploy): run DB sync by default when release args omitted jacy 2026-08-02 18:12:35 +08:00
• 8f361981bf merge(dev): product fulfillment flags and auto SKU jacy 2026-08-02 18:10:31 +08:00
• 847a3f0dc3 feat(catalog): add product fulfillment flags and auto SKU jacy 2026-08-02 18:10:16 +08:00
• 49a5c057db 小程序商品列表上下滚动 jacy 2026-08-02 17:54:42 +08:00
• 4bb6ae20cd merge(dev): fix partner image picker after cancel jacy 2026-08-02 17:11:31 +08:00
• 5deffbdbfb fix(h5-partner): allow reopening WeChat image picker after cancel jacy 2026-08-02 17:11:19 +08:00
• ad757e9ba8 merge(dev): restore camera and fix mine benefit-detail back jacy 2026-08-02 17:00:58 +08:00
• 07fbb74485 小程序端“我的明细”退回错误bug修复 jacy 2026-08-02 16:46:43 +08:00
• ca6fa2244b 合伙人端和门店端微信SDK调用相机复原 jacy 2026-08-02 16:34:56 +08:00
• e63b57db19 merge(dev): client error reporting jacy 2026-08-02 16:27:20 +08:00
• 205c1110c2 feat(ops): add client error reporting API and frontend hooks jacy 2026-08-02 16:27:08 +08:00
• fb4432b307 merge(dev): WeCom webhook ops alerts jacy 2026-08-02 16:02:35 +08:00
• 3328c52cb4 feat(ops): WeCom webhook alerts for pay/redeem anomalies jacy 2026-08-02 16:01:30 +08:00
• ab44515e8b merge(dev_jacy): on-site pickup COMPLETED on pay jacy 2026-08-02 13:42:17 +08:00
• cb6ecaaba6 fix(trade): on-site pickup pay success marks order COMPLETED jacy 2026-08-02 13:42:15 +08:00
• 78365d648c merge(dev_jacy): proxy-order real pay jacy 2026-08-02 13:28:16 +08:00
• 4ba51c502b fix(proxy-order): remove mock pay button, use real WeChat pay jacy 2026-08-02 13:28:09 +08:00
• e9eddbb26e merge(dev_jacy): shop WeChat unbound tip jacy 2026-08-02 13:15:50 +08:00
• ab3b230d01 fix(h5-shop): tip unbound WeChat login to use phone first jacy 2026-08-02 13:15:47 +08:00
• c00ca3620d merge(dev): partner dropdown label company-name jacy 2026-08-02 13:07:41 +08:00
• 45d3d8164d fix(admin-web): show company-name in store create partner dropdown jacy 2026-08-02 13:07:09 +08:00
• defdcb409f fix(deploy): force staging=dev and production=main regardless of deploy.env jacy 2026-08-02 12:55:40 +08:00
• 4d76ee6d0e merge(dev): WeChat login restore, proxy pay, staging SSL verify jacy 2026-08-02 12:53:53 +08:00
• bdc9dbde8d fix(h5-partner): make WeChat login click feedback and OAuth start reliably jacy 2026-08-02 12:42:55 +08:00
• 3fc2f23e10 feat(h5-auth): restore partner and shop WeChat login jacy 2026-08-02 11:59:23 +08:00
• 09e732bfa3 微信JSSDK对接，代下单支付 jacy 2026-08-02 11:49:35 +08:00
• 50ba6e9c56 概览页增加表格统计 jacy 2026-08-02 11:16:51 +08:00
• 6a23e79f4c chore(deploy): add same-host staging stack next to production jacy 2026-07-31 11:37:18 +08:00
• 2dbe665bdc Merge pull request '合并到main 创建8.1最后一波修改，后面测试和正式就会分离' (#11) from dev into main jacy 2026-07-31 11:27:55 +08:00
• 8d6c0f9ac0 feat(ops): partner proxy order list and HQ order delete jacy 2026-07-31 10:10:39 +08:00
• 51f2b5fbfa fix(trade): simplify proxy order and respect product whitelist jacy 2026-07-31 09:43:16 +08:00
• 2cd4e25682 feat(ops): add HQ admin proxy order and mini-user store session fixes jacy 2026-07-31 09:18:19 +08:00
• 1a0afb6d39 feat(trade): WeChat confirm-receive component + admin status log columns jacy 2026-07-29 16:48:44 +08:00
• 05dffbfa15 fix(wechat): use getStableAccessToken to avoid 40001 jacy 2026-07-29 16:04:02 +08:00
• a0a6c14758 feat(trade): WeChat trade-manage push + delay shipping upload jacy 2026-07-29 15:37:42 +08:00
• ed7fd4e013 feat(catalog): product visibility whitelist by phone jacy 2026-07-29 15:08:57 +08:00
• bf9cd1bffd feat(trade): upload WeChat mini program shipping info jacy 2026-07-29 14:35:21 +08:00
• ca621c9db8 fix(partner): restyle map picker header actions jacy 2026-07-29 13:08:35 +08:00
• 507a21a318 fix(partner): hide map pick coords from UI jacy 2026-07-29 13:04:41 +08:00
• f396cb1fef feat(partner): map pick UX and Tencent LBS SN signature jacy 2026-07-29 12:56:51 +08:00
• 2b85f63e2b 用户小程序手机号 门店闪烁逻辑 jacy 2026-07-29 12:30:03 +08:00
• e742f1e88b fix(mini-user): locate before store list fetch; prefer masked phone on mine jacy 2026-07-29 11:56:40 +08:00
• 2ccadce34a feat(mini-user): show masked phone under nickname on mine page jacy 2026-07-29 11:31:02 +08:00
• b0ff254cd8 fix(partner): use server LBS search instead of locpicker iframe jacy 2026-07-29 11:31:02 +08:00
• c3362851ff fix(partner): restore Tencent locpicker iframe for store map pick jacy 2026-07-29 11:20:22 +08:00
• 804054df33 feat(mini-user): replace mine page icons with asset PNGs jacy 2026-07-29 11:20:22 +08:00
• 1bc3bec977 Merge pull request 'Dev Main by v3.4 测试数据删除' (#10) from dev into main jacy 2026-07-28 17:19:21 +08:00
• 309b180087 feat(admin): link city-partner store count; fix benefitUsageRule null string v3.4 jacy 2026-07-28 16:03:56 +08:00
• 118d57d710 feat(admin): delete store staff; city store count links to filtered list jacy 2026-07-28 15:43:09 +08:00
• 0cb2b2cebb feat(admin): store detail edit with login phone sync; tighten HQ UI jacy 2026-07-28 15:10:14 +08:00
• daeb24bbeb feat(admin): gate user/order/city delete behind assignable HQ permissions jacy 2026-07-28 14:01:18 +08:00
• f4766d32ff fix(admin): make partner company/address/district optional on create UI jacy 2026-07-28 13:44:19 +08:00
• b920c894b9 feat(admin): city delete with impact preview; optional partner fields jacy 2026-07-28 13:33:12 +08:00
• 37038a7591 fix(api): surface LLM network errors for WeCom AI replies jacy 2026-07-28 12:59:49 +08:00
• 944306e45c fix(admin,partner): replace Tencent iframe picker with server LBS search jacy 2026-07-28 12:56:50 +08:00
• 9ed0c24d11 fix(admin,partner): harden Tencent locpicker coords and confirm flow jacy 2026-07-28 00:47:08 +08:00
• 50349dd8e9 fix(mini-user): center qualification image on translucent mask jacy 2026-07-28 00:41:13 +08:00
• e2fd28a35b fix(partner): drop store-create SMS verify; keep qualification aspect ratio jacy 2026-07-28 00:34:31 +08:00
• 15c35c49de 分享功能和资质文件展示 jacy 2026-07-28 00:31:31 +08:00
• a49d8d99b6 fix(partner): drop pickup store and reorder promo on proxy order jacy 2026-07-28 00:19:52 +08:00
• aa9d689c76 fix(partner): guard null region on proxy order preview jacy 2026-07-28 00:10:47 +08:00
• b59d4484ec feat(partner): complete proxy order with dual SMS and pickup jacy 2026-07-28 00:04:59 +08:00
• cd23119470 feat(mini-user): enable share on home/benefit and OSS qualification jacy 2026-07-27 23:41:29 +08:00
• 18ab639669 fix(store): use line comment for benefitUsageRule in Prisma schema jacy 2026-07-27 23:25:45 +08:00
• fc03905777 feat(store): benefit coupon usage rules and show env photos on store detail jacy 2026-07-27 23:25:18 +08:00
• ea8152ebf3 fix(deploy): use scp -P for sync-api-env port option jacy 2026-07-27 23:20:43 +08:00
• 78973e3fbf fix(api): seed empty system settings from env including Tencent LBS key jacy 2026-07-27 23:19:54 +08:00
• 317f910f3c feat(admin,partner): Tencent map location picker and expose LBS key jacy 2026-07-27 23:19:40 +08:00
• d36fe13bcd fix(admin,mini-user): store lat/lng edit with Baidu map, center pickup qty hint jacy 2026-07-27 22:53:13 +08:00