jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 9 Packages Projects Releases Wiki Activity

Dev #9

Merged
jacy merged 245 commits from dev into main 2026-07-17 10:50:17 +08:00
Conversation 0 Commits 245 Files Changed 686
+91694 -3060

245 Commits

Author SHA1 Message Date
jacy 76270b20bf Merge branches 'dev_jacy' and 'dev' of git.yqidian.com:jacy/dukang into dev
CI / verify (pull_request) Has been cancelled
Details
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
Details 
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
Details 
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
Details 
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
Details 
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
Details 
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
Details 
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
Details
2026-07-17 09:06:53 +08:00
jacy e9537ce052 后端仓库配送逻辑完善
CI / verify (pull_request) Has been cancelled
Details
2026-07-17 08:57:19 +08:00
jacy c204fb0a92 仓库自动配送开关
CI / verify (pull_request) Has been cancelled
Details
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
Details
2026-07-17 08:34:37 +08:00
jacy 57172d54d5 合伙人页面功
CI / verify (pull_request) Has been cancelled
Details
2026-07-17 08:20:31 +08:00
jacy 608e405468 城市合伙人去掉订单补发功能，酒的订单如果没有配置仓库应该是看不到的
CI / verify (pull_request) Has been cancelled
Details
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
Details
2026-07-17 07:45:20 +08:00
jacy bde85a7b82 仓库管理配置 小飞侠配置
CI / verify (pull_request) Has been cancelled
Details
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
Details 
同城有仓按仓库绑定承运商自动推单或自管填单，无仓/跨城走总部快递；新增仓配注册表、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
Details
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
Details
2026-07-16 11:38:44 +08:00
jacy 4de570f5f4 合伙人端的子账号管理页面优化
CI / verify (pull_request) Has been cancelled
Details
2026-07-16 11:24:48 +08:00
jacy 22845e5d5f 门店端增加绑定微信按钮
CI / verify (pull_request) Has been cancelled
Details
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
Details 
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
Details 
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
Details 
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
Details 
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
Details 
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
Details 
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
Details 
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
Details 
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
Details 
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
Details
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
Details 
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
Details 
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
Details
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
Details
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
Details
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
jacy d3ef07bf65 短信验证码 2026-07-12 17:20:41 +08:00
jacy 076455944e fix(partner): 修正微信选图 JSSDK 签名 URL 含 query 参数 
录店页 ?step= 变化时重新 wx.config，微信内上传仅走 chooseImage 接口。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-12 16:24:42 +08:00
jacy 656e906254 微信sdk更新，修正上传门头照照片错误 2026-07-12 16:10:11 +08:00
jacy e8823a0640 oss bucket 目前只用dukang-dev 2026-07-12 15:57:52 +08:00
jacy 2c04676555 修复合伙人端上传门头照片失败的问题 2026-07-12 15:55:49 +08:00
jacy 9fc955d81f webadmin增加oss日志 2026-07-12 15:44:17 +08:00
jacy 758760eb36 微信小程序登录页面调整 2026-07-12 15:30:58 +08:00
jacy bfac6c6663 登录页面 2026-07-12 15:17:54 +08:00
jacy becf91da52 微信小程序上传 2026-07-12 14:45:57 +08:00
jacy d271ac5b13 webadmin端增加版本号和部署功能 2026-07-12 13:52:22 +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 b8623f59f0 上传ignore 2026-07-12 13:19:12 +08:00
jacy 54a15d6da7 门店账户多账号 2026-07-12 12:24:34 +08:00
jacy 06b1cb22e0 弱网核销功能 2026-07-12 12:00:55 +08:00
jacy de01d36cdb 代下单功能 2026-07-12 11:40:04 +08:00
jacy d949301bc1 手机号核销确认 2026-07-12 10:34:58 +08:00
jacy 7f031cc4c2 城市合伙人端的修改（后台） 2026-07-12 10:19:39 +08:00
jacy d0f0fa09af 自动修改 2026-07-12 07:50:27 +08:00
jacy b74e4e4fe5 PRD对照 2026-07-12 07:29:14 +08:00
jacy 69d27c80be v3.0版本skills和agent 2026-07-11 11:59:57 +08:00
jacy 420f1b66c3 修正文档需求 2026-07-11 11:48:45 +08:00
jacy 1761f7b3bf 城市合伙人端开店城市屁默认郑州 2026-07-10 13:14:46 +08:00
jacy 363717e441 Merge branch 'dev_jacy' into dev (deploy webhook fixes) 2026-07-10 12:45:05 +08:00
jacy ffd9180315 fix(deploy): improve webhook auto-release reliability and deploy.sh defaults 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-10 12:44:49 +08:00
jacy 6088c139d3 Merge #23 into dev from dev_jacy 
fix(h5-partner): resolve merge conflicts for auth and sub-accounts

