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
f4f4f1b4aa
主账号和子账号同一设备登录遇到storge问题
2026-07-10 10:54:04 +08:00
ljy
41e66774ef
Merge branch 'dev_new_ljy' into dev
2026-07-10 01:54:39 +08:00
ljy
d66fd9099f
fix:登录跳转失败问题
2026-07-10 01:54:23 +08:00
ljy
58d58f35c4
fix;提交
2026-07-10 01:06:19 +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
ljy
336116fbf2
fix;合并修复问题
2026-07-09 21:42:36 +08:00
jacy
b506417f5e
合伙人端开店选照片
2026-07-09 17:26:24 +08:00
ljy
ab9654564e
fix:提交修复6个问题
2026-07-08 23:01:18 +08:00
jacy
eb961c3a74
feat(h5): unify WeChat OAuth under m.runxian.top path routing
...
Serve user/shop/partner H5 under /user/, /shop/, /partner/ on a single authorized domain; update nginx, SSL script, and router base paths.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-07 22:07:47 +08:00
jacy
e32ccebc80
本地环境不验证手机号和微信登录授权
2026-07-07 21:42:56 +08:00
jacy
c8dfa50f24
隐藏ID的显示
2026-07-07 20:51:35 +08:00
jacy
7dd8a6662b
合伙人端登录页面调整
2026-07-07 14:48:49 +08:00
jacy
2e61caa49c
合伙人端登录验证调整还有日志落地
2026-07-07 14:34:02 +08:00
jacy
d9e72ab227
Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' into dev_jacy
2026-07-07 13:55:10 +08:00
jacy
7ca9fc8a35
门店账号管理修改
2026-07-07 00:01:16 +08:00
ljy
fcf1d45522
fix:完善门店和总部管理端
2026-07-06 20:58:38 +08:00
ljy
569becedaa
feat;提交管理端和城市合伙人端
2026-07-05 23:48:20 +08:00
jacy
743d242d52
v3计划内容上传
2026-07-04 20:36:26 +08:00
jacy
cabc9e6ebb
feat(partner): require WeChat OAuth before store photo upload
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-03 15:44:46 +08:00
jacy
81413e4d08
fix(partner): resolve WeChat image picker auth denied on store create
...
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-03 15:32:53 +08:00
jacy
f2175b83f7
门店开通流程
2026-07-03 14:53:21 +08:00
ljy
a0ee3a21cd
fix:提交修改信息
2026-07-01 17:58:01 +08:00
ljy
d6855c9f5c
fix:需求完善
2026-07-01 16:24:18 +08:00
jacy
6e047dc0a5
init
2026-06-30 10:33:56 +08:00