Commit Graph

2255 Commits

Author SHA1 Message Date
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
wangsongsole f9c2b645be 💪 optimize: 优化代码 2023-07-11 16:41:54 +08:00
wangsongsole 627a9ec1ea feat: 新增云闪付类型红包校验 2023-07-11 16:39:39 +08:00
wangsongsole 9def625eef 💊 fix: 修复云闪付模板标题未动态展示 2023-07-11 15:44:06 +08:00
wangsongsole d90bb154e3 feat: 新增云闪付模块,并新增商品类型枚举 2023-07-11 14:29:40 +08:00
wangsongsole 79785be9f8 💊 fix: 修复字段错误 2023-07-07 20:39:49 +08:00
wangsongsole 11f50b3fab 💊 fix: 修复订单查询字段空格问题 2023-07-07 20:33:17 +08:00
wangsongsole 3c296ce848 💊 fix: 修复订单列表条件查询抖动问题 2023-07-07 20:29:40 +08:00
wangsongsole f0cc0e2c85 💊 fix: 修复订单条件清除时报错 2023-07-07 20:13:30 +08:00
wangsongsole c4234b9a57 feat: 订单列表新增查询条件 2023-07-07 19:56:04 +08:00
wangsongsole bf2f870aa4 feat: 营销计划名称新增校验规则 2023-07-07 13:54:37 +08:00
wangsongsole 5891e5d443 🚸 usability: 优化用户体验 2023-07-06 14:51:43 +08:00
wangsongsole bd4c4846be feat: 营销计划名称增加校验 2023-07-06 13:56:24 +08:00
wangsongsole d94e125bea ♻️ refactor: 禁用红包组件选择微信渠道 2023-07-06 09:48:12 +08:00
wangsongsole 9a0162fe84 💪 optimize: 优化代码 2023-07-06 09:42:12 +08:00
wangsongsole 0f68bc756c 🔀 merge: 合并分支 2023-07-06 09:34:24 +08:00
wangsongsole 1c073f7511 ♻️ refactor: 禁用红包组件选择微信渠道 2023-07-06 09:08:28 +08:00
wangsongsole e05268f630 💊 fix: 修复商品列表直充商品无法删除 2023-06-30 15:53:42 +08:00
wangsongsole b62e2ee2e4 🎨 style: 红包模板金额动态计算大小 2023-06-30 11:44:58 +08:00
wangsongsole e5dc183139 💪 optimize: 红包批次号UUID长度优化 2023-06-30 10:35:11 +08:00
wangsongsole 52ab4669f4 feat:
1、新增刷新红包批次号特性
2、uuid生成规则更唯一
2023-06-30 10:33:06 +08:00
wangsongsole 0d118e4a9b 💊 fix: 官方价+合同价保留2位小数 2023-06-29 18:33:54 +08:00
wangsongsole 9dac1a4948 ✏️ typos: 更改红包校验提示 2023-06-29 18:05:10 +08:00
wangsongsole 0fe0c5f978 💪 optimize: 优化代码 2023-06-29 17:51:07 +08:00
wangsongsole 80635ea7c4 💊 fix: 修复bug 2023-06-29 17:44:30 +08:00
wangsongsole 733494439b 💊 fix: 修复bug 2023-06-29 17:39:59 +08:00
wangsongsole 112c07da8c 💊 fix: 【新增红包】用户可领个数为红包总数,但是目前只能输入4位数字 2023-06-29 15:49:29 +08:00
wangsongsole 9e9f07ed4f 💊 fix: 【新增兑换码】商品范围中,随机红包的成本价格展示红包的区间值,固额红包的成本价展示红包的面额 2023-06-29 15:47:50 +08:00
wangsongsole 3c607b1e3f 💊 fix: 修复红包表达校验 2023-06-29 15:42:00 +08:00
wangsongsole 9fca5fad96 💊 fix: 【后台】作废key,兑换码时,有待领取/待发放订单时,提示增加一个待发放订单状态。 2023-06-29 13:59:59 +08:00
wangsongsole 349cd527b2 💊 fix: 修复官方价和合同价展示问题 2023-06-29 13:45:58 +08:00
wangsongsole fae314d678 💊 fix: 【订单列表】后端返回了更新时间,但是前端没有展示出来 2023-06-29 11:46:56 +08:00
wangsongsole 0a9b637d8a 💊 fix: 修复【新增红包】随机红包,输入最大面额,大于了前端计算的最大面额值时,应该不允许提交 2023-06-29 11:28:10 +08:00
wangsongsole 38f27f606a 💊 fix: 修复用户可领个数为红包总数,但是目前只能输入4位数字 2023-06-29 11:14:18 +08:00
wangsongsole 9ede3c86f4 💊 fix: 修复下载列表问题 2023-06-29 11:04:23 +08:00
wangsongsole cf88118f8a ⚰️ removeCode: 删除多余表头 2023-06-28 11:45:04 +08:00
wangsongsole 3ce77614e0 🎨 style: 优化代码 2023-06-28 10:51:26 +08:00
wangsongsole bbc1aeee73 💊 fix: 修复bug 2023-06-27 18:21:52 +08:00
wangsongsole d718d199d6 💊 fix: 【订单列表】红包商品类型应该为“兑换码现金红包” 2023-06-27 17:52:01 +08:00
wangsongsole 6cda0714a0 💊 fix: 修复bug 2023-06-27 14:28:47 +08:00
wangsongsole 582d25159d feat: 红包模板中新增使用时间 2023-06-27 13:55:57 +08:00
wangsongsole 9365f10ed5 💊 fix: 修复每月红包领取校验 2023-06-27 09:53:47 +08:00
wangsongsole 61bd2d0e9c 🚑️ hotfix: 修复红包组件校验bug 2023-06-27 09:50:18 +08:00
wangsongsole 6ae2d4ae52 ✏️ typos: 优化文案 2023-06-26 17:20:02 +08:00
wangsongsole fc700e6fc4 💊 fix: 修复单天预算发放上限需要小于或等于总预算 2023-06-26 16:31:26 +08:00
wangsongsole 672bfe3d29 ✏️ typos: 修改文案 2023-06-26 16:16:21 +08:00
wangsongsole 7a459f94c1 💊 fix: 修复固额限制 2023-06-26 16:10:10 +08:00
wangsongsole e23fb84108 feat: 红包个数限制10w个 2023-06-26 15:48:51 +08:00
wangsongsole 7ce3aa8649 💊 fix: 修复立减金商品id展示错误 2023-06-26 15:13:43 +08:00
wangsongsole a03f3feb7e 💊 fix: 云效bug 2023-06-26 15:11:43 +08:00
wangsongsole 522274def8 feat: 对接订单现金红包接口 2023-06-26 10:27:32 +08:00
wangsongsole 40cc0153b7 💪 optimize: 调整红包组件最大最小值 2023-06-25 15:26:16 +08:00
wangsongsole af279f5b8f 🎨 style: 优化样式 2023-06-16 15:39:30 +08:00
wangsongsole 19ec697640 ✏️ typos: 修改错别字 2023-06-16 15:35:06 +08:00
wangsongsole 7d760b3a3b 🚧 work: 修改路由 2023-06-16 15:23:57 +08:00
wangsongsole 970368b1a0 💪 optimize: 优化代码 2023-06-16 14:54:21 +08:00
zhangds a25e842c03 fix:修复交互弹窗样式 2023-06-15 17:23:12 +08:00
wangsongsole 43710e04c2 🎨 style: 优化样式 2023-06-15 17:13:00 +08:00
zhangds f4e341f6f6 feat: 修改订单显示账号 2023-06-15 15:20:23 +08:00
zhangds 27272c8992 feat: 添加错误弹窗 2023-06-15 11:34:18 +08:00
zhangds ed0d712240 feat: 修复多余文件 2023-06-15 11:27:34 +08:00
zhangds ac83f22fc2 Merge branch 'searchV2.3.8' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into searchV2.3.8 2023-06-15 11:11:03 +08:00
zhangds 402d712094 feat: 增加作废查询 2023-06-15 11:08:51 +08:00
wangsongsole 529ce84be7 🎨 style: 找回丢失样式 2023-06-15 11:02:38 +08:00
zhangds ba31f1fd81 feat: 增加key批次查询 2023-06-15 10:29:18 +08:00
zhangds a31fb804dc fix: 删除无用代码 2023-06-15 10:12:23 +08:00
zhangds 9ac3f9ca49 feat: 批量上传作废 2023-06-15 09:46:54 +08:00
zhangds 54735790a8 feat: 增加批量作废接口查询 2023-06-15 09:44:08 +08:00
zhangds 2d841bf21f feat: 增加key查询作废 2023-06-14 17:50:19 +08:00
zhangds 4ca72636b4 feat: 1.增加兑换码,优惠券作废新查询接口 2023-06-14 17:04:32 +08:00
zhangds ae6b85d9f6 feat: 增加key批次作废,查询待领取接口 2023-06-14 16:52:06 +08:00
wangsongsole bcc684ce11 🗑️ deprecateCode: 删除红包模板多余代码 2023-06-13 10:25:20 +08:00
wangsongsole 13860d40e3 ♻️ refactor: 红包祝福语改为32位 2023-06-13 09:11:22 +08:00
wangsongsole e3fe3d1380 🚑️ hotfix: 修复红包富文本组件数据渲染问题 2023-06-09 11:56:36 +08:00
wangsongsole a95fedd39e 💪 optimize: 优化代码 2023-06-09 11:31:46 +08:00
wangsongsole cad0966826 ♻️ refactor: 调整商品范围列表代码 2023-06-09 11:26:37 +08:00
wangsongsole 96581eed80 💊 fix: 修复字段丢失 2023-06-08 09:06:04 +08:00
wangsongsole 83b737e3db 🚸 usability: uuid随机生成为无规则 2023-06-02 16:57:34 +08:00
wangsongsole ec5de7fbd9 ⚰️ removeCode: 优化代码 2023-06-02 14:19:18 +08:00
wangsongsole 97fc2a64db 🐛 fix: 修复商品范围权益商品编辑报错 2023-06-02 14:15:52 +08:00
wangsongsole f99a6e3032 🎨 style: 调整红包样式优化戴安 2023-06-02 10:54:00 +08:00
wangsongsole 62e4fb17b3 🎨 style: 优化样式 2023-06-02 10:39:21 +08:00
wangsongsole a40c510591 🎨 style: 修改红包样式 2023-06-01 18:29:08 +08:00
wangsongsole aeb8dce8ee feat: 红包组件新增祝福语字段 2023-06-01 18:06:24 +08:00
wangsongsole 2f6f7231f9 feat: 系统模板新增红包类型 2023-06-01 16:14:55 +08:00
wangsongsole 374d21f462 🚸 usability: 优化红包组件样式 2023-06-01 15:13:21 +08:00
wangsongsole 731b5bcb78 🎈 per: 优化代码 2023-06-01 14:14:48 +08:00
wangsongsole e6a32a6e24 🎈 per: 优化兑换码编辑、新增、复制代码 2023-06-01 14:04:27 +08:00
wangsongsole 7b0e2f2fb8 ✏️ typos: 表格 立减金平台批次号->平台批次号 2023-06-01 13:42:39 +08:00
wangsongsole ebc94cfb13 ⚰️ removeCode: 删除log 2023-06-01 13:34:53 +08:00
wangsongsole f3124da762 🚸 usability: 商品范围列表 红包类型字段更正为(随机红包/固额红包) 2023-06-01 11:47:29 +08:00
wangsongsole 427b319678 feat: 提交营销计划红包代码 2023-06-01 11:12:50 +08:00
wangsongsole e76be05a7b 🎈 per: 整合兑换码-红包代码。并修复红包组件bug 2023-05-31 14:06:38 +08:00
wangsongsole e4c0040df9 ⚰️ removeCode: 删除废弃代码 2023-05-31 10:19:24 +08:00
wangsongsole e1515d5bcd ♻️ refactor: 重构红包模块代码结构 2023-05-31 10:18:48 +08:00
wangsongsole 0abd6183cb 🎈 per: 优化兑换码红包、立减金新增按钮反应速度 2023-05-30 16:24:30 +08:00
wangsongsole 569eb3b11d feat: 完成红包组件编写,并编写部分兑换码新增、编辑、复制代码逻辑 2023-05-30 15:35:34 +08:00
wangsongsole 01a752f796 🐛 fix: 修复bug 2023-05-29 14:48:49 +08:00
wangsongsole cf06f7a593 🚸 usability: 优化立减金、红包组件样式 2023-05-25 14:52:51 +08:00