Dev jacy #5

Closed

jacy wants to merge 0 commits from dev_jacy into main

pull from: dev_jacy

merge into: jacy:main

jacy:main

jacy:dev

jacy:dev_ljy

Conversation 1 Commits - Files Changed -

+26271 -4719

jacy commented 2026-07-14 15:55:37 +08:00

Owner

Copy Link

Copy Source

No description provided.

jacy added 179 commits 2026-07-14 15:55:37 +08:00

小飞侠接口对接 ed1845c0ba

用户端调整 ... c43defca3f

2.首页商品详情增加点击区域
3.浓香型 酱香型 点击增加提示：暂未开放
5.首页餐券2字更换为“好客权益”
6.门店页面地址筛选功能 （三级菜单，省市区）
7.好客权益：去使用点击交互调整为核销页面，单张好客权益点击核销页面带参数和金额
7.核销金额限制为可用余额最大数，不是500
9.收货地址电话号码增加校验，长度限制，地址或者未填提示，地区调整为省市区三级菜单
10.微信授权位置调整在手机验证码下侧

订单详情页内容调整（增加配送方式、订单号等） 1800e792b1

删除用户头像吓的badge eb85e0926f

用户端和服务端增加地址功能（三个地址共存） d3dd3a0ad1

用户静默注册 9f4577d3d8

hqweb端 25f0d8e97b

Merge branch 'hq_web' into dev_jacy 6fa8ecc714

改动测试 638898b71e

v3数据表更改 aeb4ecfc84

fix:更新skill和rules f3ae9e6520

fix:需求完善 d6855c9f5c

agents 和 skills 上传 9cbd65f8d7

fix:提交修改信息 a0ee3a21cd

Merge commit 'a0ee3a21cd01229a555384ad5e1f4b3ccdcdd620' into dev_jacy a1cbfc7241

微信SDK接通 aea1513836

oss1 ef6cc18fb2

web端打通oss资源上传 139e37651b

admin web 修改订单状态 8a67d72de4

手机号从地址栏里获取 b78ef8798c

对接微信支付 ff4622ff6c

oss接通了80端口，还没有接通https，先用 4b2589156c

微信支付 a0f4d8c18f

支付时检测是否已经微信授权 f7fe4597c6

Merge #1 into dev from dev_jacy ... 02681bcc4a

支付时检测是否已经微信授权

* dev_jacy: (15 commits)
  v3数据表更改
  fix:更新skill和rules
  fix:需求完善
  agents 和 skills 上传
  fix:提交修改信息
  Merge commit 'a0ee3a21cd01229a555384ad5e1f4b3ccdcdd620' 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

上传部署环境文件 ceaf45ef03

上传校验文件 160fdcb0d7

微信验证接通 cc39975117

微信校验后登录服务器错误bug c7dc6a2274

门店开通流程 f2175b83f7

Merge #3 into dev from dev_jacy ... 0829696ea9

门店开通流程

* 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

提交express 30eb8ff8a6

fix(partner): resolve WeChat image picker auth denied on store create ... 81413e4d08

Co-authored-by: Cursor <cursoragent@cursor.com>

Merge dev_jacy: WeChat store upload fix f87325df21

feat(partner): require WeChat OAuth before store photo upload ... cabc9e6ebb

Co-authored-by: Cursor <cursoragent@cursor.com>

Merge dev_jacy: partner WeChat auth for upload ced1fe0688

fix(user): correct WeChat JSAPI pay invoke params and JSSDK init ... def3ed5175

Co-authored-by: Cursor <cursoragent@cursor.com>

Merge dev_jacy: fix WeChat pay invoke fecfc61ec5

v3计划内容上传 743d242d52

Merge commit 'ed1845c0ba98c2e1d6d80d5bf4eec2b46cdf0952' into dev_jacy(xiaofeixia ) a0466f023e

feat;提交管理端和城市合伙人端 569becedaa

fix:修改样式 67b5a580c5

发布商品，商品图片使用oss服务器地址 5ba69eb935

Merge #5 into dev from dev_jacy ... 77186f75f5

发布商品，商品图片使用oss服务器地址

* dev_jacy: (4 commits)
  小飞侠接口对接
  v3计划内容上传
  Merge commit 'ed1845c0ba98c2e1d6d80d5bf4eec2b46cdf0952' 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

