jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
595 Commits 4 Branches 13 Tags
f9161368e1dad5305bb3513980f486f8f5c27f9e
Commit Graph

595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jacy ebd8c07147 数量加减：同城/跨城/现场取货确认页加减号不再置灰；点减到低于起购时 toast，数量仍可降到 1（不能到 0）。 
支付后返回：支付成功进详情带 from=pay；返回一律 switchTab 首页（失败则 reLaunch），避免栈只有一页时 navigateBack 退出小程序。订单列表返回同样加固。
 2026-08-03 13:22:12 +08:00
jacy 39e38aac7e merge(dev): mini-user eight fixes and catalog whitelist
CI / verify (push) Has been cancelled
Details
2026-08-03 13:12:40 +08:00
jacy 87c4af7364 客服电话 → 13203801799（CUSTOMER_SERVICE_PHONE，协议文案走常量自动同步） 
权益页去掉分享按钮，菜单分享保留
支付成功改 reLaunch 清栈；订单列表返回首页
减数量低于起购时 toast「同城/跨城/现场提货至少购买 N 瓶」
核销成功可评星并 POST /redeem/ratings；HQ 新增「门店评价」页 /store-ratings
成功页「回到首页」改用 .redeem-cancel-btn，不再撑破布局
历史记录改为核销流水：GET /redeem/records；生产库已有 2 笔（用户 13073729990）可验证。权益明细字段映射也一并修了
我的页头像提高点击层级，避免被卡片遮挡
 2026-08-03 13:09:59 +08:00
jacy 9f67221457 商品白名单 2026-08-03 12:53:39 +08:00
jacy 23587418c1 门店端调用相机功能提示修改 2026-08-03 12:37:01 +08:00
jacy daf534b4db merge(dev): skip WeCom audit client-error noise
CI / verify (push) Has been cancelled
Details
2026-08-02 21:52:18 +08:00
jacy 0621ac18fb fix(ops): skip WeCom alerts for mini-program audit navigate noise 
Filter anonymous mini-app page-not-found client errors (often WeChat review bots) from webhook while still logging and persisting.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-02 21:52:13 +08:00
jacy 442f1ea842 该商品不支持跨城配送，请更换为开城城市内的收货地址 2026-08-02 21:41:50 +08:00
jacy 8e25e23e81 商品只支持现场提货的功能修改 2026-08-02 21:39:22 +08:00
jacy 118993a01f merge(dev): deploy default DB sync
CI / verify (push) Has been cancelled
Details
2026-08-02 18:12:37 +08:00
jacy a017a27b60 fix(deploy): run DB sync by default when release args omitted 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-02 18:12:35 +08:00
jacy 8f361981bf merge(dev): product fulfillment flags and auto SKU
CI / verify (push) Has been cancelled
Details
2026-08-02 18:10:31 +08:00
jacy 847a3f0dc3 feat(catalog): add product fulfillment flags and auto SKU 
Enable online/cross-city/on-site purchase switches with trade gates, HQ and proxy UI, and server-generated DK SKUs.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-02 18:10:16 +08:00
jacy 49a5c057db 小程序商品列表上下滚动 2026-08-02 17:54:42 +08:00
jacy 4bb6ae20cd merge(dev): fix partner image picker after cancel
CI / verify (push) Has been cancelled
Details
2026-08-02 17:11:31 +08:00
jacy 5deffbdbfb fix(h5-partner): allow reopening WeChat image picker after cancel 
Avoid resetting JSSDK on each pick and unlock cancel paths so camera/album can be opened again.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-02 17:11:19 +08:00
jacy ad757e9ba8 merge(dev): restore camera and fix mine benefit-detail back
CI / verify (push) Has been cancelled
Details
2026-08-02 17:00:58 +08:00
jacy 07fbb74485 小程序端“我的明细”退回错误bug修复 2026-08-02 16:46:43 +08:00
jacy ca6fa2244b 合伙人端和门店端微信SDK调用相机复原 2026-08-02 16:34:56 +08:00
jacy e63b57db19 merge(dev): client error reporting
CI / verify (push) Has been cancelled
Details
2026-08-02 16:27:20 +08:00
jacy 205c1110c2 feat(ops): add client error reporting API and frontend hooks 
Collect mini-user/shop/partner JS errors via POST /common/client-errors, persist logs, and push fatal/error to WeCom.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-02 16:27:08 +08:00
jacy fb4432b307 merge(dev): WeCom webhook ops alerts
CI / verify (push) Has been cancelled
Details
2026-08-02 16:02:35 +08:00
jacy 3328c52cb4 feat(ops): WeCom webhook alerts for pay/redeem anomalies 
Add outbound group-bot alerts, rate/amount rules, stuck-order cron, HQ test button, and health db/redis checks.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-08-02 16:01:30 +08:00
jacy ab44515e8b merge(dev_jacy): on-site pickup COMPLETED on pay
CI / verify (push) Has been cancelled
Details
2026-08-02 13:42:17 +08:00
jacy cb6ecaaba6 fix(trade): on-site pickup pay success marks order COMPLETED 2026-08-02 13:42:15 +08:00
jacy 78365d648c merge(dev_jacy): proxy-order real pay
CI / verify (push) Has been cancelled
Details
2026-08-02 13:28:16 +08:00
jacy 4ba51c502b fix(proxy-order): remove mock pay button, use real WeChat pay 2026-08-02 13:28:09 +08:00
jacy e9eddbb26e merge(dev_jacy): shop WeChat unbound tip
CI / verify (push) Has been cancelled
Details
2026-08-02 13:15:50 +08:00
jacy ab3b230d01 fix(h5-shop): tip unbound WeChat login to use phone first 2026-08-02 13:15:47 +08:00
jacy c00ca3620d merge(dev): partner dropdown label company-name
CI / verify (push) Has been cancelled
Details
2026-08-02 13:07:41 +08:00
jacy 45d3d8164d fix(admin-web): show company-name in store create partner dropdown 2026-08-02 13:07:09 +08:00
jacy defdcb409f fix(deploy): force staging=dev and production=main regardless of deploy.env 2026-08-02 12:55:40 +08:00
jacy 4d76ee6d0e merge(dev): WeChat login restore, proxy pay, staging SSL verify
CI / verify (push) Has been cancelled
Details
2026-08-02 12:53:53 +08:00
jacy bdc9dbde8d fix(h5-partner): make WeChat login click feedback and OAuth start reliably 2026-08-02 12:42:55 +08:00
jacy 3fc2f23e10 feat(h5-auth): restore partner and shop WeChat login 
Re-enable one-tap WeChat login, post-SMS OAuth bind, and quick login gates so partner/shop openId flows work again on staging.
 2026-08-02 11:59:23 +08:00
jacy 09e732bfa3 微信JSSDK对接，代下单支付 2026-08-02 11:49:35 +08:00
jacy 50ba6e9c56 概览页增加表格统计 2026-08-02 11:16:51 +08:00
jacy 6a23e79f4c chore(deploy): add same-host staging stack next to production 
dev deploys to /opt/dukang-staging (819x, *-test domains); main deploys to production. Staging uses full Mock with shared WeChat app ids.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-31 11:37:18 +08:00
jacy 2dbe665bdc Merge pull request '合并到main 创建8.1最后一波修改，后面测试和正式就会分离' (#11) from dev into main
CI / verify (push) Has been cancelled
Details 
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/11
 2026-07-31 11:27:55 +08:00
jacy 8d6c0f9ac0 feat(ops): partner proxy order list and HQ order delete
CI / verify (pull_request) Has been cancelled
Details 
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