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,419 Commits 12 Branches 0 Tags 188 MiB
Commit Graph

2288 Commits

Author SHA1 Message Date
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
wangsongsole 0879f03d1e 💩 improvedCode: 改进代码 2023-05-25 11:25:22 +08:00
wangsongsole 998e70a753 🐛 fix: 修复红包组件数据初始化bug 2023-05-25 11:10:43 +08:00
wangsongsole f09d2983cc 🎨 style: 调整代码结构 2023-05-25 11:07:02 +08:00
wangsongsole 09d86694ae 💩 improved code: 改进红包组件代码 2023-05-25 11:05:43 +08:00
wangsongsole 8475495997 ✏️ typos: 修改立减金文案 2023-05-25 11:04:16 +08:00
wangsongsole 91ee8a6295 🚚 comment: 移动文件 2023-05-24 18:08:03 +08:00
wangsongsole 25ca68600f ✨ feat: 新增红包组件 2023-05-24 17:07:34 +08:00
wangsongsole 6e09d0e0c1 ✏️ typos: 修复文案bug 2023-05-24 16:30:14 +08:00
wangsongsole 9c9a76dbb0 🎨 style: 优化优惠券样式 2023-05-24 11:08:19 +08:00
wangsongsole 02511825c1 🔀 merge branches: 合并分支 2023-05-11 13:45:18 +08:00
wangsongsole f92b5ba205 🔧 config: 更改营销系统生产环境域名 2023-05-10 22:54:15 +08:00
wangsongsole ad8bc8da36 🔧 config: 增加配置注释 2023-05-10 17:06:22 +08:00
wangsongsole 87b35add09 🎨 style: 优化代码 2023-05-09 11:25:42 +08:00
wangsongsole b399dfa2ec 🔧 config: 重新配置统一登陆环境域名 2023-05-09 11:14:53 +08:00
wangsongsole c8ed9dc165 ♻️ refactor: 重写token获取方式 2023-05-08 17:48:34 +08:00
wangsongsole ca07160d51 ♻️ refactor: 重写token截取方法 2023-05-08 17:46:22 +08:00
wangsongsole 99c4e81281 🚑️ hotfix: 退回 2023-05-08 17:31:58 +08:00
wangsongsole f458f8f5b5 ✨ feat: 新增订单状态 2023-05-08 15:54:42 +08:00
wangsongsole 6aa6886ba7 ✨ feat: 新增订单状态 2023-05-08 15:54:13 +08:00
wangsongsole 570427fb2f ♻️ refactor: 重写token截取规则 2023-05-08 09:55:11 +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 7a0fa5b76d 🐞 fix: 修复立减金-卡种校验错误 2023-04-25 14:24:07 +08:00
wangsongsole b6b5a96b17 🐞 fix(修复立减金 卡种校验问题): 2023-04-25 14:22:25 +08:00
wangsongsole 9ee415eac4 🌈 style: 跳转跳转路径 2023-04-24 17:27:30 +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 e0ba6a5850 🐞 fix: 修复报错 2023-04-21 09:24:05 +08:00
wangsongsole 67dfc82c29 🦄 refactor:http 状态统一封装 兼容网关,解决报错 2023-04-21 09:12:05 +08:00
wangsongsole 7312d2c1c3 🌈 style: 更换测试环境ip 2023-04-20 18:18:16 +08:00
wangsongsole c85f2f8320 🌈 style:authorization转Authorization 2023-04-20 18:13:40 +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 f82a06162e 🎈 perf: 优化代码 2023-04-19 11:33:09 +08:00
wangsongsole f6bff5d69b 🦄 refactor: 删除备用login 2023-04-19 11:15:52 +08:00
wangsongsole 77d6d91a41 ✨ feat: 删除无用代码 2023-04-19 09:09:20 +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 e4a60c96c1 🐞 fix: 修复统一登录测试环境地址错误 2023-04-18 15:56:55 +08:00
wangsongsole 266952fcf8 ✨ feat: 新增钉钉审批查询接口 2023-04-14 16:36:10 +08:00
wangsongsole ab529880a9 ✨ feat: 新增钉钉审批查询接口 2023-04-14 16:20:19 +08:00
wangsongsole 608d999e70 🎈 perf: 优化代码 2023-04-14 10:53:46 +08:00
wangsongsole 33b6028716 ✨ feat: 统一登录跳转后解析头像 2023-04-14 10:28:17 +08:00
wangsongsole 0de24d258d ✨ feat: 区分环境路径 2023-04-14 10:19:55 +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 74c5100b18 style：立减金组件 满减金额6位限制改成7位 2023-02-08 10:30:02 +08:00
wangsongsole faa91b1599 style：优化代码 2023-02-07 14:25:24 +08:00
wangsongsole 0bc5689133 fix:修复bug 2023-02-07 14:17:15 +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 3a478b61ce style：删除调试 2023-01-04 11:26:13 +08:00
Apple 2edb5a4296 feat:新增订单下载列表删除，下载，查询接口联调 2023-01-04 11:20:31 +08:00
Apple 20932d07dd fix: 修复keys文件上传同一文件无法上传 2023-01-04 09:40:09 +08:00
zhangds b03f7795a6 fix: 修复keys文件上传同一文件无法上传 2023-01-03 15:52:20 +08:00
Apple 372094bf3e fix：keys查询 限制100 业务开放 2023-01-03 15:49:36 +08:00
Apple f264ac900f fix：keys查询 限制100 业务开放 2023-01-03 10:56:04 +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 9614778235 fix:优化filterBar组件联动 2022-12-27 17:59:25 +08:00
Apple 4c6765925b fix:优化filterBar组件，点击document关闭状态菜单悬浮框 2022-12-27 17:03:47 +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 e9e0905e14 fix:优化filterSelect组件，默认不勾选，展示‘请选择’ 2022-12-13 13:58:08 +08:00
Apple 005d6f2f71 feat：订单多选 2022-12-13 12:02:37 +08:00
Apple 2d77e50224 feat:优化下拉选择过滤查询 2022-12-13 10:40:04 +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 52cca11125 feat:优化下拉选择过滤查询 2022-12-02 17:41:54 +08:00
zhangds aee7186813 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-23 03:33:35 +08:00
zhangds b9263aa93d fix: 修复卡密时间选择 2022-11-23 03:33:23 +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
Apple eb26eecfeb fix:[卡密有效期]-》【卡密有效期至】 2022-11-22 10:52:17 +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
zhangds c8d746e4e4 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-17 14:52:19 +08:00
zhangds 5d1a3e765a fix: 修复优惠券管理时间问题 2022-11-17 14:52:04 +08:00
Wind-58 45c423a7e1 fix:修复【立减金商品】预警通知人中，前端未展示后端返回的预警人姓名 2022-11-16 14:49:24 +08:00
zhangds 27ccc88f71 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-11 10:50:15 +08:00
zhangds e617078c63 fix: 修复时间 2022-11-11 10:50:09 +08:00
Apple f4edbea179 fix:优惠券自定义组件删除后，配置视图切换到商品列表页 2022-11-11 10:19:43 +08:00
Apple fb7a49a841 style:优化编辑器代码 2022-11-11 10:09:50 +08:00
zhangds eca3d58c60 fix: 修复兑换码、优惠券时间问题 2022-11-09 17:56:30 +08:00
zhangds aebc2afc9a Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-07 15:26:05 +08:00
Apple 083f1419de fix:修复优惠券列表卷总数->券总数 2022-11-07 15:25:50 +08:00
zhangds 2a7c152a8b Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-07 15:25:32 +08:00
zhangds a0d33c3275 fix: 修复营销计划复制不现实商品编号 2022-11-07 15:25:24 +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 bc0d1a3403 fix: 修改卡密有效期文字 2022-11-02 14:10:34 +08:00
zhangds 5f411474b5 fix: 增加兑换码时间的禁用 2022-11-02 13:53:08 +08:00
zhangds b06cf8f31b fix: 优化时间不能选择当天的时间 2022-11-02 13:48:02 +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 2ea28a13e7 fix: 优化优惠券防抖功能 2022-11-01 10:57:26 +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 8d00f01e46 fix: 增加优惠券按钮防抖 2022-10-31 17:00:55 +08:00
zhangds f6cf046e0e fix: 编辑，新增库存计算 2022-10-31 16:19:51 +08:00
zhangds 84e3cbd5ab fix: 修复立减金库存舍去小数点 2022-10-31 15:55:04 +08:00
zhangds 0a744b0524 fix: 修复立减金复制库存重新计算 2022-10-31 15:43:19 +08:00
zhangds 8b80420d95 fix: 修复优惠券列表查询时间不能超过3年 2022-10-31 11:20:05 +08:00
zhangds ca63c4a6ee Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-28 16:43:26 +08:00
zhangds 07ce002932 fix: 修复优惠券复制删除 id的过程 2022-10-28 16:43:20 +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 885b748419 fix: 修复复制立减金不能编辑 2022-10-27 16:50:48 +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