HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,810 Commits 12 Branches 0 Tags 174 MiB
Commit Graph

1982 Commits

Author SHA1 Message Date
wangsongsole 593b3923c4 ✨ feat: 订单日志增加序号 2024-02-02 15:20:47 +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 de6492a495 🗑️ delete: 移除修改密码模块 2024-01-24 16:09:14 +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 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 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 af0b5e4750 🔀 merge: 合并分支 2023-11-24 10:18:58 +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 8b301a19d7 ✨ feat: 新增通知回调模块 2023-11-15 09:30:59 +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
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 dfbf9893f6 💪 optimize: 优化订单、key批次、系统管理等模块代码 2023-10-10 18:08:47 +08:00
wangsongsole adffd1b368 ✨ feat: 自定义提示模块新增禁用字段 2023-10-10 15:24:23 +08:00
wangsongsole 34b6aa186e 🚸 usability: 优化计划列表展示 2023-10-10 14:00:57 +08:00
wangsongsole 50c7fa48e6 💪 optimize: 优化路由和提示模块代码 2023-10-09 16:26:34 +08:00
wangsongsole 7867aeb1b6 ✨ feat: 新增提取修改提示代码 2023-10-09 13:37:39 +08:00
wangsongsole 32ffcae5e1 ✨ feat: 提取提示变化的数据 2023-10-09 11:47:58 +08:00
wangsongsole 8a841e0621 ✨ feat: 新增定制提示模块 2023-10-08 18:24:46 +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 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 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 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 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 6ee4788617 💪 optimize: 优化兑换码代码-统一商品组件 2023-08-09 10:51:21 +08:00
wangsongsole 3e48af5dfe 🗑️ deprecateCode: 删除key编辑废弃代码 2023-08-09 10:38:35 +08:00
wangsongsole 7f1594600e ✨ feat: 新增兑换码模块本地字段 2023-08-09 10:02:02 +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 2f1cbf6194 ✨ feat: 开启卡密 2023-08-04 10:41:42 +08:00
wangsongsole 98af135aea ✨ feat: 新增key码批量导出 2023-08-03 15:43:02 +08:00
wangsongsole 5c6edcefa4 ✨ feat: 订单列表新增已退回状态 2023-07-28 15:07:08 +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 f5bb524d8f ✨ feat: 权益商品默认商品图 2023-07-25 17:56:24 +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 0f68bc756c 🔀 merge: 合并分支 2023-07-06 09:34:24 +08:00
wangsongsole e05268f630 💊 fix: 修复商品列表直充商品无法删除 2023-06-30 15:53:42 +08:00
wangsongsole 0d118e4a9b 💊 fix: 官方价+合同价保留2位小数 2023-06-29 18:33:54 +08:00
wangsongsole 9e9f07ed4f 💊 fix: 【新增兑换码】商品范围中，随机红包的成本价格展示红包的区间值，固额红包的成本价展示红包的面额 2023-06-29 15:47:50 +08:00
wangsongsole fae314d678 💊 fix: 【订单列表】后端返回了更新时间，但是前端没有展示出来 2023-06-29 11:46:56 +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 bbc1aeee73 💊 fix: 修复bug 2023-06-27 18:21:52 +08:00
wangsongsole d718d199d6 💊 fix: 【订单列表】红包商品类型应该为“兑换码现金红包” 2023-06-27 17:52:01 +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 19ec697640 ✏️ typos: 修改错别字 2023-06-16 15:35:06 +08:00
zhangds a25e842c03 fix：修复交互弹窗样式 2023-06-15 17:23:12 +08:00
zhangds f4e341f6f6 feat: 修改订单显示账号 2023-06-15 15:20:23 +08:00
zhangds ed0d712240 feat: 修复多余文件 2023-06-15 11:27:34 +08:00
zhangds 402d712094 feat: 增加作废查询 2023-06-15 11:08:51 +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 a95fedd39e 💪 optimize: 优化代码 2023-06-09 11:31:46 +08:00
wangsongsole cad0966826 ♻️ refactor: 调整商品范围列表代码 2023-06-09 11:26:37 +08:00
wangsongsole 97fc2a64db 🐛 fix: 修复商品范围权益商品编辑报错 2023-06-02 14:15:52 +08:00
wangsongsole 2f6f7231f9 ✨ feat: 系统模板新增红包类型 2023-06-01 16:14:55 +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 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 91ee8a6295 🚚 comment: 移动文件 2023-05-24 18:08:03 +08:00
wangsongsole b399dfa2ec 🔧 config: 重新配置统一登陆环境域名 2023-05-09 11:14:53 +08:00
wangsongsole ca07160d51 ♻️ refactor: 重写token截取方法 2023-05-08 17:46:22 +08:00
wangsongsole 6aa6886ba7 ✨ feat: 新增订单状态 2023-05-08 15:54:13 +08:00
wangsongsole 701e7b465f 🚑️ hotfix: 修复账号新增、编辑字段报错 2023-04-27 18:20:17 +08:00
wangsongsole 425f667dff 🐛 fix： 子账号字段不存在报错 2023-04-27 17:20:07 +08:00
wangsongsole 799a288849 🦺 新建、编辑子账号只校验账号和手机号 2023-04-27 16:30:29 +08:00
wangsongsole 33300a99a8 🐞 fix: 优化路由跳转 2023-04-23 15:42:00 +08:00
wangsongsole a9d8305424 🐞 fix: 修复token存储先后顺序 2023-04-21 11:08:59 +08:00
wangsongsole 67dfc82c29 🦄 refactor:http 状态统一封装 兼容网关,解决报错 2023-04-21 09:12:05 +08:00
wangsongsole 337416c436 🦄 refactor:使用统一登录token鉴权 2023-04-20 15:02:29 +08:00
wangsongsole aeb028aa61 🦄 refactor: 删除原有登录相关代码 2023-04-19 14:33:59 +08:00
wangsongsole f6bff5d69b 🦄 refactor: 删除备用login 2023-04-19 11:15:52 +08:00
wangsongsole 81d2172252 🎈 perf: 优化代码 2023-04-19 09:04:45 +08:00
wangsongsole 49de04bb5e 🦄 refactor: 重构鉴权 2023-04-18 19:54:02 +08:00
wangsongsole ce6b74da96 🐞 fix: 修复报错 2023-04-18 19:45:33 +08:00
wangsongsole cf60050afc 🐞 fix: 修复统一登录跳转重定向问题 2023-04-18 15:58:59 +08:00
wangsongsole ab529880a9 ✨ feat: 新增钉钉审批查询接口 2023-04-14 16:20:19 +08:00
wangsongsole 33b6028716 ✨ feat: 统一登录跳转后解析头像 2023-04-14 10:28:17 +08:00
wangsongsole ba60f78f69 ✨ feat:对接统一登录权限 2023-04-10 10:38:12 +08:00
wangsongsole 5408190f76 🔧 build: 修改ip 2023-03-29 10:16:39 +08:00
wangsongsole 2bee24ff76 🐞 fix: 修复 订单状态筛选联动问题 2023-03-28 15:54:17 +08:00
wangsongsole ca50107928 🐞 fix: 修复bug 
1、修复订单列表核销选项动态渲染问题
2、修复keys列表计划名称和key批次动态关联问题
 2023-03-28 12:01:28 +08:00
