ljy
792b543ba8
fix;提交、
2026-07-19 22:16:55 +08:00
jacy
76270b20bf
Merge branches 'dev_jacy' and 'dev' of git.yqidian.com:jacy/dukang into dev
CI / verify (pull_request) Has been cancelled
2026-07-17 10:43:19 +08:00
jacy
c2914c37e5
fix(partner): grant store staff open/close and media permissions by default
...
CI / verify (pull_request) Has been cancelled
Default new sub-accounts to store:create+store:manage, backfill empty permissions on /partner/me, and treat legacy store staff as allowed to mutate.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-17 10:43:15 +08:00
jacy
9f9b7cb2bd
merge(dev_jacy): partner store manage and env photo dedupe
2026-07-17 10:36:31 +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
02efe6fa14
merge(dev_jacy): fix login agreement visibility
2026-07-17 10:20:36 +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
f750fea667
merge(dev_jacy): skip unauthorized partner home APIs
2026-07-17 10:13:45 +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
19cb13d26c
merge(dev_jacy): partner sub-account team leaderboard
2026-07-17 10:02:44 +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
aaf6ee81d5
merge(dev_jacy): fix mini-user production API origin
2026-07-17 09:30:12 +08:00
jacy
972bdde650
fix(mini-user): restore production API origin for H5 builds
...
CI / verify (pull_request) Has been cancelled
Production builds were baking localhost:3000 after the local-dev default change, causing failed to fetch on product list.
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-17 09:30:09 +08:00
jacy
c0d66cfe50
merge(dev_jacy): admin订单配送/仓库自动发货/跨城起购与mini-user联调
2026-07-17 09:08:20 +08:00
jacy
00b52b9aaa
用户端跨城订单界面优化
CI / verify (pull_request) Has been cancelled
2026-07-17 09:06:53 +08:00
jacy
e9537ce052
后端仓库配送逻辑完善
CI / verify (pull_request) Has been cancelled
2026-07-17 08:57:19 +08:00
jacy
c204fb0a92
仓库自动配送开关
CI / verify (pull_request) Has been cancelled
2026-07-17 08:50:18 +08:00
jacy
c643b0b979
webadmin端订单修改
2026-07-17 08:45:33 +08:00
jacy
ed44e88e93
miniuser服务器连接地址修改
CI / verify (pull_request) Has been cancelled
2026-07-17 08:34:37 +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
bde85a7b82
仓库管理配置 小飞侠配置
CI / verify (pull_request) Has been cancelled
2026-07-16 21:40:25 +08:00
jacy
b4ec9387a0
merge(dev_jacy): 仓配可调配履约与三分支推单
2026-07-16 17:51:32 +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
9e6dc8c85c
merge(dev_jacy): partner UX, shop wechat bind, remove H5 title whitespace
2026-07-16 11:40:55 +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
22845e5d5f
门店端增加绑定微信按钮
CI / verify (pull_request) Has been cancelled
2026-07-16 08:30:04 +08:00
jacy
8d7507e2d8
杜康发布 skills
2026-07-16 08:28:46 +08:00
jacy
48995aace4
merge(dev_jacy): hide H5 in-page titles vs WeChat chrome
2026-07-16 08:05:46 +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
92ad0e16cf
merge(dev_jacy): fix order detail receiver address display
2026-07-15 21:36:47 +08:00
jacy
7b14f4a0cc
fix(mini-user): show real receiver fields on order detail
...
CI / verify (pull_request) Has been cancelled
Order detail used non-existent addressSnapshot; API returns receiverName/phone/address. Render those and fix product qty from items/quantity.
2026-07-15 21:36:44 +08:00
jacy
d69bfa359a
merge(dev_jacy): fix account merge WeChat transfer and phone prompt
2026-07-15 21:25:45 +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
6a5ddcc70a
merge(dev_jacy): fix phone bind session bounce and mini-user UX
2026-07-15 21:11:22 +08:00
jacy
5c55d3c385
fix(mini-user): persist bind-phone session and stop login bounce
...
CI / verify (pull_request) Has been cancelled
Phone bind discarded the new JWT after account merge, so the next page 401'd back to login. Also harden 401 race, location deny cache, unpaid repay CTA, and finishLoginNavigate.
2026-07-15 21:10:42 +08:00
jacy
b30adfea8e
merge(dev_jacy): fix H5 pay appid/openid and login input align
2026-07-15 20:55:13 +08:00
jacy
02aecbeaab
fix(mini-user): H5 pay use USER_H5; center login phone input
...
CI / verify (pull_request) Has been cancelled
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-15 20:55:09 +08:00
jacy
734a15c9ce
merge(dev_jacy): mini-user address/share/input UX fixes
2026-07-15 20:48:36 +08:00
jacy
9a3ccabcc9
fix(mini-user): address textarea freeze, input align, wechat share invoke
...
CI / verify (pull_request) Has been cancelled
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-15 20:48:33 +08:00
jacy
fd62b5bdbe
merge(dev_jacy): UX fixes for address, checkbox, scan resume, tabbar
2026-07-15 20:37:43 +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
52a809649c
用户端mini-user 多了一层tab
2026-07-15 20:31:09 +08:00
jacy
e307550ead
merge(dev_jacy): fix mini-user WeChat OAuth clientApp mismatch
2026-07-15 20:22:40 +08:00
jacy
372c29bc3a
fix(mini-user): use USER_MINI for WeChat SDK so OAuth token persists
...
CI / verify (pull_request) Has been cancelled
Co-authored-by: Cursor <cursoragent@cursor.com >
2026-07-15 20:22:37 +08:00
jacy
9c45011bd4
merge(dev_jacy): fix WeChat login create type for deploy
2026-07-15 20:12:39 +08:00
ljy
jacy