Commit Graph

2602 Commits

Author SHA1 Message Date
wangsongsole fe72189c83 🎨 style: 修复模板问题 2024-03-21 11:37:24 +08:00
wangsongsole 1e5df28eb4 🎨 style: 组合商品模板样式问题 2024-03-21 10:32:35 +08:00
wangsongsole 0d0e8262be 🔀 merge: 合并分支 2024-03-20 17:51:20 +08:00
zhangds b0701c297c Merge branch 'master' into card-pwd 2024-03-20 17:49:20 +08:00
zhangds 24426b7cec fix: 修复订单列表 2024-03-20 17:40:01 +08:00
zhouxinyu1029 8a1dc4b400 增加分销商禁用 2024-03-20 17:34:28 +08:00
wangsongsole de2339b890 🔖 version: 测试包 2024-03-20 17:03:11 +08:00
wangsongsole e5f12e34b8 feat: 限制自定义通知 2024-03-20 16:01:06 +08:00
zhangds 53f47e1ca3 fix: 修复计划编辑的时候,包码切换报错问题 2024-03-20 15:39:12 +08:00
wangsongsole 5fabc5d453 🎨 style: 优化组合商品模板样式 2024-03-20 14:35:05 +08:00
zhouxinyu1029 4a7a4e66f4 调整弹框样式 2024-03-20 14:21:35 +08:00
zhouxinyu1029 50c1d23c07 隐藏定制提示按钮 2024-03-20 11:54:00 +08:00
wangsongsole 56fcec89cb 🦀️ fix: 修复自定义消息模块抛错问题 2024-03-20 11:35:50 +08:00
zhouxinyu1029 71c273ff89 bug 2024-03-20 11:09:53 +08:00
zhouxinyu1029 160a8d473d 修改bug 2024-03-20 10:47:51 +08:00
zhouxinyu1029 f3519431b8 编辑回填 2024-03-20 10:40:57 +08:00
wangsongsole 60f6f9a72d 🎨 style: 优化样式 2024-03-20 10:36:11 +08:00
zhouxinyu1029 6d9a9b0748 bug修改 2024-03-20 09:06:52 +08:00
zhouxinyu1029 28b47f8306 修改 2024-03-19 19:57:29 +08:00
zhouxinyu1029 2ba7ccb02a 分销商增加邮箱和手机号 2024-03-19 18:05:58 +08:00
wangsongsole ef4cbc8733 🎨 style: 优化样式 2024-03-19 15:14:40 +08:00
zhangds 7ad8c0a3bb fix: 解锁卡密 2024-03-19 10:57:50 +08:00
wangsongsole 3951bba31b feat: 新增特性 2024-03-19 10:48:12 +08:00
zhouxinyu1029 0594777ee2 分销商修改 2024-03-18 16:39:15 +08:00
zhouxinyu1029 4890ae6ba1 分销商修改 2024-03-18 16:25:27 +08:00
wangsongsole 15ef16c6d8 Merge remote-tracking branch 'origin/master' into dynamicPrompt 2024-03-18 10:20:37 +08:00
wangsongsole 80161cd4df 🦀️ fix: 修复bug 2024-03-16 02:23:28 +08:00
wangsongsole 0fe39b9cdf feat: 新建计划增加防暴击 2024-03-16 01:27:46 +08:00
zhangds e2f8f8648c Merge branch 'openType' 2024-03-15 23:21:55 +08:00
zhangds 59088e3d22 fix: 修改兑换码管理 2024-03-15 22:40:11 +08:00
zhangds 5ef3d48c85 fix: 修复立减金 公众号 2024-03-15 22:22:19 +08:00
zhangds c94943d8de fix: 禁止优惠券公众号 2024-03-15 22:03:36 +08:00
wangsongsole 0acafdca20 ♻️ refactor: 重构样式 2024-03-15 20:41:47 +08:00
wangsongsole c61b2e42ba 🦀️ fix: 修复bug 2024-03-15 15:25:57 +08:00
wangsongsole 8780dac0c5 🔖 version: 测试包 2024-03-15 11:30:58 +08:00
wangsongsole f4facb8b6f feat: 调整代码 2024-03-15 11:26:42 +08:00
wangsongsole 9400717476 🔀 merge: 合并分支 2024-03-14 15:45:54 +08:00
wangsongsole 9d353b58a5 🎨 style: 关闭商户私钥复制、增加提示 2024-03-13 16:21:37 +08:00
wangsongsole b030df5963 🔀 merge: 合并master 2024-03-13 14:14:17 +08:00
wangsongsole 9b38c6b1e1 🔖 version: 测试包 2024-03-12 17:34:23 +08:00
wangsongsole a267962699 🔖 version: 镜像包 2024-03-12 16:58:55 +08:00
wangsongsole cbb348dc20 🔖 version: 镜像包 2024-03-12 16:52:14 +08:00
wangsongsole dae0726d28 🔖 version: 镜像包 2024-03-12 16:26:15 +08:00
wangsongsole c5ebe21c80 🔖 version: 测试包 2024-03-12 15:58:08 +08:00
wangsongsole 0878a204a8 🦀️ fix: 修复bug 2024-03-12 15:45:27 +08:00
wangsongsole df986b0465 ♻️ refactor: 营销计划编号限制为16位 2024-03-11 16:35:52 +08:00
wangsongsole 62a33c2bb3 🎨 style: 修复样式bug 2024-03-11 16:20:51 +08:00
wangsongsole 2d44528b3f 🎨 style: 修改文案 2024-03-11 16:13:12 +08:00
wangsongsole 8314bcd6a8 ♻️ refactor: 调整更新日志、帮助中心地址 2024-03-11 14:47:48 +08:00
wangsongsole c8d0d55745 ♻️ refactor: 修改更新日志、帮助中心 文档地址 2024-03-11 14:27:59 +08:00
wangsongsole c6879f8018 🔀 merge: 合并分支 2024-03-11 11:08:58 +08:00
wangsongsole 8fc049c1eb feat: 新增自定义计划id、立减金核销通知功能 2024-03-11 09:20:14 +08:00
zhangds 97e37c3752 fix: 修改图片 2024-03-08 04:24:55 +08:00
zhangds 9700a6acd2 fix: 更新包码 2024-03-07 21:17:55 +08:00
zhangds 765cb5a792 fix: 禁止 卡密 包码 2024-03-07 20:54:00 +08:00
zhangds 1cd766cdd0 fix: 增加订单列表 包码列表 2024-03-07 19:34:49 +08:00
zhangds 0171abe4f6 fix: 修复商品logo label 2024-03-07 15:20:46 +08:00
zhangds 17f3ea9489 fix: 如果是包码,隐藏logo 2024-03-07 15:00:50 +08:00
wangsongsole 3d35591a57 feat: 新增自定义计划编号 2024-03-07 14:14:04 +08:00
zhangds be321f8ff5 fix: 修复maxLength 100 2024-03-07 11:41:09 +08:00
wangsongsole f5965b4a0a 🦀️ fix: 修复微信立减金打开方式回显问题 2024-03-07 09:59:00 +08:00
zhangds e7e880e2d5 fix: 修复新建兑换码 禁用 2024-03-07 09:30:55 +08:00
zhangds 2cfc473d23 fix: 修复兑换码 2024-03-06 22:21:34 +08:00
zhangds 89f2d1742d fix: 修复组合商品为立减金,禁用 2024-03-06 21:12:54 +08:00
zhangds 02c54c9812 fix: 锁定库存 2024-03-06 20:48:25 +08:00
zhangds 7130c5d136 fix: 修复组合商品为立减金,使用成功结算无法添加 2024-03-06 20:36:42 +08:00
wangsongsole 4b4ce49c3d 🔀 merge: 合并分支 2024-03-06 14:26:52 +08:00
wangsongsole 51f358a636 🦀️ fix: 解决组合商品模板报错问题 2024-03-06 14:15:58 +08:00
wangsongsole a9906f78ea 🦀️ fix: 修复分销商商户bug 2024-03-06 13:52:12 +08:00
zhangds 0def09c38d Merge branch 'merchant' into clearingForm 2024-03-06 13:33:02 +08:00
wangsongsole 932d8040fe 💪 optimize: 优化立减金使用说明引用 2024-03-06 10:40:13 +08:00
zhangds 9861444f34 fix: 修复组合商品 2024-03-05 20:07:56 +08:00
zhangds 482f1856ab Merge branch 'flex' into clearingForm 2024-03-05 18:07:23 +08:00
zhangds 1ff519a60d Merge branch 'master' into clearingForm 2024-03-05 17:38:46 +08:00
wangsongsole 8f46242cbc 🦀️ fix: 修复线上bug 2024-03-05 17:31:17 +08:00
wangsongsole b0721b9717 🦀️ fix: 修复复制计划组合商品现在不正常问题 2024-03-05 17:28:15 +08:00
wangsongsole 71f969dcc2 Merge branch 'master' into openType 2024-03-05 16:59:29 +08:00
wangsongsole 1da55200bf Merge branch 'master' into merchant 2024-03-05 16:58:51 +08:00
wangsongsole 73e69f2fc6 🦀️ fix: 修复bug 2024-03-05 16:57:36 +08:00
wangsongsole 89be51a37d 🦀️ fix: 修复bug 2024-03-05 16:38:12 +08:00
wangsongsole 6574631557 🦀️ fix: 修复bug 2024-03-05 15:47:32 +08:00
zhangds f5ca1c6d91 fix: 修改白名单 2024-03-05 11:56:21 +08:00
zhangds df6f9e3621 fix: 增加新增编辑复制,白名单判断 2024-03-05 11:52:20 +08:00
wangsongsole 97958076e1 💪 optimize: 优化微信立减金打开方式 2024-03-05 10:55:38 +08:00
zhangds a7a5159d55 Merge branch 'master' into clearingForm 2024-03-05 10:28:29 +08:00
wangsongsole b4c6cddad9 Merge branch 'master' into merchant 2024-03-05 10:00:06 +08:00
wangsongsole 805a1cc2b4 Merge branch 'master' into openType 2024-03-05 09:59:50 +08:00
zhangds e17c715a2b feat: 增加组合商品 包码兼容 2024-03-04 18:29:30 +08:00
wangsongsole b0738baff5 🎨 style: 优化组合商品模板组件样式 2024-03-04 17:26:03 +08:00
zhangds 73a47ab310 fix: 增加计划id 2024-03-04 16:33:47 +08:00
zhangds b685cd8ca5 fix: 增加key批次plan id 2024-03-04 16:16:52 +08:00
zhangds 84eed85e11 fix: 增加复制的id 2024-03-04 16:10:15 +08:00
wangsongsole 3ad11ac05c 🦀️ fix: 修正兑换码管理-组合商品-发放总量校验问题 2024-03-04 15:45:10 +08:00
zhangds c91eeb39a4 Merge branch 'master' into clearingForm 2024-03-04 15:44:26 +08:00
zhangds 782dac1c5c fix: 兼容 组合商品 2024-03-04 15:39:26 +08:00
wangsongsole a981c4378f 🦀️ fix: 修复bug 2024-03-04 15:30:34 +08:00
wangsongsole 2b6f5a2e5f 🦀️ fix: 修复bug 2024-03-04 15:13:13 +08:00
zhangds afdaf75932 fix: 修复包码列表 2024-03-04 15:06:30 +08:00
wangsongsole d9112d0ee4 🗑️ delete: 删除log 2024-03-04 14:47:21 +08:00
wangsongsole c8662fbd9b feat: 组合商品新增微信立减金打开方式 2024-03-04 14:40:18 +08:00
zhangds d1c9bacb95 fix: 修复 兑换码包码 2024-03-04 14:28:13 +08:00
wangsongsole 5cf00128ea 🎨 style: 优化组合商品模板样式 2024-03-04 11:53:27 +08:00
wangsongsole 462843304e feat: 对接动态商户加密类型 2024-03-04 11:28:07 +08:00
wangsongsole 7e89178ff0 🦀️ fix: 修复bug 2024-03-04 10:50:13 +08:00
wangsongsole 04ab296f0a 🎨 style: 优化组合商品模板样式 2024-03-04 10:23:41 +08:00
wangsongsole c6ff21aa06 🎨 style: 优化样式 2024-03-04 10:21:46 +08:00
wangsongsole f2db850fe4 🔀 merge: 合并分支 2024-03-04 10:14:59 +08:00
zhangds bd401463de fix: 修改编辑 2024-03-03 17:37:06 +08:00
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
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