短信验证调试成功 1c978b8adc

短信验证绑定日志内容 67af6d7d53

定位获取城市功能，需要微信地图的key？ c87d79109a

小飞侠接口 80d967f2cf

Merge #6 into dev from dev_jacy ... 0a109a0e0e

小飞侠、短信验证还有位置服务等

* 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

商品模板功能上传 f46904b47c

Merge #7 into dev from dev_jacy ... ed1217ccdb

商品模板功能上传

* 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

建立推送机制 webhook 8fc142b7c8

Merge #8 into dev from dev_jacy ... 61043c8a69

建立推送机制 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

商品删除功能（需要二次确认） da80b28ba4

Merge #9 into dev from dev_jacy ... 56952920ba

商品删除功能（需要二次确认）

* 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

配置 webhook secret 5583442ee7

Merge #10 into dev from dev_jacy 测试webhook ... 353e5d18f8

配置 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

fix(deploy): harden webhook auto-release for CRLF, git reset, and prisma order ... 3625f037d0

Co-authored-by: Cursor <cursoragent@cursor.com>

小飞侠接口调通测试 4e18763968

webadmin端 ... f0b99ea9da

批量删除用户
模板上传图片数量限制改成30
小飞侠接口配置

Merge #11 into dev from dev_jacy ... c7cbc770c6

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

增加核销接口 ... 4c38a9dd2b

增加hq管理端日志

webadmin界面调整 04b0559fb8

Merge #12 into dev from dev_jacy ... 3fdd41ca85

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

部署文件上传，修改环境变量为development b12ee13232

Merge #13 into dev from dev_jacy ... 257a42c00a

部署文件上传，修改环境变量为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

微信授权逻辑修改 9d221cfcd2

Merge #14 into dev from dev_jacy ... 96a137ccb2

微信授权逻辑修改

* 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

fix:完善门店和总部管理端 fcf1d45522

三房日志详情补充 d5fdf626fe

Merge #15 into dev from dev_jacy ... b2a3b56f46

三房日志详情补充

* 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

小飞侠的日志 047cf879f8

核销代码 386ee9e754

核销功能 d708a10095

超管用户登录； ... a66207ffa9

代码核销功能

Merge #16 into dev from dev_jacy ... 2ac10adcff

超管用户登录；

* 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

门店核销功能测试 e85c4b9bcb

门店账号管理修改 7ca9fc8a35

后端显示门店账单 1fcafac2a7

门店页面修改 5d19089f91

fix(h5-shop): remove redeem debug UI and enforce WeChat scan flow ... 98022b936f

Co-authored-by: Cursor <cursoragent@cursor.com>

Merge #17 into dev from dev_jacy ... fb431a92d4

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

配置服务器 1dcc9aa1f4

核销成功提示 e25b208545

webadmin端增加商铺日志 6572799264

Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' into dev_jacy d9e72ab227

api端报错修正 af989c9d33

合伙人端登录验证调整还有日志落地 2e61caa49c

合伙人端登录页面调整 7dd8a6662b

合伙人端登录接口优化 2c74f6a08c

Merge #18 into dev from dev_jacy ... 47686d3067

合伙人端登录接口优化

* dev_jacy: (11 commits)
  feat;提交管理端和城市合伙人端
  fix:修改样式
  fix:完善门店和总部管理端
  配置服务器
  核销成功提示
  webadmin端增加商铺日志
  Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' 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

微信登录日志 7e3c0011bb

后端webadmin调整显示布局 5fef6ae2b1

商铺端核销，调用相机报无效签名修复 67eed11276

Merge #19 into dev from dev_jacy ... d31782c73a

商铺端核销，调用相机报无效签名修复

* 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

webadmin去掉新建门店的短信验证 887d728496

web端增加微信绑定管理 98e9652865

管理后台左侧列表调整 1ac72e9a69

Merge #20 into dev from dev_jacy ... c9202099cf

管理后台左侧列表调整

* 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

隐藏ID的显示 c8dfa50f24

环境变量修改 ec748335bf

本地环境不验证手机号和微信登录授权 e32ccebc80