wangsongsole 7ed34f7548 ✨ feat: 新增备用登录路由 2023-03-17 18:22:28 +08:00
wangsongsole 065e302f67 🎈 perf: 优化代码 2023-03-17 11:06:27 +08:00
wangsongsole 95c671173d 🌈 style: 优化文案 2023-03-15 11:04:20 +08:00
wangsongsole ff3f1cf53a 🌈 style: 备份原有login 2023-03-15 09:50:23 +08:00
wangsongsole 4a08f542b8 ✨ feat: 对接营销系统 2023-03-14 20:34:28 +08:00
wangsongsole 5244282e09 🐞 fix: 修复路径token校验bug 2023-03-14 19:23:34 +08:00
wangsongsole b2a6982c37 ✨ feat: 修改登录页面 调试单点登录 2023-03-14 11:06:25 +08:00
wangsongsole 2014e172af 🌈 style(所有模块): 优化代码 2023-03-02 10:30:13 +08:00
Apple 3c553632f1 Merge branch 'master' into feature_orderlist 
* master: (26 commits)
  style：立减金组件 满减金额6位限制改成7位
  style：优化代码
  fix:修复bug
  feat：新增keys列表 新增key批次筛选
  fix: 营销计划生成key白名单文件上传无地址
  fix: 修复时间
  feat：优化包体积大小，删除无效引用
  feat：下载增加导出加载效果
  feat:订单下载导出列表提交测试
  优化打包体积
  优化打包体积
  feat:增加订单下载任务状态
  修改api地址
  feat:导出订单成功后挑战订单下载列表
  1) 修复兑换码管理，编辑生效时间应该在归属计划时间内
  style：删除调试
  feat:新增订单下载列表删除，下载，查询接口联调
  fix: 修复keys文件上传同一文件无法上传
  fix：keys查询  限制100 业务开放
  style：调整导出订单列表【删除】按钮禁用样式
  ...

