Commit Graph

  • 5404552b6b feat:下载增加导出加载效果 Apple 2023-01-04 18:03:52 +0800
  • 5bd4201b2d feat:订单下载导出列表提交测试 Apple 2023-01-04 17:51:27 +0800
  • 572e85f5be 优化打包体积 zhangds 2023-01-04 16:33:18 +0800
  • cb2ca9b741 优化打包体积 zhangds 2023-01-04 16:13:31 +0800
  • 12457e6569 feat:增加订单下载任务状态 Apple 2023-01-04 15:04:24 +0800
  • 498ab4a46b 修改api地址 zhangds 2023-01-04 13:38:14 +0800
  • 46ac80198e feat:导出订单成功后挑战订单下载列表 Apple 2023-01-04 11:37:16 +0800
  • 1b252b053d 1) 修复兑换码管理,编辑生效时间应该在归属计划时间内 zhangds 2023-01-04 11:35:34 +0800
  • 3a478b61ce style:删除调试 Apple 2023-01-04 11:26:13 +0800
  • 2edb5a4296 feat:新增订单下载列表删除,下载,查询接口联调 Apple 2023-01-04 11:20:31 +0800
  • 20932d07dd fix: 修复keys文件上传同一文件无法上传 Apple 2023-01-04 09:40:09 +0800
  • b03f7795a6 fix: 修复keys文件上传同一文件无法上传 zhangds 2023-01-03 15:52:20 +0800
  • 372094bf3e fix:keys查询 限制100 业务开放 Apple 2023-01-03 15:49:36 +0800
  • f264ac900f fix:keys查询 限制100 业务开放 Apple 2023-01-03 10:56:04 +0800
  • 1aa782c195 style:调整导出订单列表【删除】按钮禁用样式 Apple 2023-01-03 10:47:50 +0800
  • 916dfb3514 style:优化订单下载列表模块样式 Apple 2022-12-30 16:16:51 +0800
  • 99dfe397a6 feat:订单下载列表增加导出 Apple 2022-12-30 11:44:28 +0800
  • c6d19b339f feat:完善订单下载列表页面 Apple 2022-12-30 11:27:45 +0800
  • fd8d0ac740 style:调整订单下载列表样式 Apple 2022-12-29 18:17:28 +0800
  • 82182d9367 feat:增加营销系统订单下载列表静态页面 Apple 2022-12-29 18:14:25 +0800
  • 732971d6e7 feat:增加订单下载列表静态页面 Apple 2022-12-29 18:11:26 +0800
  • c01154a4f9 fix:立减金核销状态,(已过期:3)展示为(未核销:1) Apple 2022-12-29 11:13:16 +0800
  • 2a4229e53a fix:修复营销系统模板中心面包屑错乱bug Apple 2022-12-28 10:52:46 +0800
  • b2e2ecab2b fix:解决标签引用报错 Apple 2022-12-27 18:03:30 +0800
  • 9614778235 fix:优化filterBar组件联动 Apple 2022-12-27 17:59:25 +0800
  • 4c6765925b fix:优化filterBar组件,点击document关闭状态菜单悬浮框 Apple 2022-12-27 17:03:47 +0800
  • c69a2a5b7f feat:订单列表增加立减金核销状态voucher_status Apple 2022-12-27 14:40:03 +0800
  • 8f921eaed9 fix:修改订单核销状态名次 Apple 2022-12-26 16:06:01 +0800
  • 7adf694859 fix:修复订单导出未传部分字段bug feat:新增订单状态、支付状态多选 feat:新增订单表格字段 wangsongsole 2022-12-13 17:54:32 +0800
  • e9e0905e14 fix:优化filterSelect组件,默认不勾选,展示‘请选择’ Apple 2022-12-13 13:58:08 +0800
  • 005d6f2f71 feat:订单多选 Apple 2022-12-13 12:02:37 +0800
  • 2d77e50224 feat:优化下拉选择过滤查询 Apple 2022-12-13 10:40:04 +0800
  • b518bcea8e fix:提换二维码工具地址,线上发版 Apple 2022-12-12 11:19:32 +0800
  • 236d6dc133 fix:提换二维码工具地址 Apple 2022-12-10 14:39:16 +0800
  • d7b8d7531c style:优化二维码工具样式 Apple 2022-12-10 10:05:10 +0800
  • 3af22afb8d feat:线上增加二维码小工具 Apple 2022-12-09 17:33:24 +0800
  • 52cca11125 feat:优化下拉选择过滤查询 Apple 2022-12-02 17:41:54 +0800
  • aee7186813 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-11-23 03:33:35 +0800
  • b9263aa93d fix: 修复卡密时间选择 zhangds 2022-11-23 03:33:23 +0800
  • b4c816b771 fix:兼容历史订单无商品类型,显示/ Apple 2022-11-23 02:45:16 +0800
  • 6f6031aab6 fix: 删除本地存储时间datetime 改用knockGold_effectDate zhangds 2022-11-23 02:27:45 +0800
  • 615d377526 fix: 增加字段说明 zhangds 2022-11-22 15:34:35 +0800
  • 6cf9c96698 fix: 1) 修复优惠券、兑换码列表审核中启用停用状态为old_status zhangds 2022-11-22 15:22:56 +0800
  • 2a45863a06 fix: 1).修复优惠券列表启用停用展示 2). 修复审核中状态作废至灰 zhangds 2022-11-22 14:34:56 +0800
  • eb26eecfeb fix:[卡密有效期]-》【卡密有效期至】 Apple 2022-11-22 10:52:17 +0800
  • f53b9a7480 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-11-21 10:19:15 +0800
  • 5f8794d741 1)合并maset zhangds 2022-11-21 10:19:08 +0800
  • fd661146d9 Merge branch 'master' into couponV2.0 zhangds 2022-11-21 10:16:48 +0800
  • bf97273c3e fix:处理优惠券列表页面空白,路由匹配bug Apple 2022-11-19 10:24:26 +0800
  • c8d746e4e4 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-11-17 14:52:19 +0800
  • 5d1a3e765a fix: 修复优惠券管理时间问题 zhangds 2022-11-17 14:52:04 +0800
  • 45c423a7e1 fix:修复【立减金商品】预警通知人中,前端未展示后端返回的预警人姓名 Wind-58 2022-11-16 14:49:24 +0800
  • 27ccc88f71 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-11-11 10:50:15 +0800
  • e617078c63 fix: 修复时间 zhangds 2022-11-11 10:50:09 +0800
  • f4edbea179 fix:优惠券自定义组件删除后,配置视图切换到商品列表页 Apple 2022-11-11 10:19:43 +0800
  • fb7a49a841 style:优化编辑器代码 Apple 2022-11-11 10:09:50 +0800
  • eca3d58c60 fix: 修复兑换码、优惠券时间问题 zhangds 2022-11-09 17:56:30 +0800
  • aebc2afc9a Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-11-07 15:26:05 +0800
  • 083f1419de fix:修复优惠券列表卷总数->券总数 Apple 2022-11-07 15:25:50 +0800
  • 2a7c152a8b Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-11-07 15:25:32 +0800
  • a0d33c3275 fix: 修复营销计划复制不现实商品编号 zhangds 2022-11-07 15:25:24 +0800
  • 362edb14be Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-11-07 14:09:09 +0800
  • 3fd5718356 fix:修复复制兑换码时 立减金不应该存在商品ID wangsongsole 2022-11-07 14:09:07 +0800
  • 3ac8055ead style:调整编辑器输入框展位图样式 Apple 2022-11-07 10:55:37 +0800
  • 4485c2fa46 style:营销系统编辑器样式美化 Apple 2022-11-04 11:11:54 +0800
  • bfb43d57ae fix: 删除无用控制台输出 zhangds 2022-11-03 15:22:43 +0800
  • cfdff429da flx: 绑定类型为优惠券锁定域名 zhangds 2022-11-02 17:01:23 +0800
  • bc0d1a3403 fix: 修改卡密有效期文字 zhangds 2022-11-02 14:10:34 +0800
  • 5f411474b5 fix: 增加兑换码时间的禁用 zhangds 2022-11-02 13:53:08 +0800
  • b06cf8f31b fix: 优化时间不能选择当天的时间 zhangds 2022-11-02 13:48:02 +0800
  • a395eef12e fix: 修复计划提交 zhangds 2022-11-02 11:22:38 +0800
  • e79b2df5e2 fix: 增加批次卡密时间 zhangds 2022-11-02 10:25:17 +0800
  • 02f9c97b28 fix: 增加计划卡密兑换 zhangds 2022-11-01 18:25:19 +0800
  • d58dd8e6a8 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-11-01 17:24:19 +0800
  • f842d644d2 fix: 增加优惠券兑换时间 zhangds 2022-11-01 17:23:59 +0800
  • f43f833703 fix:修复【后台】充值失败订单,不展示改为成功button。 wangsongsole 2022-11-01 14:00:56 +0800
  • 92ef1332f1 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-11-01 13:51:14 +0800
  • df117412ec fix:卡密订单,在订单详情中,不展示充值账号 wangsongsole 2022-11-01 13:51:12 +0800
  • 2ea28a13e7 fix: 优化优惠券防抖功能 zhangds 2022-11-01 10:57:26 +0800
  • e21637338f fix: 修复key批次审核驳回不能编辑的问题 zhangds 2022-11-01 10:40:20 +0800
  • f645700e25 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-11-01 09:48:54 +0800
  • 96e333acdc fix: 修复立减金库存校验 优惠券列表出现222 zhangds 2022-11-01 09:48:47 +0800
  • d2262ea923 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-10-31 18:19:16 +0800
  • 0f7e6fcfa8 fix:订单列表 卡密订单隐藏卡密订单账号 wangsongsole 2022-10-31 18:19:14 +0800
  • 8d00f01e46 fix: 增加优惠券按钮防抖 zhangds 2022-10-31 17:00:55 +0800
  • f6cf046e0e fix: 编辑,新增库存计算 zhangds 2022-10-31 16:19:51 +0800
  • 84e3cbd5ab fix: 修复立减金库存舍去小数点 zhangds 2022-10-31 15:55:04 +0800
  • 0a744b0524 fix: 修复立减金复制库存重新计算 zhangds 2022-10-31 15:43:19 +0800
  • 8b80420d95 fix: 修复优惠券列表查询时间不能超过3年 zhangds 2022-10-31 11:20:05 +0800
  • ca63c4a6ee Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-28 16:43:26 +0800
  • 07ce002932 fix: 修复优惠券复制删除 id的过程 zhangds 2022-10-28 16:43:20 +0800
  • 705fd8dff3 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-10-28 16:20:31 +0800
  • dbdf4f80ae fix:修复兑换码列表条件查询 翻页数据未重置 wangsongsole 2022-10-28 16:20:29 +0800
  • eb7328938c Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-28 16:17:48 +0800
  • 9d6268d4f7 fix: 修复优惠券列表查询重置 zhangds 2022-10-28 16:17:36 +0800
  • bf1f020245 fix:修改订单管理列表字段名词修改,“减扣价(元)”修改为“减扣(元)”,“结算价(元)”修改为“券后价(元)” Apple 2022-10-28 14:01:10 +0800
  • 1e77ffaef9 fix:编辑器商品列表页自定义组件配置后,切换页面配置,配置导航归为商品列表页 Apple 2022-10-28 11:44:47 +0800
  • 73c5188a37 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-10-28 10:20:13 +0800
  • a1f8d69f9d fix:修复【后台】【兑换码】创建中兑换码,生效开始时间不能编辑。 wangsongsole 2022-10-28 10:20:11 +0800
  • 885b748419 fix: 修复复制立减金不能编辑 zhangds 2022-10-27 16:50:48 +0800