feat(h5): unify WeChat OAuth under m.runxian.top path routing ... eb961c3a74

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>

merge(dev_jacy): unify H5 under m.runxian.top for WeChat OAuth d46ae9eed4

chore(deploy): add remote script for m.runxian.top rollout ... 7f439c5bea

Co-authored-by: Cursor <cursoragent@cursor.com>

merge(dev_jacy): add m.runxian.top deploy script baf5fd00b4

改回 user.runxian.top 8598704a49

runxian -dukang ssl证书配置 c6af8480a4

chore(api): use .env.production on server, .env for local dev only ... 6dc051f26d

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>

merge(dev_jacy): server uses .env.production only dec839f79e

fix(api): use CommonJS in with-api-env.cjs for Prisma deploy ... d5865aeb5e

Co-authored-by: Cursor <cursoragent@cursor.com>

merge dev_jacy: fix with-api-env.cjs CommonJS 99be8e0237

fix:提交修复6个问题 ab9654564e

Merge commit 'ab9654564e2457db6d0c0972b1818b7b2061ac86' into dev_jacy d8c240c839

fix(weixin-sdk): fix iOS scanQRCode false camera permission error ... 3d3588babb

Co-authored-by: Cursor <cursoragent@cursor.com>

微信分享 3f60c37265

合伙人端开店选照片 b506417f5e

首页定位问题 5e96008ac4

fix;合并修复问题 336116fbf2

确定订单页修改 4b3452eca0

右上角位置信息仅展示不做交互 f76eb81274

临时闭店UI修改 e20ee1ec7f

门店端微信号自动登录 12ba19ede4

Merge commit '336116fbf21cbb33ddbaf00685f93b18ea84d5d6' into dev_jacy b1d5b3214f

Merge #22 into dev from dev_jacy ... d74e5b04ed

Merge commit '336116fbf21cbb33ddbaf00685f93b18ea84d5d6' into dev_jacy

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

fix;提交代码子账号 b32e2a06eb

Merge branch 'dev_new_ljy' into dev fec7f10f24

fix:提交子账号 301839e2dc

Merge remote-tracking branch 'origin/dev_new_ljy' into dev 9b4e37e513

fix:创建子账号不发短信 e770c98de7

Merge branch 'dev_new_ljy' into dev 47129a9340

fix;提交 58d58f35c4

fix:登录跳转失败问题 d66fd9099f

Merge branch 'dev_new_ljy' into dev 41e66774ef

webadmin增加显示子账号显示列表 ... 2368121972

修复api服务端报错

主账号和子账号同一设备登录遇到storge问题 f4f4f1b4aa

子账号登录微信授权 9c5cb69730

用户端“补发货”的bug修复 7988a10241

fix(h5-partner): resolve merge conflicts for auth and sub-accounts ... 47f540fbd9

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>

Merge #23 into dev from dev_jacy ... 6088c139d3

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

fix(deploy): improve webhook auto-release reliability and deploy.sh defaults ... ffd9180315

Co-authored-by: Cursor <cursoragent@cursor.com>

Merge branch 'dev_jacy' into dev (deploy webhook fixes) 363717e441

城市合伙人端开店城市屁默认郑州 1761f7b3bf

修正文档需求 420f1b66c3

v3.0版本skills和agent 69d27c80be

PRD对照 b74e4e4fe5

自动修改 d0f0fa09af

城市合伙人端的修改（后台） 7f031cc4c2

手机号核销确认 d949301bc1

代下单功能 de01d36cdb

弱网核销功能 06b1cb22e0

门店账户多账号 54a15d6da7

上传ignore b8623f59f0

feat(admin): HQ手机号编辑、合伙人子账号日志与子账号H5体验 ... 63af3321dd

支持 HQ 账户改手机号（格式校验）、合伙人日志包含子账号且子账号不显示主账号信息；改手机号时清除微信绑定。合伙人 H5 子账号页签与我的页、录入门店底部按钮及上传失败提示。

Co-authored-by: Cursor <cursoragent@cursor.com>

webadmin端增加版本号和部署功能 d271ac5b13

微信小程序上传 becf91da52

登录页面 bfac6c6663

微信小程序登录页面调整 758760eb36

webadmin增加oss日志 9fc955d81f