# Conflicts:
#	src/pages/order/list/list.js
 2023-02-15 10:34:21 +08:00
wangsongsole faa91b1599 style：优化代码 2023-02-07 14:25:24 +08:00
wangsongsole 58eee21137 feat：新增keys列表 新增key批次筛选 2023-02-07 14:10:41 +08:00
zhangds 43a6b96d1a fix: 营销计划生成key白名单文件上传无地址 2023-01-11 15:05:28 +08:00
zhangds 6bf8e740ef fix: 修复时间 2023-01-06 18:15:15 +08:00
Apple 77ba3d3501 feat：优化包体积大小，删除无效引用 2023-01-05 15:01:07 +08:00
Apple 5404552b6b feat：下载增加导出加载效果 2023-01-04 18:03:52 +08:00
Apple 5bd4201b2d feat:订单下载导出列表提交测试 2023-01-04 17:51:27 +08:00
Apple 12457e6569 feat:增加订单下载任务状态 2023-01-04 15:04:24 +08:00
Apple 46ac80198e feat:导出订单成功后挑战订单下载列表 2023-01-04 11:37:16 +08:00
Apple 2edb5a4296 feat:新增订单下载列表删除，下载，查询接口联调 2023-01-04 11:20:31 +08:00
Apple 372094bf3e fix：keys查询 限制100 业务开放 2023-01-03 15:49:36 +08:00
Apple 1aa782c195 style：调整导出订单列表【删除】按钮禁用样式 2023-01-03 10:47:50 +08:00
Apple 916dfb3514 style:优化订单下载列表模块样式 2022-12-30 16:16:51 +08:00
Apple 99dfe397a6 feat:订单下载列表增加导出 2022-12-30 11:44:28 +08:00
Apple c6d19b339f feat:完善订单下载列表页面 2022-12-30 11:27:45 +08:00
Apple fd8d0ac740 style:调整订单下载列表样式 2022-12-29 18:17:28 +08:00
Apple 82182d9367 feat:增加营销系统订单下载列表静态页面 2022-12-29 18:14:25 +08:00
Apple 732971d6e7 feat:增加订单下载列表静态页面 2022-12-29 18:11:26 +08:00
Apple c01154a4f9 fix：立减金核销状态，（已过期：3）展示为（未核销：1） 2022-12-29 11:13:16 +08:00
Apple 2a4229e53a fix:修复营销系统模板中心面包屑错乱bug 2022-12-28 10:52:46 +08:00
Apple b2e2ecab2b fix:解决标签引用报错 2022-12-27 18:03:30 +08:00
Apple c69a2a5b7f feat:订单列表增加立减金核销状态voucher_status 2022-12-27 14:40:03 +08:00
Apple 8f921eaed9 fix：修改订单核销状态名次 2022-12-26 16:06:01 +08:00
wangsongsole 7adf694859 fix:修复订单导出未传部分字段bug 
feat：新增订单状态、支付状态多选
feat：新增订单表格字段
 2022-12-13 17:54:32 +08:00
