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

188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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