修复合伙人端上传门头照片失败的问题 2c04676555

oss bucket 目前只用dukang-dev e8823a0640

微信sdk更新，修正上传门头照照片错误 656e906254

fix(partner): 修正微信选图 JSSDK 签名 URL 含 query 参数 ... 076455944e

录店页 ?step= 变化时重新 wx.config，微信内上传仅走 chooseImage 接口。

Co-authored-by: Cursor <cursoragent@cursor.com>

短信验证码 d3ef07bf65

解决合伙人端上传图片循环调用接口的问题 b7db202632

选图成功上传bug修复 d8c1ac6a9e

OSS日志模块删掉 b550ee2255

开店需要验证手机号 908a5dcf0f

开合伙人子账号要验证手机号 3b4833b51a

小程序修改 e2dfb08de3

用户端小程序修改 b267e885be

后端增加发放好客权益券的接口 b5235dedef

合伙人端验证是否已经绑定手机号，否则不支持微信一键登录 236a2a87a5

webadmin系统设置 1bd152073a

小程序二维码功能 f2cdc0222d

微信小程序支付功能打通 450dc44d0e

webadmin增加财务模块 d61a43cc8c

门店审核功能 e0f5977dd9

修改user端的项目文件到mini-user 9403d22544

jacy added 3 commits 2026-07-14 20:09:57 +08:00

调整商品详情页面的分享按钮位置 5222ec82b0

微信分享功能 9b13d02dde

h5微信授权 1ad49f1acf

jacy added 2 commits 2026-07-15 18:05:47 +08:00

用户端mini-user界面优化 d6ac4b5e1c

门店端子账号管理界面调整 e7d39f7390

jacy added 1 commit 2026-07-15 18:57:56 +08:00

fix(deploy): prevent mini-user H5 blank page under /user basename ... 7062aeb8f8

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-15 19:34:15 +08:00

fix(mini-user): dedupe Taro reactMeta so H5 useDidShow works ... 5a2e8dfcf8

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>

jacy added 4 commits 2026-07-15 20:03:29 +08:00

用户协议默认不勾选 68aa7d3ce2

登录页的登录按钮看不见 f15d2057f2

用户端不要强制用户输入手机号 0f5f0f4c2b

mock短信页面回显 5fe1ff1fc3

jacy added 1 commit 2026-07-15 20:12:37 +08:00

fix(api): type WeChat-only user create for nest build ... acc5b78471

EOF

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-15 20:22:56 +08:00

fix(mini-user): use USER_MINI for WeChat SDK so OAuth token persists ... 372c29bc3a

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 2 commits 2026-07-15 20:37:59 +08:00

用户端mini-user 多了一层tab 52a809649c

fix(mini-user): address URL, form align, agreement checkbox, shop scan resume ... 966ddc9219

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-15 20:48:52 +08:00

fix(mini-user): address textarea freeze, input align, wechat share invoke ... 9a3ccabcc9

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-15 20:55:28 +08:00

fix(mini-user): H5 pay use USER_H5; center login phone input ... 02aecbeaab

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-15 21:11:09 +08:00

fix(mini-user): persist bind-phone session and stop login bounce ... 5c55d3c385

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.

jacy added 1 commit 2026-07-15 21:26:00 +08:00

fix(auth): transfer WeChat id on merge; stop false phone prompts ... d3d56150c5

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.

jacy added 1 commit 2026-07-15 21:37:02 +08:00

fix(mini-user): show real receiver fields on order detail ... 7b14f4a0cc

Order detail used non-existent addressSnapshot; API returns receiverName/phone/address. Render those and fix product qty from items/quantity.

jacy added 1 commit 2026-07-16 08:06:04 +08:00

fix(h5): hide in-page nav titles that duplicate WeChat chrome ... 5a26841d3a

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.

jacy added 2 commits 2026-07-16 08:30:27 +08:00

杜康发布 skills 8d7507e2d8

门店端增加绑定微信按钮 22845e5d5f

jacy added 1 commit 2026-07-16 11:30:38 +08:00

合伙人端的子账号管理页面优化 4de570f5f4

jacy added 1 commit 2026-07-16 11:39:05 +08:00

页面头部的白色留白去掉 fd5427c7ea

