Commit Graph

Select branches

Hide Pull Requests

dev

dev_jacy

dev_ljy

main

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#32

#33

#34

#35

#5

#6

#7

#8

#9

v3.3

v3.4

v3.4.10

v3.4.11

v3.4.12

v3.4.13

v3.4.15

v3.4.17

v3.4.18

v3.4.9

v3.5.1

v3.5.2

v3.5.3

Mono Color

• 5e96008ac4 首页定位问题 jacy 2026-07-09 21:12:28 +08:00
• b506417f5e 合伙人端开店选照片 jacy 2026-07-09 17:26:24 +08:00
• 3f60c37265 微信分享 jacy 2026-07-09 17:14:00 +08:00
• 3d3588babb fix(weixin-sdk): fix iOS scanQRCode false camera permission error jacy 2026-07-09 16:49:01 +08:00
• d8c240c839 Merge commit 'ab9654564e2457db6d0c0972b1818b7b2061ac86' into dev_jacy jacy 2026-07-09 15:40:39 +08:00
• ab9654564e fix:提交修复6个问题 ljy 2026-07-08 23:01:18 +08:00
• 99be8e0237 merge dev_jacy: fix with-api-env.cjs CommonJS jacy 2026-07-07 23:35:03 +08:00
• d5865aeb5e fix(api): use CommonJS in with-api-env.cjs for Prisma deploy jacy 2026-07-07 23:34:55 +08:00
• dec839f79e merge(dev_jacy): server uses .env.production only jacy 2026-07-07 23:33:44 +08:00
• 6dc051f26d chore(api): use .env.production on server, .env for local dev only jacy 2026-07-07 23:33:34 +08:00
• c6af8480a4 runxian -dukang ssl证书配置 jacy 2026-07-07 22:53:18 +08:00
• 8598704a49 改回 user.runxian.top jacy 2026-07-07 22:45:49 +08:00
• baf5fd00b4 merge(dev_jacy): add m.runxian.top deploy script jacy 2026-07-07 22:34:07 +08:00
• 7f439c5bea chore(deploy): add remote script for m.runxian.top rollout jacy 2026-07-07 22:34:03 +08:00
• d46ae9eed4 merge(dev_jacy): unify H5 under m.runxian.top for WeChat OAuth jacy 2026-07-07 22:08:24 +08:00
• eb961c3a74 feat(h5): unify WeChat OAuth under m.runxian.top path routing jacy 2026-07-07 22:07:47 +08:00
• e32ccebc80 本地环境不验证手机号和微信登录授权 jacy 2026-07-07 21:42:56 +08:00
• ec748335bf 环境变量修改 jacy 2026-07-07 20:51:44 +08:00
• c8dfa50f24 隐藏ID的显示 jacy 2026-07-07 20:51:35 +08:00
• c9202099cf Merge #20 into dev from dev_jacy jacy 2026-07-07 18:50:52 +08:00
• 1ac72e9a69 管理后台左侧列表调整 jacy 2026-07-07 18:49:47 +08:00
• 98e9652865 web端增加微信绑定管理 jacy 2026-07-07 18:25:15 +08:00
• 887d728496 webadmin去掉新建门店的短信验证 jacy 2026-07-07 18:17:45 +08:00
• d31782c73a Merge #19 into dev from dev_jacy jacy 2026-07-07 18:01:12 +08:00
• 67eed11276 商铺端核销，调用相机报无效签名修复 jacy 2026-07-07 17:55:12 +08:00
• 5fef6ae2b1 后端webadmin调整显示布局 jacy 2026-07-07 17:43:01 +08:00
• 7e3c0011bb 微信登录日志 jacy 2026-07-07 17:17:03 +08:00
• 47686d3067 Merge #18 into dev from dev_jacy jacy 2026-07-07 15:26:19 +08:00
• 2c74f6a08c 合伙人端登录接口优化 jacy 2026-07-07 15:22:55 +08:00
• 7dd8a6662b 合伙人端登录页面调整 jacy 2026-07-07 14:48:49 +08:00
• 2e61caa49c 合伙人端登录验证调整还有日志落地 jacy 2026-07-07 14:34:02 +08:00
• af989c9d33 api端报错修正 jacy 2026-07-07 14:03:07 +08:00
• d9e72ab227 Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' into dev_jacy jacy 2026-07-07 13:55:10 +08:00
• 6572799264 webadmin端增加商铺日志 jacy 2026-07-07 12:12:12 +08:00
• e25b208545 核销成功提示 jacy 2026-07-07 11:46:12 +08:00
• 1dcc9aa1f4 配置服务器 jacy 2026-07-07 11:43:03 +08:00
• fb431a92d4 Merge #17 into dev from dev_jacy jacy 2026-07-07 10:52:06 +08:00
• 98022b936f fix(h5-shop): remove redeem debug UI and enforce WeChat scan flow jacy 2026-07-07 00:19:11 +08:00
• 5d19089f91 门店页面修改 jacy 2026-07-07 00:18:29 +08:00
• 1fcafac2a7 后端显示门店账单 jacy 2026-07-07 00:04:07 +08:00
• 7ca9fc8a35 门店账号管理修改 jacy 2026-07-07 00:01:16 +08:00
• e85c4b9bcb 门店核销功能测试 jacy 2026-07-06 23:40:12 +08:00
• 2ac10adcff Merge #16 into dev from dev_jacy jacy 2026-07-06 22:35:16 +08:00
• a66207ffa9 超管用户登录； 代码核销功能 jacy 2026-07-06 22:33:30 +08:00
• d708a10095 核销功能 jacy 2026-07-06 22:22:21 +08:00
• 386ee9e754 核销代码 jacy 2026-07-06 22:10:45 +08:00
• 047cf879f8 小飞侠的日志 jacy 2026-07-06 21:36:20 +08:00
• b2a3b56f46 Merge #15 into dev from dev_jacy jacy 2026-07-06 21:12:43 +08:00
• d5fdf626fe 三房日志详情补充 jacy 2026-07-06 21:11:23 +08:00
• fcf1d45522 fix:完善门店和总部管理端 ljy 2026-07-06 20:58:38 +08:00
• 96a137ccb2 Merge #14 into dev from dev_jacy jacy 2026-07-06 20:57:40 +08:00
• 9d221cfcd2 微信授权逻辑修改 jacy 2026-07-06 20:56:25 +08:00
• 257a42c00a Merge #13 into dev from dev_jacy jacy 2026-07-06 20:16:59 +08:00
• b12ee13232 部署文件上传，修改环境变量为development jacy 2026-07-06 20:15:41 +08:00
• 3fdd41ca85 Merge #12 into dev from dev_jacy jacy 2026-07-06 19:36:35 +08:00
• 04b0559fb8 webadmin界面调整 jacy 2026-07-06 19:35:15 +08:00
• 4c38a9dd2b 增加核销接口 增加hq管理端日志 jacy 2026-07-06 19:17:27 +08:00
• c7cbc770c6 Merge #11 into dev from dev_jacy jacy 2026-07-06 18:05:33 +08:00
• f0b99ea9da webadmin端 批量删除用户 模板上传图片数量限制改成30 小飞侠接口配置 jacy 2026-07-06 18:04:02 +08:00
• 4e18763968 小飞侠接口调通测试 jacy 2026-07-06 17:07:35 +08:00
• 3625f037d0 fix(deploy): harden webhook auto-release for CRLF, git reset, and prisma order jacy 2026-07-06 17:01:05 +08:00
• 353e5d18f8 Merge #10 into dev from dev_jacy 测试webhook jacy 2026-07-06 16:42:37 +08:00
• 5583442ee7 配置 webhook secret jacy 2026-07-06 16:38:51 +08:00
• 56952920ba Merge #9 into dev from dev_jacy jacy 2026-07-06 16:36:14 +08:00
• da80b28ba4 商品删除功能（需要二次确认） jacy 2026-07-06 16:34:54 +08:00
• 61043c8a69 Merge #8 into dev from dev_jacy jacy 2026-07-06 16:26:41 +08:00
• 8fc142b7c8 建立推送机制 webhook jacy 2026-07-06 16:25:18 +08:00
• ed1217ccdb Merge #7 into dev from dev_jacy jacy 2026-07-06 15:33:36 +08:00
• f46904b47c 商品模板功能上传 jacy 2026-07-06 15:29:27 +08:00
• 0a109a0e0e Merge #6 into dev from dev_jacy jacy 2026-07-06 14:16:10 +08:00
• 80d967f2cf 小飞侠接口 jacy 2026-07-06 14:12:06 +08:00
• c87d79109a 定位获取城市功能，需要微信地图的key？ jacy 2026-07-06 14:02:07 +08:00
• 67af6d7d53 短信验证绑定日志内容 jacy 2026-07-06 13:26:31 +08:00
• 1c978b8adc 短信验证调试成功 jacy 2026-07-06 13:18:56 +08:00
• 77186f75f5 Merge #5 into dev from dev_jacy jacy 2026-07-06 08:57:46 +08:00
• 5ba69eb935 发布商品，商品图片使用oss服务器地址 jacy 2026-07-06 08:53:03 +08:00
• 67b5a580c5 fix:修改样式 ljy 2026-07-05 23:52:58 +08:00
• 569becedaa feat;提交管理端和城市合伙人端 ljy 2026-07-05 23:48:20 +08:00
• a0466f023e Merge commit 'ed1845c0ba98c2e1d6d80d5bf4eec2b46cdf0952' into dev_jacy(xiaofeixia ) jacy 2026-07-04 20:49:51 +08:00
• 743d242d52 v3计划内容上传 jacy 2026-07-04 20:36:26 +08:00
• fecfc61ec5 Merge dev_jacy: fix WeChat pay invoke jacy 2026-07-03 16:04:09 +08:00
• def3ed5175 fix(user): correct WeChat JSAPI pay invoke params and JSSDK init jacy 2026-07-03 16:04:01 +08:00
• ced1fe0688 Merge dev_jacy: partner WeChat auth for upload jacy 2026-07-03 15:45:31 +08:00
• cabc9e6ebb feat(partner): require WeChat OAuth before store photo upload jacy 2026-07-03 15:44:46 +08:00
• f87325df21 Merge dev_jacy: WeChat store upload fix jacy 2026-07-03 15:33:08 +08:00
• 81413e4d08 fix(partner): resolve WeChat image picker auth denied on store create jacy 2026-07-03 15:32:53 +08:00
• 30eb8ff8a6 提交express jacy 2026-07-03 15:07:27 +08:00
• 0829696ea9 Merge #3 into dev from dev_jacy jacy 2026-07-03 14:56:07 +08:00
• f2175b83f7 门店开通流程 jacy 2026-07-03 14:53:21 +08:00
• c7dc6a2274 微信校验后登录服务器错误bug jacy 2026-07-03 13:22:41 +08:00
• cc39975117 微信验证接通 jacy 2026-07-03 12:57:01 +08:00
• 160fdcb0d7 上传校验文件 jacy 2026-07-03 09:58:40 +08:00
• ceaf45ef03 上传部署环境文件 jacy 2026-07-03 00:58:56 +08:00
• 02681bcc4a Merge #1 into dev from dev_jacy jacy 2026-07-02 17:56:36 +08:00
• f7fe4597c6 支付时检测是否已经微信授权 jacy 2026-07-02 17:34:58 +08:00
• a0f4d8c18f 微信支付 jacy 2026-07-02 17:23:13 +08:00
• 4b2589156c oss接通了80端口，还没有接通https，先用 jacy 2026-07-02 16:13:45 +08:00
• ff4622ff6c 对接微信支付 jacy 2026-07-01 22:41:49 +08:00
• b78ef8798c 手机号从地址栏里获取 jacy 2026-07-01 22:13:25 +08:00
• 8a67d72de4 admin web 修改订单状态 jacy 2026-07-01 22:00:10 +08:00