Commit Graph

2437 Commits

Author SHA1 Message Date
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
wangsongsole 2a1f4344a4 ♻️ refactor:回退代码 2024-02-29 09:41:25 +08:00
wangsongsole 9ebbd77b22 feat: 订单列表新增字段 2024-02-29 09:39:52 +08:00
wangsongsole f69fa17cfa feat: 新增微信小程序打开方式 2024-02-28 16:55:37 +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
wangsongsole 46bc4d104c 🐛 fix: 修复红包祝福语检验问题 2024-01-19 11:23:05 +08:00
wangsongsole 016d39ed5e 🐛 fix: 修复bug 2024-01-19 11:10:35 +08:00
wangsongsole 5e5fc985dc feat: 红包祝福语不允许有空格 2024-01-19 10:51:38 +08:00
wangsongsole 469c648c14 💪 optimize: 优化代码 2024-01-16 14:41:06 +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 fd689d21cf Merge branch 'master' into dynamicPrompt 2023-12-28 14:31:46 +08:00
wangsongsole 46c2aa141a ♻️ refactor: 调整订单详情数据接口 2023-12-26 17:03:48 +08:00
wangsongsole 7f665219fb 🐛 fix: 修复keys查询以及条件 2023-12-26 11:56:03 +08:00
zhangds ed95365452 fix: 增加使用说明 最大字段 2023-12-25 16:53:06 +08:00
wangsongsole eac3bdc26a 🐛 fix: 修复立减金模板未展示到账个数 2023-12-21 17:37:36 +08:00
wangsongsole 58774a4d87 🐛 fix: 修复已取消订单颜色 2023-12-21 09:39:00 +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 cff347b9e8 🎨 style: 优化文案 2023-12-19 14:46:36 +08:00
wangsongsole 01e49359ed 🐛 fix: 修复bug 2023-12-19 14:34:07 +08:00
wangsongsole c8a7435d76 feat: 立减金新增到账数量 2023-12-19 11:52:52 +08:00
wangsongsole 7742f2426d Merge branch 'master' into dynamicPrompt 2023-12-11 10:10:12 +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 f43233df7a 🐛 fix: 修复bug 2023-11-30 18:21:59 +08:00
wangsongsole 92410e7c9c 🐛 fix: 修复bug 2023-11-30 18:17:51 +08:00
wangsongsole d3d0b0995b 🐛 fix: 修复bug 2023-11-30 18:13:41 +08:00
wangsongsole 9419461011 feat: 支持支付宝主题 2023-11-30 16:35:24 +08:00
wangsongsole af0b5e4750 🔀 merge: 合并分支 2023-11-24 10:18:58 +08:00
wangsongsole dc06f545a9 🔀 merge: 合并分支 2023-11-23 15:06:36 +08:00
wangsongsole 416af86599 🐛 fix: 优惠券不展示领取方式 2023-11-22 15:44:19 +08:00
wangsongsole c595e7842e 🎨 style: 修改文案 2023-11-22 10:46:50 +08:00
wangsongsole 252149f633 🎨 style: 修改文案 2023-11-22 10:34:50 +08:00
wangsongsole d5a8223a00 feat: 新增支付宝H5移动端模板 2023-11-22 10:29:19 +08:00
wangsongsole 7937760b15 🐛 fix: 修复微信主体切换bug 2023-11-21 14:38:16 +08:00
wangsongsole 082b43dd26 feat: 支付宝立减金、红包支持H5领取 2023-11-21 14:32:45 +08:00
wangsongsole addecb5c98 Merge branch 'xw-callback-message' 2023-11-17 13:53:01 +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 4a8d45b0aa 💪 optimize: 优化代码 2023-11-15 09:32:18 +08:00
wangsongsole 8b301a19d7 feat: 新增通知回调模块 2023-11-15 09:30:59 +08:00
wangsongsole ec5b445fda feat: 开放支付宝立减金主体选择 2023-11-15 09:30:29 +08:00
wangsongsole fb9765329b feat: 新增接口 2023-11-13 17:15:36 +08:00
wangsongsole 9daa09f302 🔀 merge: 合并冲突 2023-10-30 14:54:32 +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