Apple 005d6f2f71 feat：订单多选 2022-12-13 12:02:37 +08:00
Apple b518bcea8e fix:提换二维码工具地址，线上发版 2022-12-12 11:19:32 +08:00
Apple 236d6dc133 fix：提换二维码工具地址 2022-12-10 14:39:16 +08:00
Apple d7b8d7531c style:优化二维码工具样式 2022-12-10 10:05:10 +08:00
Apple 3af22afb8d feat:线上增加二维码小工具 2022-12-09 17:33:24 +08:00
Apple b4c816b771 fix：兼容历史订单无商品类型，显示/ 2022-11-23 02:45:16 +08:00
zhangds 6f6031aab6 fix: 删除本地存储时间datetime 改用knockGold_effectDate 2022-11-23 02:27:45 +08:00
zhangds 615d377526 fix: 增加字段说明 2022-11-22 15:34:35 +08:00
zhangds 6cf9c96698 fix: 1) 修复优惠券、兑换码列表审核中启用停用状态为old_status 2022-11-22 15:22:56 +08:00
zhangds 2a45863a06 fix: 1).修复优惠券列表启用停用展示 2). 修复审核中状态作废至灰 2022-11-22 14:34:56 +08:00
zhangds 5f8794d741 1）合并maset 2022-11-21 10:19:08 +08:00
Apple bf97273c3e fix:处理优惠券列表页面空白，路由匹配bug 2022-11-19 10:24:26 +08:00
Apple f4edbea179 fix:优惠券自定义组件删除后，配置视图切换到商品列表页 2022-11-11 10:19:43 +08:00
Apple fb7a49a841 style:优化编辑器代码 2022-11-11 10:09:50 +08:00
Apple 083f1419de fix:修复优惠券列表卷总数->券总数 2022-11-07 15:25:50 +08:00
wangsongsole 362edb14be Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-07 14:09:09 +08:00
wangsongsole 3fd5718356 fix:修复复制兑换码时 立减金不应该存在商品ID 2022-11-07 14:09:07 +08:00
Apple 3ac8055ead style：调整编辑器输入框展位图样式 2022-11-07 10:55:37 +08:00
Apple 4485c2fa46 style：营销系统编辑器样式美化 2022-11-04 11:11:54 +08:00
zhangds bfb43d57ae fix: 删除无用控制台输出 2022-11-03 15:22:43 +08:00
zhangds cfdff429da flx: 绑定类型为优惠券锁定域名 2022-11-02 17:01:23 +08:00
zhangds a395eef12e fix: 修复计划提交 2022-11-02 11:22:38 +08:00
zhangds e79b2df5e2 fix: 增加批次卡密时间 2022-11-02 10:25:17 +08:00
zhangds 02f9c97b28 fix: 增加计划卡密兑换 2022-11-01 18:25:19 +08:00
zhangds d58dd8e6a8 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-01 17:24:19 +08:00
zhangds f842d644d2 fix: 增加优惠券兑换时间 2022-11-01 17:23:59 +08:00
wangsongsole f43f833703 fix:修复【后台】充值失败订单，不展示改为成功button。 2022-11-01 14:00:56 +08:00
wangsongsole 92ef1332f1 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-01 13:51:14 +08:00
wangsongsole df117412ec fix:卡密订单，在订单详情中，不展示充值账号 2022-11-01 13:51:12 +08:00
zhangds e21637338f fix: 修复key批次审核驳回不能编辑的问题 2022-11-01 10:40:20 +08:00
zhangds f645700e25 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-01 09:48:54 +08:00
zhangds 96e333acdc fix: 修复立减金库存校验 优惠券列表出现222 2022-11-01 09:48:47 +08:00
wangsongsole d2262ea923 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-31 18:19:16 +08:00
wangsongsole 0f7e6fcfa8 fix:订单列表 卡密订单隐藏卡密订单账号 2022-10-31 18:19:14 +08:00
zhangds 8b80420d95 fix: 修复优惠券列表查询时间不能超过3年 2022-10-31 11:20:05 +08:00
wangsongsole 705fd8dff3 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-28 16:20:31 +08:00
wangsongsole dbdf4f80ae fix:修复兑换码列表条件查询 翻页数据未重置 2022-10-28 16:20:29 +08:00
zhangds eb7328938c Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-28 16:17:48 +08:00
zhangds 9d6268d4f7 fix: 修复优惠券列表查询重置 2022-10-28 16:17:36 +08:00
Apple bf1f020245 fix:修改订单管理列表字段名词修改，“减扣价（元）”修改为“减扣（元）”，“结算价（元）”修改为“券后价（元）” 2022-10-28 14:01:10 +08:00
Apple 1e77ffaef9 fix：编辑器商品列表页自定义组件配置后，切换页面配置，配置导航归为商品列表页 2022-10-28 11:44:47 +08:00
wangsongsole 73c5188a37 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-28 10:20:13 +08:00
wangsongsole a1f8d69f9d fix：修复【后台】【兑换码】创建中兑换码，生效开始时间不能编辑。 2022-10-28 10:20:11 +08:00
zhangds 6e0cf6c90a fix: 修复营销计划兑换码验证 2022-10-27 16:33:17 +08:00
zhangds d0a88f6726 fix: 修复计划编辑只能编辑一次 2022-10-27 16:03:49 +08:00
zhangds 0e358ce147 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-27 15:48:50 +08:00
zhangds 9ca647b8d5 fix: 修复key批次绑定对象 2022-10-27 15:48:43 +08:00
wangsongsole f5010cb4fa Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-27 15:36:51 +08:00
wangsongsole 5ec14fcfce fix：修复兑换码权益商品编辑时 未通过数据库存展示不正常bug 2022-10-27 15:36:49 +08:00
zhangds 5258d98c60 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-27 15:13:36 +08:00
zhangds 76e3c6a72c fix: 修复批次创建设置 2022-10-27 15:13:30 +08:00
wangsongsole 7e56f4268f fix：修复新增兑换码批次，商品类型放在映射商品上面，并且在请求分销商授权商品接口时，前端未传商品分类的type值 2022-10-27 14:42:17 +08:00
wangsongsole 463301398c Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-27 13:36:16 +08:00
wangsongsole e61b6a44a7 style:调整新建商品组件布局 2022-10-27 13:36:14 +08:00