Commit Graph

415 Commits

Author SHA1 Message Date
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
jacy acc5b78471 fix(api): type WeChat-only user create for nest build
CI / verify (pull_request) Has been cancelled
EOF

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-15 20:12:18 +08:00
jacy d70f2d8f62 Merge pull request 'Dev jacy' (#8) from dev_jacy into dev
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/8
2026-07-15 20:04:10 +08:00
jacy 5fe1ff1fc3 mock短信页面回显
CI / verify (pull_request) Has been cancelled
2026-07-15 20:03:06 +08:00
jacy 0f5f0f4c2b 用户端不要强制用户输入手机号 2026-07-15 19:57:06 +08:00
jacy f15d2057f2 登录页的登录按钮看不见 2026-07-15 19:51:57 +08:00
jacy 68aa7d3ce2 用户协议默认不勾选 2026-07-15 19:50:09 +08:00
jacy f6c77e60b6 merge(dev_jacy): fix mini-user H5 useDidShow blank tab crash 2026-07-15 19:34:00 +08:00
jacy 5a2e8dfcf8 fix(mini-user): dedupe Taro reactMeta so H5 useDidShow works
CI / verify (pull_request) Has been cancelled
Vite was bundling plugin-framework-react runtime twice, so tab pages crashed with useContext is not a function on enter/switch.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-15 19:33:51 +08:00
jacy 2d5ecd1263 merge(dev_jacy): blank-page deploy fix + recent features 2026-07-15 18:57:57 +08:00
jacy 7062aeb8f8 fix(deploy): prevent mini-user H5 blank page under /user basename
CI / verify (pull_request) Has been cancelled
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-15 18:57:33 +08:00
jacy 82435634d7 Merge pull request 'Dev jacy 37' (#7) from dev_jacy into dev
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/7
2026-07-15 18:28:08 +08:00
jacy e7d39f7390 门店端子账号管理界面调整
CI / verify (pull_request) Has been cancelled
2026-07-15 18:01:19 +08:00
jacy d6ac4b5e1c 用户端mini-user界面优化 2026-07-15 17:33:46 +08:00
jacy 740bb19489 Merge pull request 'Dev jacy # 36' (#6) from dev_jacy into dev
Reviewed-on: https://git.yqidian.com/jacy/dukang/pulls/6
2026-07-14 20:13:23 +08:00
jacy 1ad49f1acf h5微信授权
CI / verify (pull_request) Has been cancelled
2026-07-14 20:09:36 +08:00
jacy 9b13d02dde 微信分享功能 2026-07-14 17:48:07 +08:00
jacy 5222ec82b0 调整商品详情页面的分享按钮位置 2026-07-14 17:35:16 +08:00
jacy 9403d22544 修改user端的项目文件到mini-user
CI / verify (pull_request) Has been cancelled
2026-07-14 15:52:27 +08:00
jacy e0f5977dd9 门店审核功能 2026-07-14 15:25:17 +08:00
jacy d61a43cc8c webadmin增加财务模块 2026-07-14 15:16:41 +08:00
jacy 450dc44d0e 微信小程序支付功能打通 2026-07-13 00:07:17 +08:00
jacy f2cdc0222d 小程序二维码功能 2026-07-12 23:59:52 +08:00
jacy 1bd152073a webadmin系统设置 2026-07-12 22:52:40 +08:00
jacy 236a2a87a5 合伙人端验证是否已经绑定手机号,否则不支持微信一键登录 2026-07-12 21:18:10 +08:00
jacy b5235dedef 后端增加发放好客权益券的接口 2026-07-12 20:28:43 +08:00
jacy b267e885be 用户端小程序修改 2026-07-12 20:24:03 +08:00
jacy e2dfb08de3 小程序修改 2026-07-12 19:44:36 +08:00
jacy 3b4833b51a 开合伙人子账号要验证手机号 2026-07-12 17:53:54 +08:00
jacy 908a5dcf0f 开店需要验证手机号 2026-07-12 17:51:20 +08:00
jacy b550ee2255 OSS日志模块删掉 2026-07-12 17:46:39 +08:00
jacy d8c1ac6a9e 选图成功上传bug修复 2026-07-12 17:39:46 +08:00
jacy b7db202632 解决合伙人端上传图片循环调用接口的问题 2026-07-12 17:29:50 +08:00