* dev_jacy: (5 commits)
  webadmin增加显示子账号显示列表
  主账号和子账号同一设备登录遇到storge问题
  子账号登录微信授权
  用户端“补发货”的bug修复
  fix(h5-partner): resolve merge conflicts for auth and sub-accounts

Signed-off-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/23
 2026-07-10 11:28:53 +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 7988a10241 用户端“补发货”的bug修复 2026-07-10 11:10:04 +08:00
jacy 9c5cb69730 子账号登录微信授权 2026-07-10 11:03:11 +08:00
jacy f4f4f1b4aa 主账号和子账号同一设备登录遇到storge问题 2026-07-10 10:54:04 +08:00
jacy 2368121972 webadmin增加显示子账号显示列表 
修复api服务端报错
 2026-07-10 10:36:01 +08:00
ljy 41e66774ef Merge branch 'dev_new_ljy' into dev 2026-07-10 01:54:39 +08:00
ljy d66fd9099f fix:登录跳转失败问题 2026-07-10 01:54:23 +08:00
ljy 58d58f35c4 fix;提交 2026-07-10 01:06:19 +08:00
ljy 47129a9340 Merge branch 'dev_new_ljy' into dev 2026-07-10 00:47:08 +08:00
ljy e770c98de7 fix:创建子账号不发短信 2026-07-10 00:46:55 +08:00
ljy 9b4e37e513 Merge remote-tracking branch 'origin/dev_new_ljy' into dev 2026-07-10 00:22:48 +08:00
ljy 301839e2dc fix:提交子账号 2026-07-10 00:22:25 +08:00
ljy fec7f10f24 Merge branch 'dev_new_ljy' into dev 2026-07-09 23:53:20 +08:00
ljy b32e2a06eb fix;提交代码子账号 2026-07-09 23:52:00 +08:00
jacy d74e5b04ed Merge #22 into dev from dev_jacy 
Merge commit &#39;336116fbf21cbb33ddbaf00685f93b18ea84d5d6&#39; into dev_jacy

* dev_jacy: (8 commits)
  微信分享
  合伙人端开店选照片
  首页定位问题
  确定订单页修改
  右上角位置信息仅展示不做交互
  临时闭店UI修改
  门店端微信号自动登录
  Merge commit &#39;336116fbf21cbb33ddbaf00685f93b18ea84d5d6&#39; into dev_jacy

Signed-off-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/22
 2026-07-09 22:09:22 +08:00
