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
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
ec748335bf
环境变量修改
2026-07-07 20:51:44 +08:00
jacy
1ac72e9a69
管理后台左侧列表调整
2026-07-07 18:49:47 +08:00
jacy
98e9652865
web端增加微信绑定管理
2026-07-07 18:25:15 +08:00
jacy
887d728496
webadmin去掉新建门店的短信验证
2026-07-07 18:17:45 +08:00
jacy
67eed11276
商铺端核销，调用相机报无效签名修复
2026-07-07 17:55:12 +08:00
jacy
7e3c0011bb
微信登录日志
2026-07-07 17:17:03 +08:00
jacy
2c74f6a08c
合伙人端登录接口优化
2026-07-07 15:22:55 +08:00
jacy
2e61caa49c
合伙人端登录验证调整还有日志落地
2026-07-07 14:34:02 +08:00
jacy
af989c9d33
api端报错修正
2026-07-07 14:03:07 +08:00
jacy
d9e72ab227
Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' into dev_jacy
2026-07-07 13:55:10 +08:00
jacy
6572799264
webadmin端增加商铺日志
2026-07-07 12:12:12 +08:00
jacy
e25b208545
核销成功提示
2026-07-07 11:46:12 +08:00
jacy
5d19089f91
门店页面修改
2026-07-07 00:18:29 +08:00
jacy
1fcafac2a7
后端显示门店账单
2026-07-07 00:04:07 +08:00
jacy
7ca9fc8a35
门店账号管理修改
2026-07-07 00:01:16 +08:00
jacy
e85c4b9bcb
门店核销功能测试
2026-07-06 23:40:12 +08:00
jacy
a66207ffa9
超管用户登录；
...
代码核销功能
2026-07-06 22:33:30 +08:00
jacy
d708a10095
核销功能
2026-07-06 22:22:21 +08:00
jacy
386ee9e754
核销代码
2026-07-06 22:10:45 +08:00
jacy
047cf879f8
小飞侠的日志
2026-07-06 21:36:20 +08:00
ljy
fcf1d45522
fix:完善门店和总部管理端
2026-07-06 20:58:38 +08:00
jacy
9d221cfcd2
微信授权逻辑修改
2026-07-06 20:56:25 +08:00
jacy
4c38a9dd2b
增加核销接口
...
增加hq管理端日志
2026-07-06 19:17:27 +08:00
jacy
f0b99ea9da
webadmin端
...
批量删除用户
模板上传图片数量限制改成30
小飞侠接口配置
2026-07-06 18:04:02 +08:00
jacy
4e18763968
小飞侠接口调通测试
2026-07-06 17:07:35 +08:00
jacy
da80b28ba4
商品删除功能（需要二次确认）
2026-07-06 16:34:54 +08:00
jacy
f46904b47c
商品模板功能上传
2026-07-06 15:29:27 +08:00
jacy
80d967f2cf
小飞侠接口
2026-07-06 14:12:06 +08:00
jacy
c87d79109a
定位获取城市功能，需要微信地图的key？
2026-07-06 14:02:07 +08:00
jacy
67af6d7d53
短信验证绑定日志内容
2026-07-06 13:26:31 +08:00
jacy
ljy