Commit Graph

55 Commits

Author SHA1 Message Date
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 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 fd5427c7ea 页面头部的白色留白去掉
CI / verify (pull_request) Has been cancelled
2026-07-16 11:38:44 +08:00
jacy 4de570f5f4 合伙人端的子账号管理页面优化
CI / verify (pull_request) Has been cancelled
2026-07-16 11:24:48 +08:00
jacy 5a26841d3a fix(h5): hide in-page nav titles that duplicate WeChat chrome
CI / verify (pull_request) Has been cancelled
Keep back buttons and header layout. mini-user only hides titles on H5; partner/shop hide .app-page-title and legal titles; shared PageHeader defaults showTitle=false.
2026-07-16 08:05:44 +08:00
jacy 966ddc9219 fix(mini-user): address URL, form align, agreement checkbox, shop scan resume
CI / verify (pull_request) Has been cancelled
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-15 20:37:40 +08:00
jacy 68aa7d3ce2 用户协议默认不勾选 2026-07-15 19:50:09 +08:00
jacy e0f5977dd9 门店审核功能 2026-07-14 15:25:17 +08:00
jacy 236a2a87a5 合伙人端验证是否已经绑定手机号,否则不支持微信一键登录 2026-07-12 21:18:10 +08:00
jacy 3b4833b51a 开合伙人子账号要验证手机号 2026-07-12 17:53:54 +08:00
jacy 908a5dcf0f 开店需要验证手机号 2026-07-12 17:51:20 +08:00
jacy d8c1ac6a9e 选图成功上传bug修复 2026-07-12 17:39:46 +08:00
jacy b7db202632 解决合伙人端上传图片循环调用接口的问题 2026-07-12 17:29:50 +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 656e906254 微信sdk更新,修正上传门头照照片错误 2026-07-12 16:10:11 +08:00
jacy 2c04676555 修复合伙人端上传门头照片失败的问题 2026-07-12 15:55:49 +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 de01d36cdb 代下单功能 2026-07-12 11:40:04 +08:00
jacy 7f031cc4c2 城市合伙人端的修改(后台) 2026-07-12 10:19:39 +08:00
jacy 1761f7b3bf 城市合伙人端开店城市屁默认郑州 2026-07-10 13:14:46 +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 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