jacy added 1 commit 2026-07-16 15:11:38 +08:00

合伙人 H5 改造 f1dc23c54c

jacy added 1 commit 2026-07-16 17:51:50 +08:00

feat(trade): 仓配可调配履约与三分支推单 ... f6d97b4ee8

同城有仓按仓库绑定承运商自动推单或自管填单，无仓/跨城走总部快递；新增仓配注册表、FulfillmentService 及三端运单追踪。

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-16 21:40:51 +08:00

仓库管理配置 小飞侠配置 bde85a7b82

jacy added 1 commit 2026-07-17 07:45:44 +08:00

城市合伙人端页面优化 7fa2c6fbed

jacy added 2 commits 2026-07-17 08:05:16 +08:00

城市合伙人H5端结算审核 b36f2ea63a

城市合伙人去掉订单补发功能，酒的订单如果没有配置仓库应该是看不到的 608e405468

jacy added 1 commit 2026-07-17 08:20:53 +08:00

合伙人页面功 57172d54d5

jacy added 1 commit 2026-07-17 08:35:01 +08:00

miniuser服务器连接地址修改 ed44e88e93

jacy added 2 commits 2026-07-17 08:50:40 +08:00

webadmin端订单修改 c643b0b979

仓库自动配送开关 c204fb0a92

jacy added 1 commit 2026-07-17 08:57:42 +08:00

后端仓库配送逻辑完善 e9537ce052

jacy added 1 commit 2026-07-17 09:07:15 +08:00

用户端跨城订单界面优化 00b52b9aaa

jacy added 1 commit 2026-07-17 09:30:30 +08:00

fix(mini-user): restore production API origin for H5 builds ... 972bdde650

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>

jacy added 1 commit 2026-07-17 10:03:02 +08:00

feat(partner): let sub-accounts view team leaderboard ... 04253b9120

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>

jacy added 1 commit 2026-07-17 10:14:04 +08:00

fix(partner): skip unauthorized home APIs for sub-accounts ... 55e91158b3

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>

jacy added 1 commit 2026-07-17 10:20:54 +08:00

fix(auth): show user agreement before login actions ... 14b867a3a5

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>

jacy added 1 commit 2026-07-17 10:36:49 +08:00

feat(partner): let staff manage stores and fix env photo dupes ... de396442a4

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>

jacy added 1 commit 2026-07-17 10:43:37 +08:00

fix(partner): grant store staff open/close and media permissions by default ... c2914c37e5

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>

jacy referenced this issue from a commit 2026-07-17 10:50:17 +08:00

Merge #5 into dev from dev_jacy

jacy commented 2026-07-17 10:51:47 +08:00

Author

Owner

Copy Link

Copy Source

0717版本合并 包含v1，v2，v3除了工单和客服之外的所有内容

0717版本合并 包含v1，v2，v3除了工单和客服之外的所有内容

jacy added 2 commits 2026-07-20 21:38:27 +08:00

fix;提交、 792b543ba8

Merge commit '792b543ba88acda4186bd823461ef1bb76d12f5b' into dev_jacy 4a29d8297c

jacy added 1 commit 2026-07-20 21:42:11 +08:00

fix(api): add TICKET_COLLAB to EventType enum ... d1b207422c

Unblock nest build for after-sale ticket collaboration events.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 8 commits 2026-07-21 10:08:34 +08:00

迁移的一些脚本文件 cf73bbae23

迁移的一些脚本文件 47b39e3ba0

微信小程序端修改config服务器地址配置 ade68972a9

微信小程序支付遇到问题，因为没有 WX_MCH_PRIVATE_KEY bc0b0cafd6

页面顶部空白调整 e1f5130c18

我的页面中的头像 c5f526d51d

微信小程序端登录和头像调整 350a086a73

微信小程序审核不通过修改 935ab0d1d4

jacy added 1 commit 2026-07-21 10:11:04 +08:00

fix(deploy): correct APP_ROOT to /opt/dukang ... 6c6fb10490

Server path is /opt/dukang; stale /opt/dukang-haoke broke PM2 cwd for mini-user H5.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 2 commits 2026-07-21 10:31:35 +08:00

ignore b8adfe98a3

chore(deploy): stop tracking auto-release.env; feat(mini-user): avatar profile sheet ... 73dbf6effb

