Commit Graph

2277 Commits

Author SHA1 Message Date
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 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