Commit Graph

2453 Commits

Author SHA1 Message Date
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 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 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 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 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 2c3cb83665 💪 optimize: 优化代码 2023-09-26 15:24:33 +08:00
wangsongsole 26b5d78c65 💪 optimize: 调整路由顺序 2023-09-26 14:27:17 +08:00
wangsongsole c6847baa53 💪 optimize: 优化引入顺序 2023-09-26 14:22:20 +08:00
wangsongsole 48c9d86e30 feat: 计划列表新增计划ID搜索条件,以及列表新增计划ID字段 2023-09-22 15:34:24 +08:00
wangsongsole c06bd59de6 🚑️ hotfix: 修复主体字段默认bug,修改计划、key批次、兑换码、优惠券复制时title过长问题 2023-09-21 17:25:36 +08:00
wangsongsole 4c45a5d41a feat: 订单列表新增“制券商户”字段 2023-09-20 15:27:10 +08:00
wangsongsole 68e85addc6 💪 optimize: 注释无用组件引用 2023-09-20 10:05:20 +08:00
wangsongsole 20736879c7 💪 optimize: 优化冗余代码 2023-09-19 16:34:27 +08:00
wangsongsole f811d66ace 🔧 config: 配置环境变量 2023-09-18 10:32:31 +08:00
wangsongsole 90ea91136c 💪 optimize: 优化loadsh引入方式 2023-09-06 11:10:48 +08:00
wangsongsole 22b65576c2 feat: 微信立减金新增主体名称字段 2023-09-05 15:29:30 +08:00
wangsongsole ccab514d61 💩 improvedCode: 添加待删除代码 2023-08-31 18:09:28 +08:00
wangsongsole d15c994b37 ♻️ refactor: 现在计划删除 2023-08-30 16:44:53 +08:00
wangsongsole 0299306262 ♻️ refactor: 替换banner外链 字段 2023-08-30 16:32:07 +08:00
wangsongsole f88bbca577 Merge branch 'master' into banner-link 2023-08-28 16:13:42 +08:00
wangsongsole 5eef9683b2 feat: 计划列表删除按钮直接放开 2023-08-28 16:13:27 +08:00
wangsongsole b66f6ad6fc Merge branch 'master' into banner-link 2023-08-18 15:35:34 +08:00
wangsongsole 2ba1bd3f39 🚑️ hotfix: 修复线上bug 2023-08-18 15:30:32 +08:00
wangsongsole 34f2a379f0 Merge branch 'master' into banner-link 2023-08-18 09:08:46 +08:00
wangsongsole 4f61181409 feat: 新增卡密商品可选择发放方式 2023-08-18 09:07:21 +08:00
wangsongsole 3e29d43931 feat: 修改模板 2023-08-17 10:39:02 +08:00
wangsongsole e013f5f131 ♻️ refactor: 关闭卡密时间校验 2023-08-14 16:06:57 +08:00
wangsongsole c90d03a409 ♻️ refactor: 卡密商品有效期不做限制 2023-08-11 17:19:11 +08:00
wangsongsole f555d81c8f 💊 fix: 修复bug 2023-08-10 18:13:18 +08:00
wangsongsole 991f07f024 🎨 style: 优化模板丢失样式 2023-08-10 15:22:22 +08:00
wangsongsole 39d58f4e17 💪 optimize: 优化代码 2023-08-10 11:36:25 +08:00
wangsongsole 6ee4788617 💪 optimize: 优化兑换码代码-统一商品组件 2023-08-09 10:51:21 +08:00
wangsongsole 3e48af5dfe 🗑️ deprecateCode: 删除key编辑废弃代码 2023-08-09 10:38:35 +08:00
wangsongsole 643e854781 🔧 config: 添加删除注释 2023-08-09 10:27:47 +08:00
wangsongsole 1609ba5837 ⚰️ removeCode: 删除log 2023-08-09 10:06:15 +08:00
wangsongsole 7f1594600e feat: 新增兑换码模块本地字段 2023-08-09 10:02:02 +08:00
wangsongsole f23e4c2c1d 🚸 usability: 优化样式 2023-08-08 19:54:50 +08:00
wangsongsole 9672093fa3 💊 fix: 修复bug 2023-08-08 19:40:47 +08:00
wangsongsole da8bff7b64 💪 optimize: 优化代码 2023-08-08 15:41:56 +08:00
wangsongsole 46aac53545 🚑️ hotfix: 修复权益商品和优惠券商品切换时 - 商品详情页展示异常 2023-08-07 09:39:23 +08:00
wangsongsole 69dcda153d feat: 权益商品新增tabs 2023-08-07 09:38:27 +08:00
wangsongsole 20c29b3a9b ✏️ typos: 修改文案 2023-08-04 15:07:52 +08:00
wangsongsole 016cecac5e 🚸 usability: 更改文案 2023-08-04 11:59:19 +08:00
wangsongsole b3d55bbbda feat: 立减金模板新增固定时间和领取后时间展示 2023-08-04 11:40:11 +08:00
wangsongsole 2f1cbf6194 feat: 开启卡密 2023-08-04 10:41:42 +08:00
wangsongsole 98af135aea feat: 新增key码批量导出 2023-08-03 15:43:02 +08:00
wangsongsole 0f7f47474e 🚑️ hotfix: 云闪付红包、立减金使用说明字数为1000 2023-08-03 10:23:55 +08:00
wangsongsole 13f93d12a2 🔧 config: 所有请求Authorization参数加Bearer前缀 2023-08-02 16:57:50 +08:00
wangsongsole 70a8ae704e 💊 fix: 修复bug 2023-08-01 10:41:36 +08:00
wangsongsole 1338f0c5ff 💊 fix: 优惠券不允许开启云闪付 2023-08-01 09:15:57 +08:00
wangsongsole 5c6edcefa4 feat: 订单列表新增已退回状态 2023-07-28 15:07:08 +08:00
wangsongsole 86f18f1f23 feat: 新增订单状态color 2023-07-28 11:50:31 +08:00
wangsongsole 5978863b57 feat: 订单新增部分退款状态 2023-07-28 11:09:36 +08:00
wangsongsole a6baa488f1 🎨 style: 核销状态下拉框新增已过期状态 2023-07-28 10:59:20 +08:00
wangsongsole 7c869aaeaa ♻️ refactor: 核销状态3改为已过期 2023-07-28 10:53:09 +08:00
wangsongsole 90708c0ff9 feat: 新增订单未核销状态 2023-07-28 10:31:02 +08:00
wangsongsole 9b160905f8 💊 fix: 修复bug 2023-07-26 20:47:45 +08:00
wangsongsole 89c62c94ca 💊 fix: 修复bug 2023-07-26 17:33:21 +08:00
wangsongsole f5bb524d8f feat: 权益商品默认商品图 2023-07-25 17:56:24 +08:00
wangsongsole 9ba295fd6f 💊 fix: 修复bug 2023-07-25 11:53:39 +08:00
wangsongsole 6a60bacc91 feat: 编辑云闪付立减金代码 2023-07-24 17:18:04 +08:00
wangsongsole 45e7708e35 feat: 立减金新增云闪付类型 2023-07-24 14:03:13 +08:00
wangsongsole 2a209dbdb6 💊 fix: 修复bug 2023-07-13 11:26:02 +08:00
wangsongsole 89ea250910 ♻️ refactor: 云闪付红包隐藏祝福语 2023-07-13 09:45:45 +08:00
wangsongsole 176f3bf85e ♻️ refactor: 开启微信红包 2023-07-12 09:29:17 +08:00
wangsongsole 95458578a6 💊 fix: 修复云闪付和红包公用组件切换报错问题 2023-07-11 17:29:38 +08:00
wangsongsole f0f4bc8dcb 💪 optimize: 优化红包模板代码 2023-07-11 17:10:48 +08:00
wangsongsole dbd5d20640 💪 optimize: 优化组件代码 2023-07-11 17:01:27 +08:00