Remove secrets file from the index (keep local). Mine page can choose avatar and nickname via WeChat components.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-21 10:41:56 +08:00

feat(h5-auth): remember SMS sessions and simplify media access ... 83ed90ef67

Hide WeChat login for shop and partner users, keep verified sessions for seven days, and allow JSSDK camera or album access without an OpenID binding.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-21 10:52:03 +08:00

fix(h5): serve assets from dedicated domain roots ... c11c7647b9

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-21 11:19:24 +08:00

fix(h5): temporarily disable WeChat camera flows ... 36bec94639

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-21 11:41:41 +08:00

feat(redeem): streamline phone redemption confirmation ... eb96b36d0b

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-21 13:03:39 +08:00

fix(mini-user): address review blockers ... bdf80e577b

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 2 commits 2026-07-22 09:06:26 +08:00

fix:增加小程序客服 56dfffd126

Merge commit '56dfffd12647e1128ac4360aa9a4044361f0f7ab' into dev_jacy ba21cc89c6

jacy added 1 commit 2026-07-22 10:23:28 +08:00

fix(partner): move store-open phone verify to step 3 ... 270cebc79a

Confirm phone and SMS after bank details, then submit directly.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-22 11:20:20 +08:00

feat(h5): add pull-to-refresh on user partner and shop pages ... ae7c63c08d

Share PullToRefresh for partner/shop H5; enable Taro pull-down on mini-user lists.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 4 commits 2026-07-22 12:10:38 +08:00

合伙人端开店的流程里加入开店营业时间，放在开店流程的第一页。 7c9827875f

管理端门店详情（审核抽屉）加上「审核材料」区 6c299f1a1d

开门营业成功后提示「开店成功」 ... 823e439101

关闭门店改为自定义确认框，不再用 window.confirm，不会再带出页面域名

feat(store): add two-level store categories for admin and partner open-store ... 9a550cbaaf

Admin CRUD under stores menu; partner picks leaf category on create.
Default sync only inserts missing rows and never updates existing ones.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 3 commits 2026-07-22 15:12:55 +08:00

开店第三页银行卡号：只允许数字，最多 19 位；校验仍为 16–19 位。 ... 5e33dd9847

门店详情 / 开店页：去掉顶栏返回与标题空白，内容上顶，顶部约 12px，与「门店管理」一致。
开店第一页底部：在「下一步」左侧加了「返回」（回门店列表）；第 2、3 步仍是「上一步」。

用户端修改：付款按钮，显示单价，订单的图片 b0f565103f

小程序页面优化 b534a569f8

jacy added 1 commit 2026-07-22 17:26:27 +08:00

feat(settlement): redesign factory/partner/store statement bills ... b392c28787

Add WineryBill/StoreBill tables, partner review-send-confirm flow, daily/monthly cron, and admin multi-select confirm with status filters.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 2 commits 2026-07-22 18:04:13 +08:00

小程序页面优化（门店） addfcfb0b1

fix(admin): prevent false partner commission cap errors ... 85f2c156b0

Coerce city maxPartnerCommissionRate to Number so Decimal JSON strings do not break sum checks.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-22 18:15:26 +08:00

fix(admin): city-scoped district pick and clearer overlap errors ... 8c4419e04e

Region partners only select districts under the chosen city; overlap errors name the occupying partner.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 3 commits 2026-07-22 23:39:29 +08:00

城市合伙人县区不做限制 fb530e2ff5

核销金额：最低 0.01 元；输入最多两位小数；低于该值会 toast 提示，无法生成核销码。 ... f2303f7fb8

底部提示：左右留白 + 内边距，浅底圆角块，文案改为最低 0.01、余额上限、3 分钟到店出示。
新增地址：进入页会尝试定位，自动选中当前省市区（失败则保留默认郑州）；编辑地址不重定位。

feat(ops): show order redeem records including FIFO secondary coupons ... e0d3c840a2

Persist redeem allocations and surface them on HQ order detail with backfill for history.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 2 commits 2026-07-22 23:53:30 +08:00

开城合伙人页与城市详情内合伙人 Tab 已同步 aeb72154a7

feat(ops): show redeem records on benefit coupon detail ... cd206d6baa

