Commit Graph

2764 Commits

Author SHA1 Message Date
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 f53b9a7480 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-21 10:19:15 +08:00
zhangds 5f8794d741 1)合并maset 2022-11-21 10:19:08 +08:00
zhangds fd661146d9 Merge branch 'master' into couponV2.0 2022-11-21 10:16:48 +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