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 '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
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
ljy