Reuse the same coupon redeem trace as order detail (primary/secondary, allocations).

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-23 00:04:38 +08:00

小程序端核销权益券金额输入限制 ... 0418370c31

现场取货功能

jacy added 2 commits 2026-07-23 00:22:26 +08:00

feat(promo): generate WeChat mini-program codes on create ... bca1d8afea

Use getwxacodeunlimit with activity id as scene, upload PNG to OSS qrcode/, and show in HQ admin.

Co-authored-by: Cursor <cursoragent@cursor.com>

chore(admin): label promo QR as mini-program code ... 047ffd7b16

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-23 00:32:59 +08:00

小程序端核销权益输入框限制 cd6b82abd8

jacy added 2 commits 2026-07-23 01:18:37 +08:00

推广码后端页面优化 e93e4a7721

feat(trade): add on-site pickup order flow ... cebeefdb22

Product flag, ON_SITE_PICKUP delivery, mini confirm/receive pages; pay skips warehouse auto-advance.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-23 12:15:51 +08:00

feat(mini-user): add configurable home banner and footer ... 479de04f7c

HQ system settings WeChat mini config with OSS swiper/footer uploads; client-config exposes miniHome.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-23 13:54:42 +08:00

fix(admin): improve promo layout and system settings save UX ... d11757c854

Fix mini home media form persistence; float save with unsaved leave prompt; promo detail QR on the right.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-23 14:11:49 +08:00

小程序页面优化 6479365d6a

jacy added 1 commit 2026-07-23 14:39:44 +08:00

后端修改权限和折叠功能 75765bf9d4

jacy added 2 commits 2026-07-23 15:23:58 +08:00

工单和发票 ... 82c447b193

酒厂银行账户

小程序端界面修改 2a208d5dea

jacy added 1 commit 2026-07-26 07:14:40 +08:00

feat(admin): require store category on HQ store create ... ac1e0a9f13

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-26 07:32:31 +08:00

技术支持工单 959e0b66cb

jacy added 1 commit 2026-07-26 07:45:49 +08:00

企业知识库搭建 f053908acb

jacy added 2 commits 2026-07-26 08:37:53 +08:00

微信企业机器人创建 34532dc9bf

知识库 745c192693

jacy added 1 commit 2026-07-26 09:32:31 +08:00

feat(admin): LLM config, knowledge base, and WeCom AI binding ... 2b7ef65cce

Add owner-scoped model API settings, uploadable knowledge bases, and WeCom bot AI/KB wiring with OpenAI-compatible URL normalization.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 3 commits 2026-07-26 10:08:46 +08:00

物流对账单 19cb312465

系统判断配送限制 da21cd3daa

chore(settlement): add finance bills mock seed script ... 94d2a88581

EOF

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-26 10:17:06 +08:00

feat(store): dual business hours, avg price, and status lock ... 92cf51ba3d

Support 1-2 hour segments and optional avgPrice; show bank settlement on HQ store detail; enforce pickup min 2 bottles; Chinese order statuses; block shop reopen after permanent close.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-26 10:17:41 +08:00

fix(shop): resolve duplicate open binding on home page ... 097c7dec4b

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-26 10:18:03 +08:00

fix(partner): export normalizeStringArray for store detail ... 25aee745cc

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-26 10:18:45 +08:00

fix(partner): restore clearAllStoreDrafts export ... b810cabc6d

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-26 10:20:37 +08:00

feat(admin): require business hours when creating stores ... cc9933d1ce

HQ create-store wizard now collects 1-2 hour segments and avgPrice, and API validates them on create/update.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-26 17:50:40 +08:00

小程序加上公司资质 1725b9e4b4

jacy added 3 commits 2026-07-27 22:41:43 +08:00

小程序优化，商铺定位等 23c0cc7a5f

H5端开店增加获取当前店铺位置 09eda9a11e

fix(admin,mini-user): product on-sale tag, store coords inputs, home UX ... 15b878f2a4

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-27 22:54:04 +08:00

fix(admin,mini-user): store lat/lng edit with Baidu map, center pickup qty hint ... d36fe13bcd

HQ store detail can set coordinates and open Baidu Map search by name/address; admin update API persists lat/lng.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 2 commits 2026-07-27 23:20:36 +08:00

