Commit Graph

1926 Commits

Author SHA1 Message Date
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
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
zhangds 38b6f766f5 fix: 修复新建计划落地页错误问题 2022-10-27 10:39:12 +08:00
zhangds 599c6e8b76 fix: 修复key批次已作废不能复制 2022-10-27 09:57:32 +08:00