jacy b1d5b3214f Merge commit '336116fbf21cbb33ddbaf00685f93b18ea84d5d6' into dev_jacy 2026-07-09 22:08:02 +08:00
jacy 12ba19ede4 门店端微信号自动登录 2026-07-09 22:07:35 +08:00
jacy e20ee1ec7f 临时闭店UI修改 2026-07-09 22:03:43 +08:00
jacy f76eb81274 右上角位置信息仅展示不做交互 2026-07-09 21:57:40 +08:00
jacy 4b3452eca0 确定订单页修改 2026-07-09 21:52:17 +08:00
ljy 336116fbf2 fix;合并修复问题 2026-07-09 21:42:36 +08:00
jacy 5e96008ac4 首页定位问题 2026-07-09 21:12:28 +08:00
jacy b506417f5e 合伙人端开店选照片 2026-07-09 17:26:24 +08:00
jacy 3f60c37265 微信分享 2026-07-09 17:14:00 +08:00
jacy 3d3588babb fix(weixin-sdk): fix iOS scanQRCode false camera permission error 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-09 16:49:01 +08:00
jacy d8c240c839 Merge commit 'ab9654564e2457db6d0c0972b1818b7b2061ac86' into dev_jacy 2026-07-09 15:40:39 +08:00
ljy ab9654564e fix:提交修复6个问题 2026-07-08 23:01:18 +08:00
jacy 99be8e0237 merge dev_jacy: fix with-api-env.cjs CommonJS 2026-07-07 23:35:03 +08:00
jacy d5865aeb5e fix(api): use CommonJS in with-api-env.cjs for Prisma deploy 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-07 23:34:55 +08:00
jacy dec839f79e merge(dev_jacy): server uses .env.production only 2026-07-07 23:33:44 +08:00
jacy 6dc051f26d chore(api): use .env.production on server, .env for local dev only 
Load production env without .env override; sync-api-env targets .env.production; PM2 NODE_ENV=production; Prisma uses with-api-env.cjs on deploy.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-07 23:33:34 +08:00
jacy c6af8480a4 runxian -dukang ssl证书配置 2026-07-07 22:53:18 +08:00
jacy 8598704a49 改回 user.runxian.top 2026-07-07 22:45:49 +08:00
jacy baf5fd00b4 merge(dev_jacy): add m.runxian.top deploy script 2026-07-07 22:34:07 +08:00
jacy 7f439c5bea chore(deploy): add remote script for m.runxian.top rollout 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-07 22:34:03 +08:00
jacy d46ae9eed4 merge(dev_jacy): unify H5 under m.runxian.top for WeChat OAuth 2026-07-07 22:08:24 +08:00
jacy eb961c3a74 feat(h5): unify WeChat OAuth under m.runxian.top path routing 
Serve user/shop/partner H5 under /user/, /shop/, /partner/ on a single authorized domain; update nginx, SSL script, and router base paths.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-07 22:07:47 +08:00
jacy e32ccebc80 本地环境不验证手机号和微信登录授权 2026-07-07 21:42:56 +08:00
jacy ec748335bf 环境变量修改 2026-07-07 20:51:44 +08:00
jacy c8dfa50f24 隐藏ID的显示 2026-07-07 20:51:35 +08:00
jacy c9202099cf Merge #20 into dev from dev_jacy 
管理后台左侧列表调整

* dev_jacy: (3 commits)
  webadmin去掉新建门店的短信验证
  web端增加微信绑定管理
  管理后台左侧列表调整

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/20
 2026-07-07 18:50:52 +08:00
jacy 1ac72e9a69 管理后台左侧列表调整 2026-07-07 18:49:47 +08:00
jacy 98e9652865 web端增加微信绑定管理 2026-07-07 18:25:15 +08:00
jacy 887d728496 webadmin去掉新建门店的短信验证 2026-07-07 18:17:45 +08:00
jacy d31782c73a Merge #19 into dev from dev_jacy 
商铺端核销，调用相机报无效签名修复

* dev_jacy: (3 commits)
  微信登录日志
  后端webadmin调整显示布局
  商铺端核销，调用相机报无效签名修复

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/19
 2026-07-07 18:01:12 +08:00
jacy 67eed11276 商铺端核销，调用相机报无效签名修复 2026-07-07 17:55:12 +08:00
jacy 5fef6ae2b1 后端webadmin调整显示布局 2026-07-07 17:43:01 +08:00
jacy 7e3c0011bb 微信登录日志 2026-07-07 17:17:03 +08:00
jacy 47686d3067 Merge #18 into dev from dev_jacy 
合伙人端登录接口优化

* dev_jacy: (11 commits)
  feat;提交管理端和城市合伙人端
  fix:修改样式
  fix:完善门店和总部管理端
  配置服务器
  核销成功提示
  webadmin端增加商铺日志
  Merge commit &#39;fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c&#39; into dev_jacy
  api端报错修正
  合伙人端登录验证调整还有日志落地
  合伙人端登录页面调整
  合伙人端登录接口优化

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/18
 2026-07-07 15:26:19 +08:00
jacy 2c74f6a08c 合伙人端登录接口优化 2026-07-07 15:22:55 +08:00
jacy 7dd8a6662b 合伙人端登录页面调整 2026-07-07 14:48:49 +08:00
jacy 2e61caa49c 合伙人端登录验证调整还有日志落地 2026-07-07 14:34:02 +08:00
jacy af989c9d33 api端报错修正 2026-07-07 14:03:07 +08:00
jacy d9e72ab227 Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' into dev_jacy 2026-07-07 13:55:10 +08:00
jacy 6572799264 webadmin端增加商铺日志 2026-07-07 12:12:12 +08:00
jacy e25b208545 核销成功提示 2026-07-07 11:46:12 +08:00
jacy 1dcc9aa1f4 配置服务器 2026-07-07 11:43:03 +08:00
jacy fb431a92d4 Merge #17 into dev from dev_jacy 
fix(h5-shop): remove redeem debug UI and enforce WeChat scan flow