feat(admin,partner): Tencent map location picker and expose LBS key ... 317f910f3c

Store create/edit on HQ and partner can pick coords via Tencent locpicker; client-config exposes TENCENT_LBS_KEY; seed empty system settings from env.

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(api): seed empty system settings from env including Tencent LBS key ... 78973e3fbf

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-27 23:21:24 +08:00

fix(deploy): use scp -P for sync-api-env port option ... ea8152ebf3

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-27 23:26:00 +08:00

feat(store): benefit coupon usage rules and show env photos on store detail ... fc03905777

Add benefitUsageRule on store create/edit (HQ + partner) and C-end detail between intro and env gallery.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-27 23:26:26 +08:00

fix(store): use line comment for benefitUsageRule in Prisma schema ... 18ab639669

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-27 23:42:18 +08:00

feat(mini-user): enable share on home/benefit and OSS qualification ... cd23119470

Wire WeChat share on home and benefit tabs; serve mine qualification
from OSS; mask phones on admin users and wechat bindings pages.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 00:05:51 +08:00

feat(partner): complete proxy order with dual SMS and pickup ... b59d4484ec

Add partner/customer SMS confirm, address auto-receive or on-site
pickup, proxy placer fields, PARTNER_PROXY user source, and C-end badge.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 00:11:29 +08:00

fix(partner): guard null region on proxy order preview ... aa9d689c76

Avoid crash when province/city is not selected yet.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 00:20:33 +08:00

fix(partner): drop pickup store and reorder promo on proxy order ... a49d8d99b6

On-site pickup no longer requires a store; move optional promo above fulfillment mode.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 2 commits 2026-07-28 00:35:28 +08:00

分享功能和资质文件展示 15c35c49de

fix(partner): drop store-create SMS verify; keep qualification aspect ratio ... e2fd28a35b

Partner H5 no longer requires store phone SMS on create; qualification overlay uses height auto with widthFix.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 00:41:55 +08:00

fix(mini-user): center qualification image on translucent mask ... 50349dd8e9

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 00:47:49 +08:00

fix(admin,partner): harden Tencent locpicker coords and confirm flow ... 9ed0c24d11

Accept latlng-only postMessage, confirm before apply, and read LBS key per request.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 12:57:33 +08:00

fix(admin,partner): replace Tencent iframe picker with server LBS search ... 944306e45c

Avoid locpicker formatted_addresses crash; proxy suggest/nearby/reverse via /common/lbs.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 13:00:31 +08:00

fix(api): surface LLM network errors for WeCom AI replies ... 37038a7591

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 13:33:54 +08:00

feat(admin): city delete with impact preview; optional partner fields ... b920c894b9

Allow deleting open cities after listing partners/stores; company name, address, and districts optional on partner create.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 13:45:07 +08:00

fix(admin): make partner company/address/district optional on create UI ... f4766d32ff

Remove required asterisks on CityPartnersPage create form (main entry).

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 14:03:23 +08:00

feat(admin): gate user/order/city delete behind assignable HQ permissions ... daeb24bbeb

Add users_delete, orders_delete, cities_delete; default HQ (incl. super admin) has none until explicitly granted.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 15:11:03 +08:00

feat(admin): store detail edit with login phone sync; tighten HQ UI ... 0cb2b2cebb

HQ store update now syncs store_account.phone for shop login; expand editable store fields. System version only for SUPER_ADMIN; permissions checklist layout polish.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 15:44:05 +08:00

feat(admin): delete store staff; city store count links to filtered list ... 118d57d710

HQ can remove store sub-accounts from primary account detail; cities table store count jumps to /stores?cityId=.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy added 1 commit 2026-07-28 16:05:10 +08:00

feat(admin): link city-partner store count; fix benefitUsageRule null string ... 309b180087

City partner storeCount jumps to /stores?partnerId=; normalize empty/null text so usage rule is not saved as literal "null.

Co-authored-by: Cursor <cursoragent@cursor.com>

jacy closed this pull request 2026-07-28 17:18:16 +08:00

Some checks are pending

Hide all checks

CI / verify (pull_request) Has been cancelled

Details

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

ljy jacy

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: jacy/dukang#5