合并到main 创建8.1最后一波修改,后面测试和正式就会分离 #11

Merged
jacy merged 17 commits from dev into main 2026-07-31 11:27:55 +08:00

17 Commits

Author SHA1 Message Date
jacy 8d6c0f9ac0 feat(ops): partner proxy order list and HQ order delete
CI / verify (pull_request) Has been cancelled
Add partner-facing proxy order list/detail; unlock SUPER_ADMIN order delete with cascade cleanup and type filter.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-31 10:10:39 +08:00
jacy 51f2b5fbfa fix(trade): simplify proxy order and respect product whitelist
Drop SMS verification for HQ/partner proxy orders; keep form draft across product picker; hide whitelist-only products from partner catalog.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-31 09:43:16 +08:00
jacy 2cd4e25682 feat(ops): add HQ admin proxy order and mini-user store session fixes
Align HQ orders page with partner dual-SMS offline proxy flow; improve mini-user stores session and WeChat confirm-receive handling.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-31 09:18:19 +08:00
jacy 1a0afb6d39 feat(trade): WeChat confirm-receive component + admin status log columns
Open weappOrderConfirm in mini-user so users confirm in-app instead of
service notice; verify via get_order before completing. Show operator/remark
on admin order status timeline.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 16:48:44 +08:00
jacy 05dffbfa15 fix(wechat): use getStableAccessToken to avoid 40001
Switch mini/OA tokens to stable_token and retry shipping upload once on invalid credential.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 16:04:02 +08:00
jacy a0a6c14758 feat(trade): WeChat trade-manage push + delay shipping upload
Receive trade_manage_order_settlement to sync confirm-receive/settle;
wait ~65s and retry on 10060001 before upload_shipping_info.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 15:37:42 +08:00
jacy ed7fd4e013 feat(catalog): product visibility whitelist by phone
Admin can limit ON_SALE products to test phones; C-end filters by user phone.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 15:08:57 +08:00
jacy bf9cd1bffd feat(trade): upload WeChat mini program shipping info
Hook SHIPPING and on-site pickup to upload_shipping_info for settlement unlock.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 14:35:21 +08:00
jacy ca621c9db8 fix(partner): restyle map picker header actions
Title centered; wide confirm on left, close on right.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 13:08:35 +08:00
jacy 507a21a318 fix(partner): hide map pick coords from UI
Keep lat/lng in form state for submit; remove pending coords panel and toasts.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 13:04:41 +08:00
jacy f396cb1fef feat(partner): map pick UX and Tencent LBS SN signature
Hide locate on store forms; restore optimized locpicker overlay.
Add TENCENT_LBS_SECRET_KEY and server-side sig for WebServiceAPI.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 12:56:51 +08:00
jacy 2b85f63e2b 用户小程序手机号
门店闪烁逻辑
2026-07-29 12:30:03 +08:00
jacy e742f1e88b fix(mini-user): locate before store list fetch; prefer masked phone on mine
Resolve city once then fetch stores once; skip refetch when city unchanged. Show masked phone under nickname when available.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 11:56:40 +08:00
jacy 2ccadce34a feat(mini-user): show masked phone under nickname on mine page
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 11:31:02 +08:00
jacy b0ff254cd8 fix(partner): use server LBS search instead of locpicker iframe
Avoid Tencent locpicker _listTap crash when selecting POI in WeChat WebView.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 11:31:02 +08:00
jacy c3362851ff fix(partner): restore Tencent locpicker iframe for store map pick
Partner H5 store create/edit uses locpicker again; expose LBS key for iframe.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 11:20:22 +08:00
jacy 804054df33 feat(mini-user): replace mine page icons with asset PNGs
Use icons under assets/icons for order shortcuts and common services.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 11:20:22 +08:00