* dev_jacy: (5 commits)
  门店核销功能测试
  门店账号管理修改
  后端显示门店账单
  门店页面修改
  fix(h5-shop): remove redeem debug UI and enforce WeChat scan flow

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/17
 2026-07-07 10:52:06 +08:00
jacy 98022b936f fix(h5-shop): remove redeem debug UI and enforce WeChat scan flow 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-07 00:19:11 +08:00
jacy 5d19089f91 门店页面修改 2026-07-07 00:18:29 +08:00
jacy 1fcafac2a7 后端显示门店账单 2026-07-07 00:04:07 +08:00
jacy 7ca9fc8a35 门店账号管理修改 2026-07-07 00:01:16 +08:00
jacy e85c4b9bcb 门店核销功能测试 2026-07-06 23:40:12 +08:00
jacy 2ac10adcff Merge #16 into dev from dev_jacy 
超管用户登录；

* dev_jacy: (4 commits)
  小飞侠的日志
  核销代码
  核销功能
  超管用户登录；

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/16
 2026-07-06 22:35:16 +08:00
jacy a66207ffa9 超管用户登录； 
代码核销功能
 2026-07-06 22:33:30 +08:00
jacy d708a10095 核销功能 2026-07-06 22:22:21 +08:00
jacy 386ee9e754 核销代码 2026-07-06 22:10:45 +08:00
jacy 047cf879f8 小飞侠的日志 2026-07-06 21:36:20 +08:00
jacy b2a3b56f46 Merge #15 into dev from dev_jacy 
三房日志详情补充

* dev_jacy: (1 commits)
  三房日志详情补充

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/15
 2026-07-06 21:12:43 +08:00
jacy d5fdf626fe 三房日志详情补充 2026-07-06 21:11:23 +08:00
ljy fcf1d45522 fix:完善门店和总部管理端 2026-07-06 20:58:38 +08:00
jacy 96a137ccb2 Merge #14 into dev from dev_jacy 
微信授权逻辑修改

* dev_jacy: (1 commits)
  微信授权逻辑修改

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/14
 2026-07-06 20:57:40 +08:00
jacy 9d221cfcd2 微信授权逻辑修改 2026-07-06 20:56:25 +08:00
jacy 257a42c00a Merge #13 into dev from dev_jacy 
部署文件上传，修改环境变量为development

* dev_jacy: (1 commits)
  部署文件上传，修改环境变量为development

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/13
 2026-07-06 20:16:59 +08:00
jacy b12ee13232 部署文件上传，修改环境变量为development 2026-07-06 20:15:41 +08:00
jacy 3fdd41ca85 Merge #12 into dev from dev_jacy 
webadmin界面调整

* dev_jacy: (2 commits)
  增加核销接口
  webadmin界面调整

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/12
 2026-07-06 19:36:35 +08:00
jacy 04b0559fb8 webadmin界面调整 2026-07-06 19:35:15 +08:00
jacy 4c38a9dd2b 增加核销接口 
增加hq管理端日志
 2026-07-06 19:17:27 +08:00
jacy c7cbc770c6 Merge #11 into dev from dev_jacy 
webadmin端优化

* dev_jacy: (3 commits)
  fix(deploy): harden webhook auto-release for CRLF, git reset, and prisma order
  小飞侠接口调通测试
  webadmin端

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/11
 2026-07-06 18:05:33 +08:00
jacy f0b99ea9da webadmin端 
批量删除用户
模板上传图片数量限制改成30
小飞侠接口配置
 2026-07-06 18:04:02 +08:00
jacy 4e18763968 小飞侠接口调通测试 2026-07-06 17:07:35 +08:00
jacy 3625f037d0 fix(deploy): harden webhook auto-release for CRLF, git reset, and prisma order 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-06 17:01:05 +08:00
jacy 353e5d18f8 Merge #10 into dev from dev_jacy 测试webhook 
配置 webhook secret

* dev_jacy: (1 commits)
  配置 webhook secret

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/10
 2026-07-06 16:42:37 +08:00
