Commit Graph

1865 Commits

Author SHA1 Message Date
wangsongsole f92b2297ea feat: 新增云闪付立减金默认提示 2024-02-29 17:00:57 +08:00
wangsongsole 99c117d34b 🦀️ fix: 修复bug 2024-02-29 15:02:27 +08:00
wangsongsole d2914a606f 🦀️ fix: 修复bug 2024-02-29 14:41:14 +08:00
wangsongsole 649bb0ed24 🦀️ fix: 修复bug 2024-02-29 10:44:53 +08:00
zhangds aaeda4ecfb fix:修复包码只能创建一个商品 2024-02-29 09:57:47 +08:00
wangsongsole 5760a9ea09 feat: 订单列表新增字段 2024-02-29 09:42:07 +08:00
zhangds bcfe3f92e1 fix: 修改key批次 2024-02-28 16:39:23 +08:00
wangsongsole 4e5641d5e9 🦀️ fix: 修复bug 2024-02-28 15:43:44 +08:00
wangsongsole 6fe991c4dd feat: 组合商品默认说明 2024-02-28 15:33:30 +08:00
zhangds 8500a68357 Merge branch 'master' into clearingForm 2024-02-28 14:47:47 +08:00
wangsongsole ca9c35ac1e 🔀 merge: 合并分支 2024-02-28 09:40:49 +08:00
zhangds 347dd75d99 fix: 修复-复制计划没有包码 2024-02-27 19:57:53 +08:00
wangsongsole 1b2a0da91c 🦀️ fix: 修复bug 2024-02-27 18:09:36 +08:00
wangsongsole 676d301129 🦀️ fix: 修复bug 2024-02-27 16:40:47 +08:00
wangsongsole 5e03572e51 🦀️ fix: 修复时间bug 2024-02-27 10:53:49 +08:00
wangsongsole 4cb4ceb98a 🦀️ fix: 修复【组合商品--新建】商品范围中,数量修改为“单次到账” 2024-02-27 10:17:21 +08:00
wangsongsole ac2fad21c6 🦀️ fix: 修复组合商品管理模块bug 2024-02-27 10:07:15 +08:00
zhangds d1898a1917 feat: 增加后台管理系统包码结算列表导出 2024-02-26 11:02:40 +08:00
zhangds 88fd85761e fix: 增加包码订单 nav 选择动画 2024-02-26 10:27:35 +08:00
wangsongsole 5e80c71cd4 💪 optimize: 优化代码 2024-02-24 19:17:08 +08:00
wangsongsole 4e4c334f8e 💪 optimize: 优化代码 2024-02-24 18:00:42 +08:00
wangsongsole 7b91693b9c 🦀️ fix: 修复bug 2024-02-24 15:17:56 +08:00
wangsongsole fd2bc7c4b7 feat: 新增combining 立减金分组相关组件 2024-02-22 15:57:17 +08:00
wangsongsole ee217f3915 💪 optimize: 商户路由 偏移量字段更改为SM4秘钥 2024-02-21 13:52:41 +08:00
zhangds 05e8f6356c Merge branch 'master' into clearingForm 2024-02-21 10:10:49 +08:00
zhangds f0d12dacd9 feat: 修改包码列表详情 2024-02-21 09:47:10 +08:00
zhangds ed1fa18055 feat: 完成兑换列表过滤 2024-02-20 18:23:44 +08:00
zhangds 60383b44ac feat: 完成营销系统包码结算 2024-02-20 18:14:15 +08:00
zhangds e2baf44891 feat: 包码编辑 2024-02-20 17:09:47 +08:00
wangsongsole 581b487c3a feat: 编写代码 2024-02-20 16:49:25 +08:00
zhangds 74bda83b3d feat: 增加key批次包码 2024-02-20 15:51:22 +08:00
wangsongsole 910c4cf8c3 Merge branch 'master' into combining 2024-02-20 14:44:46 +08:00
zhangds 6e6c55e6a8 feat: 新增包码结算计划 2024-02-20 13:49:14 +08:00
zhangds bedb5c6ede feat: 修改营销系统包码 2024-02-20 11:24:42 +08:00
wangsongsole 16257b6b8c 🔖 version: 测试包 2024-02-19 16:51:10 +08:00
zhangds dfe9d59a41 feat: 增加包码结算 2024-02-19 13:57:37 +08:00
wangsongsole 0ffc5da097 💪 optimize: 优化代码 2024-02-19 11:22:09 +08:00
wangsongsole 8822296656 feat: 商户密钥受对接类型影响 2024-02-06 17:11:43 +08:00
wangsongsole 43bc911854 🎨 style: 优化样式 2024-02-06 16:54:53 +08:00
zhangds 42aa0f6af3 fix: 完成订单关联订单号 2024-02-06 14:08:18 +08:00
wangsongsole d813ed168a 💪 optimize: 优化代码 2024-02-06 13:55:50 +08:00
wangsongsole a783378148 feat: 新增商户上报 2024-02-06 13:52:12 +08:00
zhangds c478568594 fix: 增加包码结算详情 2024-02-06 11:54:02 +08:00
zhangds ed25376de9 fix: 优化包码结算列表 2024-02-06 11:24:02 +08:00
wangsongsole 08bd3701ec feat: 新增组合商品组件 2024-02-06 09:47:33 +08:00
wangsongsole 593b3923c4 feat: 订单日志增加序号 2024-02-02 15:20:47 +08:00
wangsongsole 1a34569df5 fallback: 后退 2024-02-02 09:41:19 +08:00
wangsongsole a49b7c6bc2 🦀️ fix: 修复导出bug 2024-02-01 17:23:16 +08:00
wangsongsole 9e2e857573 🎨 style: 优化文案展示 2024-02-01 14:06:19 +08:00
wangsongsole ca58568250 feat: 新增包码列表代码 2024-01-31 18:29:12 +08:00
wangsongsole 85f33b57d1 🔀 merge: 合并order分支 2024-01-31 14:50:13 +08:00
wangsongsole 89ce9e8c87 feat: 新增包结算方式 2024-01-31 14:48:13 +08:00
wangsongsole 6122efd02a 💪 optimize: 优化用户体验 2024-01-30 15:55:41 +08:00
wangsongsole a057714c35 🎨 style: 优化订单列表 2024-01-30 15:04:45 +08:00
wangsongsole 3ba41ec369 🎨 style: 优化文案 2024-01-30 14:54:35 +08:00
wangsongsole dadea66564 feat: 订单列表新增特性 2024-01-30 11:54:34 +08:00
wangsongsole 493ba8e661 🔖 version: 发布测试包 2024-01-29 17:33:11 +08:00
wangsongsole 45ab1a2697 💪 optimize: 优化代码 2024-01-29 17:15:28 +08:00
wangsongsole fcb1742af6 🔖 version: 发布测试包 2024-01-29 17:10:37 +08:00
wangsongsole 9f11e4e202 feat: 优化代码 以及订单列表调整查询字段 2024-01-29 16:28:02 +08:00
wangsongsole 5a53adbcad 💪 optimize: 优化订单列表 2024-01-27 15:02:11 +08:00
wangsongsole a92f045408 💪 optimize: 优化订单列表代码 2024-01-26 16:55:16 +08:00
wangsongsole de6492a495 🗑️ delete: 移除修改密码模块 2024-01-24 16:09:14 +08:00
wangsongsole c544910f2a feat: 优惠券新增筛选条件 2024-01-11 16:10:07 +08:00
wangsongsole 9513a6aea0 🐛 fix: 修复bug 2024-01-11 15:34:40 +08:00
wangsongsole dbd76ee9b8 feat: 兑换码列表新增筛选条件 2024-01-11 12:00:03 +08:00
wangsongsole 6cf56f78f2 💪 optimize: 优化代码 2024-01-03 16:49:23 +08:00
wangsongsole 4e83adf12e Merge branch 'master' into optimize 2024-01-02 15:32:39 +08:00
wangsongsole 1ef1f9aee3 feat: 计划列表新增字段 2024-01-02 15:27:32 +08:00
wangsongsole 04f654ec70 feat: 新增字段 2024-01-02 13:56:46 +08:00
wangsongsole 426ce185a7 💪 optimize: 优化代码 2023-12-28 15:57:08 +08:00
wangsongsole 42f244fcd3 🐛 fix: 修复keys列表日志查询报错 2023-12-28 15:55:44 +08:00
wangsongsole 46c2aa141a ♻️ refactor: 调整订单详情数据接口 2023-12-26 17:03:48 +08:00
wangsongsole 5a3d09c58f ♻️ refactor: 更改订单状态 2023-12-20 20:51:19 +08:00
wangsongsole 9316c05168 🎨 style: 修改样式 2023-12-20 15:54:01 +08:00
wangsongsole 5f392248c1 feat: 新增订单重试领取按钮 2023-12-20 14:07:05 +08:00
wangsongsole 070bf45544 🐛 fix: 修复bug 2023-12-19 17:58:38 +08:00
wangsongsole 193ac52d0b 🎨 style: 优化订单列表展示 2023-12-19 17:19:05 +08:00
wangsongsole 81d4329581 feat: 订单列表新增订单状态、核销状态数量 2023-12-19 17:14:27 +08:00
wangsongsole c8a7435d76 feat: 立减金新增到账数量 2023-12-19 11:52:52 +08:00
wangsongsole d505df314c ♻️ refactor: 禁用key批次详情日志按钮 2023-12-06 14:22:39 +08:00
wangsongsole a42f42faaa ♻️ refactor: 禁用日志 2023-12-06 14:08:29 +08:00
wangsongsole f5a565721b ♻️ refactor: 取消回调地址必填校验 2023-11-16 18:20:20 +08:00
wangsongsole 79511b6cb1 feat: 对接回调剩余接口 2023-11-15 20:54:14 +08:00
wangsongsole 8b301a19d7 feat: 新增通知回调模块 2023-11-15 09:30:59 +08:00
wangsongsole 04d2aa67e1 💪 optimize: 优化计划列表代码 2023-10-25 14:37:39 +08:00
wangsongsole 79088a1857 🎈 per: 优化代码并修复bug 2023-10-25 14:31:16 +08:00
wangsongsole eb68c41abf 🚑️ hotfix: 修复营销计划-状态筛选-创建中不生效 2023-10-24 10:01:20 +08:00
wangsongsole af0c8cccfb ♻️ refactor: 隐藏开放信息入口 2023-10-23 09:40:18 +08:00
wangsongsole ed2a299b03 🚑️ hotfix: 商户回调地址不限制长度 2023-10-20 16:10:28 +08:00
wangsongsole d123b6076f ✏️ typos: 取消商户编号校验符 2023-10-19 19:12:23 +08:00
wangsongsole 1616860da0 feat: 对接商户编辑接口 2023-10-19 19:04:06 +08:00
wangsongsole 18275de237 feat: 计划列表新增stock_id 计划编号 2023-10-18 16:38:52 +08:00
wangsongsole 820c14c07a feat: 新增路由 2023-10-17 10:55:53 +08:00
wangsongsole e7a4bed1e6 💪 optimize: 优化代码 2023-10-16 17:18:01 +08:00
wangsongsole 7afc750a5e feat: 分销商新增字段 2023-10-16 16:55:14 +08:00
wangsongsole d160562cfa 💪 optimize: 删除冗余代码 2023-09-27 17:49:29 +08:00
wangsongsole 78bfc0e78a 💪 optimize: 调整并优化代码 2023-09-26 17:30:42 +08:00
wangsongsole 55d8fcedb1 💪 optimize: 优化代码 2023-09-26 15:34:56 +08:00
wangsongsole c6847baa53 💪 optimize: 优化引入顺序 2023-09-26 14:22:20 +08:00