Commit Graph

Select branches

Hide Pull Requests

dev

master

test

Mono Color

• 4c33c1c648 Merge branch 'dev' into test Huakk 2024-05-16 14:41:08 +08:00
• 55de33461b wip: Huakk 2024-05-16 14:40:55 +08:00
• 6bd7e2f62c Merge branch 'dev' into test Huakk 2024-05-16 14:38:44 +08:00
• 4f745c42f0 wip: Huakk 2024-05-16 14:38:32 +08:00
• bf64d6f9ef wip: Huakk 2024-05-16 14:38:07 +08:00
• ff84bde907 Merge branch 'dev' into test Huakk 2024-05-16 14:35:27 +08:00
• 036819a0a7 wip: Huakk 2024-05-16 14:32:53 +08:00
• 8f3b158032 wip: 4.0 Huakk 2024-05-16 14:27:57 +08:00
• e6f68c5ee8 fix(custom): Huakk 2024-05-11 18:29:41 +08:00
• 33eccf0a24 fix(custom): Huakk 2024-05-11 18:29:04 +08:00
• 97c758e598 fix(custom): Huakk 2024-05-11 17:59:10 +08:00
• c13705d96a fix(custom): Huakk 2024-05-11 17:49:23 +08:00
• b09c1d9537 release(custom): 3.1.0 Huakk 2024-05-10 11:16:50 +08:00
• cee33dddd1 Merge branch 'master' into dev Huakk 2024-05-04 17:13:29 +08:00
• 434ce9e4b5 build(custom): 优化若干细节，升级项目依赖 Huakk 2024-05-04 17:12:38 +08:00
• 4ed38eeca7 mod(custom): YuanHuakk 2024-05-01 19:12:23 +08:00
• e30a3ca698 Merge branch 'test' YuanHuakk 2024-04-29 16:34:00 +08:00
• c5dbcba1b1 release(custom): 3.0.17 YuanHuakk 2024-04-29 15:35:17 +08:00
• 2819372cb9 feat(custom): YuanHuakk 2024-04-29 15:22:17 +08:00
• dcbd0eaae5 fix(custom): YuanHuakk 2024-04-25 19:20:24 +08:00
• a02257408d feat(custom): 优化后结功能 YuanHuakk 2024-04-25 18:41:33 +08:00
• ab9aff44da Merge branch 'test' YuanHuakk 2024-04-12 17:48:25 +08:00
• 7ed844cd86 release(custom): 3.0.15 YuanHuakk 2024-04-12 17:48:01 +08:00
• f3c359e4eb refactor(custom): 登录流程修改 YuanHuakk 2024-04-12 17:43:19 +08:00
• b85e360a17 Merge branch 'test' YuanHuakk 2024-04-11 16:17:37 +08:00
• 863660c8f4 fix(custom): 修复无法核销的bug YuanHuakk 2024-04-11 16:17:14 +08:00
• edf1e49cce refactor(custom): 我的账户细微修改 YuanHuakk 2024-04-01 14:31:30 +08:00
• 74ca20ca01 Merge branch 'test' YuanHuakk 2024-03-28 16:29:55 +08:00
• 65d6737902 fix(custom): 修复订单列表第三方支付商家bid重复的问题 YuanHuakk 2024-03-22 17:16:20 +08:00
• 294a889199 refactor(custom): Huakk 2024-03-21 20:44:29 +08:00
• 0ad2cf3505 fix(custom): 修复支付组件若干bug YuanHuakk 2024-03-21 17:02:06 +08:00
• 63733d0109 feat(custom): 新增聚合积分支付 YuanHuakk 2024-03-20 15:53:52 +08:00
• d9735b60f0 Merge branch 'test' YuanHuakk 2024-03-15 17:12:37 +08:00
• 2646d025f4 refactor(utils): 增加全局提示忽略白名单 YuanHuakk 2024-03-15 17:12:07 +08:00
• aed8e6f73f Merge branch 'test' YuanHuakk 2024-03-15 16:07:06 +08:00
• aef52631e7 feat(custom): 新增用户协议 YuanHuakk 2024-03-15 16:06:24 +08:00
• 5844762b25 refactor(custom): 调整后结点单首页背景图 YuanHuakk 2024-03-09 20:28:02 +08:00
• c84f2e63f5 fix(custom): YuanHuakk 2024-03-09 20:19:34 +08:00
• 1f969e59c7 fix(custom): 修复个人信息获取卡住的bug YuanHuakk 2024-03-09 18:04:07 +08:00
• 2174c91c4b fix(custom): 修复商家订单详情数据不显示的bug YuanHuakk 2024-03-08 22:21:59 +08:00
• 6b0c7d9887 ci(custom): YuanHuakk 2024-03-08 20:55:29 +08:00
• 5dcb7a5259 ci(custom): YuanHuakk 2024-03-08 19:13:24 +08:00
• 46de69b98b fix(custom): 修复若干样式污染的问题 YuanHuakk 2024-03-07 20:16:08 +08:00
• 714b980b28 fix(custom): 修复若干问题 YuanHuakk 2024-03-07 18:55:38 +08:00
• fbbdecf2e0 Merge branch 'dev' into test YuanHuakk 2024-03-02 19:28:58 +08:00
• 72b5f91102 feat(custom): 新增后结订单 YuanHuakk 2024-03-02 19:27:20 +08:00
• 74ca4123eb Merge branch 'test' YuanHuakk 2024-01-30 16:11:12 +08:00
• b1c2dcc880 Merge branch 'dev' into test YuanHuakk 2024-01-30 16:10:43 +08:00
• 725127c29b mod(custom): 核销列表接口增加若干参数 YuanHuakk 2024-01-30 16:09:28 +08:00
• 45648d78ba Merge branch 'test' YuanHuakk 2024-01-13 16:55:20 +08:00
• 016f754ad8 Merge branch 'dev' into test YuanHuakk 2024-01-13 16:54:58 +08:00
• ace2eeed7e build(deps): 依赖升级 YuanHuakk 2024-01-13 16:54:09 +08:00
• 21ff388259 feat(custom): 大转盘第一版 YuanHuakk 2024-01-13 16:48:25 +08:00
• 7e86c01913 Merge branch 'test' YuanHuakk 2023-12-21 21:11:38 +08:00
• 6399d87c04 Merge branch 'dev' into test YuanHuakk 2023-12-21 21:10:56 +08:00
• 79990aeca1 feat(custom): 新增商品详情分享 YuanHuakk 2023-12-21 21:10:07 +08:00
• 52ad54f6a9 Merge branch 'test' YuanHuakk 2023-12-20 23:46:46 +08:00
• aafcf6bb1c Merge branch 'dev' into test YuanHuakk 2023-12-20 23:46:14 +08:00
• d58d468dd1 mod(custom): 核销列表页面优化 YuanHuakk 2023-12-20 23:45:25 +08:00
• 52c0bb70e7 Merge branch 'test' YuanHuakk 2023-12-20 18:56:57 +08:00
• 7f7a49d1d2 Merge branch 'dev' into test YuanHuakk 2023-12-20 18:56:42 +08:00
• eb2003de63 fix(custom): 调整提现页面 YuanHuakk 2023-12-20 18:56:05 +08:00
• eb696252f2 Merge branch 'test' YuanHuakk 2023-12-20 00:10:25 +08:00
• 0ee7264c46 Merge branch 'dev' into test YuanHuakk 2023-12-20 00:10:10 +08:00
• c2d492270f release(custom): 3.0.7 YuanHuakk 2023-12-20 00:09:49 +08:00
• e72eb41c67 fix(custom): 我的推广-\>积分明细字段调整 YuanHuakk 2023-12-20 00:08:35 +08:00
• b8b7f1faa8 Merge branch 'test' YuanHuakk 2023-12-19 22:58:13 +08:00
• 74042b423f Merge branch 'dev' into test YuanHuakk 2023-12-19 22:57:58 +08:00
• fb4666bb04 build(deps): 依赖更新 YuanHuakk 2023-12-19 22:56:43 +08:00
• 7fdad4ed26 Merge branch 'test' YuanHuakk 2023-12-15 20:52:45 +08:00
• 87c95dc5c3 Merge branch 'dev' into test YuanHuakk 2023-12-15 20:52:32 +08:00
• 3c5ce5bba3 feat(custom): 完善幻灯片功能 YuanHuakk 2023-12-15 20:51:32 +08:00
• d3caef5172 Merge branch 'test' YuanHuakk 2023-12-13 12:58:05 +08:00
• 2406d974c1 Merge branch 'dev' into test YuanHuakk 2023-12-11 20:45:38 +08:00
• 878c421fe0 feat(custom): 首页微调 YuanHuakk 2023-12-11 20:44:52 +08:00
• b94c4110ea Merge branch 'test' YuanHuakk 2023-12-04 22:29:20 +08:00
• cb7cd056d0 Merge branch 'dev' into test YuanHuakk 2023-12-04 22:28:59 +08:00
• eb7f411802 release(custom): 3.0.3 YuanHuakk 2023-12-04 22:28:21 +08:00
• 659d2fd972 Merge branch 'test' YuanHuakk 2023-12-04 21:32:03 +08:00
• 90cfa7938d Merge branch 'dev' into test YuanHuakk 2023-12-04 21:31:45 +08:00
• 4bfc3539bc fix(custom): 修复若干bug YuanHuakk 2023-12-04 21:31:04 +08:00
• d796809900 Merge branch 'dev' into test YuanHuakk 2023-12-04 18:20:17 +08:00
• 1499f25121 fix(custom): 修复积分提现 YuanHuakk 2023-12-04 18:18:30 +08:00
• 8e7f8711af Merge branch 'dev' into test YuanHuakk 2023-12-04 17:38:53 +08:00
• 69ae00ba9e mod(custom): 回退积分提现的修改 YuanHuakk 2023-12-04 17:37:53 +08:00
• b8ab7699e1 Merge branch 'test' YuanHuakk 2023-12-03 21:15:30 +08:00
• 077bdeb6e9 Merge branch 'dev' into test YuanHuakk 2023-12-03 21:15:06 +08:00
• efa291a3a8 build(deps): 依赖升级 YuanHuakk 2023-12-03 21:14:14 +08:00
• 62f1f3454c Merge branch 'test' YuanHuakk 2023-12-03 21:10:48 +08:00
• e2a3e0b5eb Merge branch 'dev' into test YuanHuakk 2023-12-03 21:10:26 +08:00
• 857967cc3b Merge branch 'dev' of https://jihulab.com/xinling/jdt-user into dev YuanHuakk 2023-12-03 21:09:29 +08:00
• 33bc8ddf17 release(custom): 3.0.1 YuanHuakk 2023-12-03 21:07:14 +08:00
• b4dc5de795 fix(custom): 修复商家积分体现显示0的问题 YuanHuakk 2023-12-03 21:06:23 +08:00
• 253002eef7 mod(custom): 去除多余代码 YuanHuakk 2023-12-01 23:36:24 +08:00
• db60354172 build(deps): 项目依赖升级 YuanHuakk 2023-12-01 23:11:06 +08:00
• 878cc05673 Merge branch 'test' YuanHuakk 2023-11-29 23:08:48 +08:00
• e6a3c3cfb2 Merge branch 'dev' into test YuanHuakk 2023-11-29 23:08:28 +08:00
• 36cae90d74 fix(custom): 修复积分支付成功不跳转 YuanHuakk 2023-11-29 23:07:30 +08:00
• 6c25beff1d Merge branch 'test' YuanHuakk 2023-11-29 15:38:59 +08:00
• 42bd7887e8 Merge branch 'dev' into test YuanHuakk 2023-11-28 18:56:29 +08:00