jacy 5583442ee7 配置 webhook secret 2026-07-06 16:38:51 +08:00
jacy 56952920ba Merge #9 into dev from dev_jacy 
商品删除功能（需要二次确认）

* dev_jacy: (1 commits)
  商品删除功能（需要二次确认）

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/9
 2026-07-06 16:36:14 +08:00
jacy da80b28ba4 商品删除功能（需要二次确认） 2026-07-06 16:34:54 +08:00
jacy 61043c8a69 Merge #8 into dev from dev_jacy 
建立推送机制 webhook

* dev_jacy: (1 commits)
  建立推送机制 webhook

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/8
 2026-07-06 16:26:41 +08:00
jacy 8fc142b7c8 建立推送机制 webhook 2026-07-06 16:25:18 +08:00
jacy ed1217ccdb Merge #7 into dev from dev_jacy 
商品模板功能上传

* dev_jacy: (1 commits)
  商品模板功能上传

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/7
 2026-07-06 15:33:36 +08:00
jacy f46904b47c 商品模板功能上传 2026-07-06 15:29:27 +08:00
jacy 0a109a0e0e Merge #6 into dev from dev_jacy 
小飞侠、短信验证还有位置服务等

* dev_jacy: (4 commits)
  短信验证调试成功
  短信验证绑定日志内容
  定位获取城市功能，需要微信地图的key？
  小飞侠接口

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/6
 2026-07-06 14:16:10 +08:00
jacy 80d967f2cf 小飞侠接口 2026-07-06 14:12:06 +08:00
jacy c87d79109a 定位获取城市功能，需要微信地图的key？ 2026-07-06 14:02:07 +08:00
jacy 67af6d7d53 短信验证绑定日志内容 2026-07-06 13:26:31 +08:00
jacy 1c978b8adc 短信验证调试成功 2026-07-06 13:18:56 +08:00
jacy 77186f75f5 Merge #5 into dev from dev_jacy 
发布商品，商品图片使用oss服务器地址

* dev_jacy: (4 commits)
  小飞侠接口对接
  v3计划内容上传
  Merge commit &#39;ed1845c0ba98c2e1d6d80d5bf4eec2b46cdf0952&#39; into dev_jacy(xiaofeixia )
  发布商品，商品图片使用oss服务器地址

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/5
 2026-07-06 08:57:46 +08:00
jacy 5ba69eb935 发布商品，商品图片使用oss服务器地址 2026-07-06 08:53:03 +08:00
ljy 67b5a580c5 fix:修改样式 2026-07-05 23:52:58 +08:00
ljy 569becedaa feat;提交管理端和城市合伙人端 2026-07-05 23:48:20 +08:00
jacy a0466f023e Merge commit 'ed1845c0ba98c2e1d6d80d5bf4eec2b46cdf0952' into dev_jacy(xiaofeixia ) 2026-07-04 20:49:51 +08:00
jacy 743d242d52 v3计划内容上传 2026-07-04 20:36:26 +08:00
jacy fecfc61ec5 Merge dev_jacy: fix WeChat pay invoke 2026-07-03 16:04:09 +08:00
jacy def3ed5175 fix(user): correct WeChat JSAPI pay invoke params and JSSDK init 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 16:04:01 +08:00
jacy ced1fe0688 Merge dev_jacy: partner WeChat auth for upload 2026-07-03 15:45:31 +08:00
jacy cabc9e6ebb feat(partner): require WeChat OAuth before store photo upload 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 15:44:46 +08:00
jacy f87325df21 Merge dev_jacy: WeChat store upload fix 2026-07-03 15:33:08 +08:00
jacy 81413e4d08 fix(partner): resolve WeChat image picker auth denied on store create 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-07-03 15:32:53 +08:00
jacy 30eb8ff8a6 提交express 2026-07-03 15:07:27 +08:00
jacy 0829696ea9 Merge #3 into dev from dev_jacy 
门店开通流程

* dev_jacy: (5 commits)
  上传部署环境文件
  上传校验文件
  微信验证接通
  微信校验后登录服务器错误bug
  门店开通流程

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/3
 2026-07-03 14:56:07 +08:00
