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