jacy
317f910f3c
feat(admin,partner): Tencent map location picker and expose LBS key
...
Store create/edit on HQ and partner can pick coords via Tencent locpicker; client-config exposes TENCENT_LBS_KEY; seed empty system settings from env.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-27 23:19:40 +08:00
jacy
09eda9a11e
H5端开店增加获取当前店铺位置
2026-07-27 22:37:15 +08:00
jacy
23c0cc7a5f
小程序优化，商铺定位等
2026-07-27 22:33:00 +08:00
jacy
92cf51ba3d
feat(store): dual business hours, avg price, and status lock
...
CI / verify (pull_request) Has been cancelled
Support 1-2 hour segments and optional avgPrice; show bank settlement on HQ store detail; enforce pickup min 2 bottles; Chinese order statuses; block shop reopen after permanent close.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-26 10:16:22 +08:00
jacy
b392c28787
feat(settlement): redesign factory/partner/store statement bills
...
CI / verify (pull_request) Has been cancelled
Add WineryBill/StoreBill tables, partner review-send-confirm flow, daily/monthly cron, and admin multi-select confirm with status filters.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-22 17:25:49 +08:00
jacy
5e33dd9847
开店第三页银行卡号：只允许数字，最多 19 位；校验仍为 16–19 位。
...
门店详情 / 开店页：去掉顶栏返回与标题空白，内容上顶，顶部约 12px，与「门店管理」一致。
开店第一页底部：在「下一步」左侧加了「返回」（回门店列表）；第 2、3 步仍是「上一步」。
2026-07-22 12:44:12 +08:00
jacy
9a550cbaaf
feat(store): add two-level store categories for admin and partner open-store
...
CI / verify (pull_request) Has been cancelled
Admin CRUD under stores menu; partner picks leaf category on create.
Default sync only inserts missing rows and never updates existing ones.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-22 12:10:02 +08:00
jacy
823e439101
开门营业成功后提示「开店成功」
...
关闭门店改为自定义确认框，不再用 window.confirm，不会再带出页面域名
2026-07-22 11:50:05 +08:00
jacy
7c9827875f
合伙人端开店的流程里加入开店营业时间，放在开店流程的第一页。
2026-07-22 11:30:25 +08:00
jacy
ae7c63c08d
feat(h5): add pull-to-refresh on user partner and shop pages
...
CI / verify (pull_request) Has been cancelled
Share PullToRefresh for partner/shop H5; enable Taro pull-down on mini-user lists.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-22 11:19:42 +08:00
jacy
270cebc79a
fix(partner): move store-open phone verify to step 3
...
CI / verify (pull_request) Has been cancelled
Confirm phone and SMS after bank details, then submit directly.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-22 10:22:53 +08:00
jacy
36bec94639
fix(h5): temporarily disable WeChat camera flows
...
CI / verify (pull_request) Has been cancelled
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-21 11:18:51 +08:00
jacy
83ed90ef67
feat(h5-auth): remember SMS sessions and simplify media access
...
CI / verify (pull_request) Has been cancelled
Hide WeChat login for shop and partner users, keep verified sessions for seven days, and allow JSSDK camera or album access without an OpenID binding.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-21 10:41:17 +08:00
jacy
de396442a4
feat(partner): let staff manage stores and fix env photo dupes
...
CI / verify (pull_request) Has been cancelled
Allow store:create/manage sub-accounts to edit, open/close, and re-upload media; dedupe ENV photos on write/read and replace via media API.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-17 10:36:29 +08:00
jacy
14b867a3a5
fix(auth): show user agreement before login actions
...
CI / verify (pull_request) Has been cancelled
Quick login required agreement without a checkbox; move the consent row above CTAs across partner/shop/user/mini login pages so it stays visible on short screens.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-17 10:20:32 +08:00
jacy
55e91158b3
fix(partner): skip unauthorized home APIs for sub-accounts
...
CI / verify (pull_request) Has been cancelled
Gate dashboard/stores/orders by permission and move dashboard auth to method level so leaderboard stays open without toasting 403s.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-17 10:13:43 +08:00
jacy
04253b9120
feat(partner): let sub-accounts view team leaderboard
...
CI / verify (pull_request) Has been cancelled
Expose same-primary ranking on home/me for all staff including warehouse roles, and open the leaderboard API without business permission gates.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-17 10:02:42 +08:00
jacy
57172d54d5
合伙人页面功
CI / verify (pull_request) Has been cancelled
2026-07-17 08:20:31 +08:00
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
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
4de570f5f4
合伙人端的子账号管理页面优化
CI / verify (pull_request) Has been cancelled
2026-07-16 11:24:48 +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
b7db202632
解决合伙人端上传图片循环调用接口的问题
2026-07-12 17:29:50 +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
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
d66fd9099f
fix:登录跳转失败问题
2026-07-10 01:54:23 +08:00
ljy
b32e2a06eb
fix;提交代码子账号
2026-07-09 23:52:00 +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
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
jacy
ljy