jacy f2175b83f7 门店开通流程 2026-07-03 14:53:21 +08:00
jacy c7dc6a2274 微信校验后登录服务器错误bug 2026-07-03 13:22:41 +08:00
jacy cc39975117 微信验证接通 2026-07-03 12:57:01 +08:00
jacy 160fdcb0d7 上传校验文件 2026-07-03 09:58:40 +08:00
jacy ceaf45ef03 上传部署环境文件 2026-07-03 00:58:56 +08:00
jacy 02681bcc4a Merge #1 into dev from dev_jacy 
支付时检测是否已经微信授权

* dev_jacy: (15 commits)
  v3数据表更改
  fix:更新skill和rules
  fix:需求完善
  agents 和 skills 上传
  fix:提交修改信息
  Merge commit &#39;a0ee3a21cd01229a555384ad5e1f4b3ccdcdd620&#39; into dev_jacy
  微信SDK接通
  oss1
  web端打通oss资源上传
  admin web 修改订单状态
  手机号从地址栏里获取
  对接微信支付
  oss接通了80端口，还没有接通https，先用
  微信支付
  支付时检测是否已经微信授权

Signed-off-by: jacy <moonjie444@163.com>
Reviewed-by: jacy <moonjie444@163.com>
Merged-by: jacy <moonjie444@163.com>

CR-link: https://codeup.aliyun.com/6a41ee78a7a8d2b1c6bfb02f/dukanghaoke/change/1
 2026-07-02 17:56:36 +08:00
jacy f7fe4597c6 支付时检测是否已经微信授权 2026-07-02 17:34:58 +08:00
jacy a0f4d8c18f 微信支付 2026-07-02 17:23:13 +08:00
jacy 4b2589156c oss接通了80端口，还没有接通https，先用 2026-07-02 16:13:45 +08:00
jacy ff4622ff6c 对接微信支付 2026-07-01 22:41:49 +08:00
jacy b78ef8798c 手机号从地址栏里获取 2026-07-01 22:13:25 +08:00
jacy 8a67d72de4 admin web 修改订单状态 2026-07-01 22:00:10 +08:00
jacy 139e37651b web端打通oss资源上传 2026-07-01 21:46:36 +08:00
jacy ef6cc18fb2 oss1 2026-07-01 20:21:51 +08:00
jacy aea1513836 微信SDK接通 2026-07-01 19:56:44 +08:00
jacy a1cbfc7241 Merge commit 'a0ee3a21cd01229a555384ad5e1f4b3ccdcdd620' into dev_jacy 2026-07-01 19:38:05 +08:00
ljy a0ee3a21cd fix:提交修改信息 2026-07-01 17:58:01 +08:00
jacy 9cbd65f8d7 agents 和 skills 上传 2026-07-01 17:12:46 +08:00
ljy d6855c9f5c fix:需求完善 2026-07-01 16:24:18 +08:00
ljy f3ae9e6520 fix:更新skill和rules 2026-07-01 15:04:53 +08:00
jacy aeb4ecfc84 v3数据表更改 2026-07-01 14:36:50 +08:00
jacy 638898b71e 改动测试 2026-07-01 10:31:52 +08:00
jacy 6fa8ecc714 Merge branch 'hq_web' into dev_jacy 2026-07-01 08:29:00 +08:00
jacy 25f0d8e97b hqweb端 2026-07-01 08:27:26 +08:00
jacy 9f4577d3d8 用户静默注册 2026-07-01 02:48:59 +08:00
jacy d3dd3a0ad1 用户端和服务端增加地址功能（三个地址共存） 2026-07-01 00:52:44 +08:00
jacy eb85e0926f 删除用户头像吓的badge 2026-07-01 00:33:01 +08:00
jacy 1800e792b1 订单详情页内容调整（增加配送方式、订单号等） 2026-07-01 00:29:39 +08:00
jacy c43defca3f 用户端调整 
2.首页商品详情增加点击区域
3.浓香型 酱香型 点击增加提示：暂未开放
5.首页餐券2字更换为“好客权益”
6.门店页面地址筛选功能 （三级菜单，省市区）
7.好客权益：去使用点击交互调整为核销页面，单张好客权益点击核销页面带参数和金额
7.核销金额限制为可用余额最大数，不是500
9.收货地址电话号码增加校验，长度限制，地址或者未填提示，地区调整为省市区三级菜单
10.微信授权位置调整在手机验证码下侧
 2026-07-01 00:19:08 +08:00
jacy ed1845c0ba 小飞侠接口对接 2026-06-30 23:44:31 +08:00