jacy
608e405468
城市合伙人去掉订单补发功能，酒的订单如果没有配置仓库应该是看不到的
CI / verify (pull_request) Has been cancelled
2026-07-17 08:04:53 +08:00
jacy
b36f2ea63a
城市合伙人H5端结算审核
2026-07-17 07:56:43 +08:00
jacy
7fa2c6fbed
城市合伙人端页面优化
CI / verify (pull_request) Has been cancelled
2026-07-17 07:45:20 +08:00
jacy
bde85a7b82
仓库管理配置 小飞侠配置
CI / verify (pull_request) Has been cancelled
2026-07-16 21:40:25 +08:00
jacy
f6d97b4ee8
feat(trade): 仓配可调配履约与三分支推单
...
CI / verify (pull_request) Has been cancelled
同城有仓按仓库绑定承运商自动推单或自管填单，无仓/跨城走总部快递；新增仓配注册表、FulfillmentService 及三端运单追踪。
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-16 17:51:20 +08:00
jacy
f1dc23c54c
合伙人 H5 改造
CI / verify (pull_request) Has been cancelled
2026-07-16 15:04:56 +08:00
jacy
d3d56150c5
fix(auth): transfer WeChat id on merge; stop false phone prompts
...
CI / verify (pull_request) Has been cancelled
Merge used to drop wxOpenId so OAuth created a new guest without phone every time. Now migrate WeChat identity, recover legacy merged openIds, return accountMerged and force page reload, and only soft-prompt when phone is truly unbound.
2026-07-15 21:25:34 +08:00
jacy
acc5b78471
fix(api): type WeChat-only user create for nest build
...
CI / verify (pull_request) Has been cancelled
EOF
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-15 20:12:18 +08:00
jacy
0f5f0f4c2b
用户端不要强制用户输入手机号
2026-07-15 19:57:06 +08:00
jacy
e0f5977dd9
门店审核功能
2026-07-14 15:25:17 +08:00
jacy
d61a43cc8c
webadmin增加财务模块
2026-07-14 15:16:41 +08:00
jacy
450dc44d0e
微信小程序支付功能打通
2026-07-13 00:07:17 +08:00
jacy
1bd152073a
webadmin系统设置
2026-07-12 22:52:40 +08:00
jacy
236a2a87a5
合伙人端验证是否已经绑定手机号，否则不支持微信一键登录
2026-07-12 21:18:10 +08:00
jacy
b5235dedef
后端增加发放好客权益券的接口
2026-07-12 20:28:43 +08:00
jacy
b267e885be
用户端小程序修改
2026-07-12 20:24:03 +08:00
jacy
e2dfb08de3
小程序修改
2026-07-12 19:44:36 +08:00
jacy
3b4833b51a
开合伙人子账号要验证手机号
2026-07-12 17:53:54 +08:00
jacy
908a5dcf0f
开店需要验证手机号
2026-07-12 17:51:20 +08:00
jacy
d3ef07bf65
短信验证码
2026-07-12 17:20:41 +08:00
jacy
076455944e
fix(partner): 修正微信选图 JSSDK 签名 URL 含 query 参数
...
录店页 ?step= 变化时重新 wx.config，微信内上传仅走 chooseImage 接口。
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-12 16:24:42 +08:00
jacy
e8823a0640
oss bucket 目前只用dukang-dev
2026-07-12 15:57:52 +08:00
jacy
2c04676555
修复合伙人端上传门头照片失败的问题
2026-07-12 15:55:49 +08:00
jacy
9fc955d81f
webadmin增加oss日志
2026-07-12 15:44:17 +08:00
jacy
758760eb36
微信小程序登录页面调整
2026-07-12 15:30:58 +08:00
jacy
becf91da52
微信小程序上传
2026-07-12 14:45:57 +08:00
jacy
d271ac5b13
webadmin端增加版本号和部署功能
2026-07-12 13:52:22 +08:00
jacy
63af3321dd
feat(admin): HQ手机号编辑、合伙人子账号日志与子账号H5体验
...
支持 HQ 账户改手机号（格式校验）、合伙人日志包含子账号且子账号不显示主账号信息；改手机号时清除微信绑定。合伙人 H5 子账号页签与我的页、录入门店底部按钮及上传失败提示。
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-12 13:29:09 +08:00
jacy
54a15d6da7
门店账户多账号
2026-07-12 12:24:34 +08:00
jacy
06b1cb22e0
弱网核销功能
2026-07-12 12:00:55 +08:00
jacy
de01d36cdb
代下单功能
2026-07-12 11:40:04 +08:00
jacy
d949301bc1
手机号核销确认
2026-07-12 10:34:58 +08:00
jacy
7f031cc4c2
城市合伙人端的修改（后台）
2026-07-12 10:19:39 +08:00
jacy
d0f0fa09af
自动修改
2026-07-12 07:50:27 +08:00
jacy
47f540fbd9
fix(h5-partner): resolve merge conflicts for auth and sub-accounts
...
Merge partner session model (AuthGate, ensureSession, WeChat OAuth in Context) with sub-account routing, admin partner-account tree CRUD, upload lock, and partner staff flows.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-10 11:24:48 +08:00
jacy
9c5cb69730
子账号登录微信授权
2026-07-10 11:03:11 +08:00
jacy
2368121972
webadmin增加显示子账号显示列表
...
修复api服务端报错
2026-07-10 10:36:01 +08:00
ljy
47129a9340
Merge branch 'dev_new_ljy' into dev
2026-07-10 00:47:08 +08:00
ljy
e770c98de7
fix:创建子账号不发短信
2026-07-10 00:46:55 +08:00
ljy
9b4e37e513
Merge remote-tracking branch 'origin/dev_new_ljy' into dev
2026-07-10 00:22:48 +08:00
ljy
301839e2dc
fix:提交子账号
2026-07-10 00:22:25 +08:00
ljy
fec7f10f24
Merge branch 'dev_new_ljy' into dev
2026-07-09 23:53:20 +08:00
ljy
b32e2a06eb
fix;提交代码子账号
2026-07-09 23:52:00 +08:00
jacy
b1d5b3214f
Merge commit '336116fbf21cbb33ddbaf00685f93b18ea84d5d6' into dev_jacy
2026-07-09 22:08:02 +08:00
jacy
12ba19ede4
门店端微信号自动登录
2026-07-09 22:07:35 +08:00
ljy
336116fbf2
fix;合并修复问题
2026-07-09 21:42:36 +08:00
ljy
ab9654564e
fix:提交修复6个问题
2026-07-08 23:01:18 +08:00
jacy
d5865aeb5e
fix(api): use CommonJS in with-api-env.cjs for Prisma deploy
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-07 23:34:55 +08:00
jacy
6dc051f26d
chore(api): use .env.production on server, .env for local dev only
...
Load production env without .env override; sync-api-env targets .env.production; PM2 NODE_ENV=production; Prisma uses with-api-env.cjs on deploy.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-07 23:33:34 +08:00
jacy
8598704a49
改回 user.runxian.top
2026-07-07 22:45:49 +08:00
jacy
ljy