Commit Graph

2376 Commits

Author SHA1 Message Date
zhangds cfe12e4d4c fix: 修复白名单 包码结算 2024-03-03 17:19:46 +08:00
zhangds 000f6de836 fix: 修改兑换码管理,复制和编辑包码不可操作 2024-03-03 16:04:36 +08:00
wangsongsole 6d625181b8 🔖 version: 发布 2024-03-02 03:24:51 +08:00
wangsongsole 6deeaacf0a 🦀️ fix: 修复bug 2024-03-02 03:17:27 +08:00
wangsongsole e77db22db1 🔖 version: 镜像包 2024-03-02 03:12:36 +08:00
wangsongsole 1599254ae8 🔖 version: 测试 2024-03-02 01:31:12 +08:00
wangsongsole 70f676218b 🦀️ fix: 修复bug 2024-03-02 01:29:16 +08:00
wangsongsole 42cdc06100 🔖 version: 发布 2024-03-02 01:17:44 +08:00
wangsongsole 466246ae9f 🔖 version: 发布 2024-03-02 01:07:29 +08:00
wangsongsole c56cb505eb 🔖 version: 发布 2024-03-02 01:03:07 +08:00
wangsongsole babc59a26f 🦀️ fix: 修复bug 2024-03-02 00:54:41 +08:00
wangsongsole 242235d1cf 🔖 version: 发布样式 2024-03-02 00:32:25 +08:00
wangsongsole f61e2c38f1 feat: 新增商品描述选项 2024-03-01 22:37:14 +08:00
wangsongsole 25e85e484a 🎨 style: 批量是上传查询新增文案 2024-03-01 14:42:32 +08:00
wangsongsole 2f614e9edf 🎨 style: 有组合商品移动端组件 2024-03-01 10:40:02 +08:00
wangsongsole 1b2705fa2c 🦀️ fix: 修复bug 2024-02-29 17:57:09 +08:00
wangsongsole 6eef39e7b8 feat: 京东E卡默认图片 2024-02-29 17:39:47 +08:00
wangsongsole f92b2297ea feat: 新增云闪付立减金默认提示 2024-02-29 17:00:57 +08:00
wangsongsole 933937036d 🦀️ fix: 修复bug 2024-02-29 16:24:38 +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
wangsongsole bebe5597e0 🎨 style: 优化样式 2024-02-28 15:14:28 +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
wangsongsole 8789083edb 🦀️ fix: 修复复制key批次,组合立减金领取方式没有回显 2024-02-27 09:25:55 +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 76e9b86c75 🔖 version: 测试包 2024-02-24 15:20:06 +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 01ec08b50e 🎨 style: 修改isECard字段为is_e_card 2024-02-22 09:49:30 +08:00
wangsongsole 64b3c9ed55 🦀️ fix: 修复京东E卡bug 2024-02-21 16:21:54 +08:00
wangsongsole 6d00157dcb 🦀️ fix: 修复isECard传值 2024-02-21 14:35:18 +08:00
wangsongsole e8d05aab9c Merge branch 'master' into ECard 2024-02-21 14:33:09 +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
wangsongsole 48f299c98e Merge branch 'master' into ECard 2024-02-20 14:44:26 +08:00
zhangds 6e6c55e6a8 feat: 新增包码结算计划 2024-02-20 13:49:14 +08:00
zhangds 8548013e11 feat: 完成包吗限制 2024-02-20 11:52:40 +08:00
zhangds bedb5c6ede feat: 修改营销系统包码 2024-02-20 11:24:42 +08:00
wangsongsole 8fb9a7213d ♻️ refactor: 重构京东E卡 2024-02-19 17:07:16 +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 c4d585e765 feat: 新增京东E卡 2024-02-19 11:17:57 +08:00
wangsongsole b90454812b feat: 新增京东E卡 2024-02-19 10:37:33 +08:00
wangsongsole 21227a5514 🗑️ delete: 删除京东E卡 2024-02-19 10:35:47 +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 998db585b0 feat: 表格分页支持200页 2024-02-02 15:13:29 +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 7c17278cd8 💪 optimize: 优化面包屑代码 2024-01-26 16:25:40 +08:00
wangsongsole bdf207f6a1 🎨 style: 调整立减金和红包组件样式 2024-01-26 15:46:41 +08:00
wangsongsole 52a1893f9d 🎨 style: 优化样式代码 2024-01-26 11:21:53 +08:00
wangsongsole 7ae048fd86 🎨 style: 优化立减金穿模问题 2024-01-26 11:15:03 +08:00
wangsongsole de6492a495 🗑️ delete: 移除修改密码模块 2024-01-24 16:09:14 +08:00
wangsongsole 123a7f427f 💪 optimize: 优化代码 2024-01-19 11:26:53 +08:00