wangsongsole
|
1510ce8664
|
修复keys查询bug以及grid
|
2022-08-24 16:44:20 +08:00 |
Apple
|
f72ee90688
|
封装table表格组件加载效果
|
2022-08-24 14:07:51 +08:00 |
|
wangsongsole
|
abca49beae
|
优化loading
|
2022-08-24 11:27:03 +08:00 |
|
wangsongsole
|
811223c738
|
修改订单类型
|
2022-08-24 09:50:51 +08:00 |
|
wangsongsole
|
3de1c2fd75
|
修复bug
|
2022-08-19 15:37:00 +08:00 |
|
wangsongsole
|
2264e57920
|
提交
|
2022-08-19 15:14:06 +08:00 |
|
wangsongsole
|
93bfb654ab
|
修复 兑换码列表 复制状态错误展示
|
2022-08-18 15:24:34 +08:00 |
|
wangsongsole
|
9c1d31c640
|
修复 复制兑换码时间 不能选择问题
|
2022-08-18 15:23:20 +08:00 |
zhangds
|
ec4c63fa46
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-18 11:00:00 +08:00 |
|
zhangds
|
1fb4c8e050
|
1) 修复营销计划时间不改变文件
|
2022-08-18 10:59:49 +08:00 |
|
Apple
|
d7bc189aaa
|
营销系统V1_4版本锁版，取消版本号
|
2022-08-17 21:46:45 +08:00 |
|
wangsongsole
|
d4bab7a8ab
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-17 21:26:47 +08:00 |
|
wangsongsole
|
0e7456b049
|
修复时间立减金生效时间报错
|
2022-08-17 21:26:45 +08:00 |
|
Apple
|
34d546459c
|
营销系统计划为生成中，不允许操作编辑/复制/预览/作废/发送
|
2022-08-17 20:49:05 +08:00 |
|
wangsongsole
|
1d992c42ec
|
删除 错误代码
|
2022-08-17 18:39:23 +08:00 |
|
wangsongsole
|
f630a8c639
|
提交
|
2022-08-17 18:18:57 +08:00 |
|
wangsongsole
|
41719e0a85
|
修复bug
|
2022-08-17 18:18:32 +08:00 |
|
wangsongsole
|
ff02de0c98
|
修复 商品列表数据 丢失问题以及优化代码
|
2022-08-17 18:04:52 +08:00 |
|
wangsongsole
|
e8d9b6312e
|
修复商品bug
|
2022-08-17 17:45:50 +08:00 |
|
Apple
|
2dc0c664f1
|
订单状态限制兑换码，状态为0，充值中展示作废按钮
|
2022-08-17 14:23:24 +08:00 |
|
zhangds
|
3405ba0312
|
1） 增加重置后table 为空
|
2022-08-17 09:58:50 +08:00 |
|
zhangds
|
d5aba67616
|
1) 删除无用代码
|
2022-08-16 15:56:43 +08:00 |
|
zhangds
|
fa60290ba8
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-16 15:50:24 +08:00 |
|
zhangds
|
26927cbe6d
|
1) 优化key列表 2） 刷新列表
|
2022-08-16 15:50:15 +08:00 |
|
wangsongsole
|
930ea9c20f
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-16 15:44:06 +08:00 |
|
wangsongsole
|
52a1450b35
|
修复 立减金生效时间限制范围
|
2022-08-16 15:44:03 +08:00 |
|
zhangds
|
a5dc4e1a6f
|
update
|
2022-08-16 15:18:04 +08:00 |
|
Apple
|
e323ebf7b6
|
订单充值中（即生成订单未向上游投递的状态），可以作废
|
2022-08-16 14:41:17 +08:00 |
|
wangsongsole
|
30bd46c9d5
|
优化代码
|
2022-08-16 13:56:13 +08:00 |
|
wangsongsole
|
e784e7df49
|
修正 兑换码复制，审核驳回的兑换码不应该被复制。
|
2022-08-16 11:26:36 +08:00 |
|
wangsongsole
|
6dd00c149c
|
删除多余代码
|
2022-08-16 11:09:36 +08:00 |
|
wangsongsole
|
7a80493748
|
更改兑换码 立减金 生效时间以营销计划时间为限制 。原：批次时间
|
2022-08-16 11:02:58 +08:00 |
|
zhangds
|
496047276b
|
1) 暂存
|
2022-08-16 10:48:14 +08:00 |
|
zhangds
|
93e9cd5379
|
1) 修复营销计划审核中编辑，时间空白问题
|
2022-08-16 10:41:32 +08:00 |
|
wangsongsole
|
c9860ac6a4
|
新增 key批次状态为生成中时，操作按钮全部置灰，生成状态的key批次放在进行中tab页中展示
|
2022-08-16 09:47:05 +08:00 |
|
wangsongsole
|
50c676d83e
|
修复【追加key批次】追加key批次，撤销审批，在编辑页面，兑换码批次的商品范围会将之前的商品展示在最新的兑换码批次中
|
2022-08-15 17:25:18 +08:00 |
|
zhangds
|
6fb3c6af20
|
1）修复复制计划后，表单验证
|
2022-08-15 15:23:02 +08:00 |
|
zhangds
|
56f13879aa
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 14:33:12 +08:00 |
|
zhangds
|
a93a67e3be
|
1) 修复时间空白
|
2022-08-15 14:33:05 +08:00 |
|
wangsongsole
|
c84501d5bf
|
x修复 key创建中 置灰更多按钮
|
2022-08-15 14:09:16 +08:00 |
|
zhangds
|
91607146ad
|
删除page
|
2022-08-15 11:56:51 +08:00 |
|
zhangds
|
a86dd06885
|
1) 修改page
|
2022-08-15 11:56:34 +08:00 |
|
zhangds
|
979a862672
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 11:28:14 +08:00 |
|
zhangds
|
42a8e419a8
|
1) 修复立减金复制不能编辑 2）修复列表状态操作
|
2022-08-15 11:28:08 +08:00 |
|
wangsongsole
|
d7831705a9
|
提交
|
2022-08-15 11:08:16 +08:00 |
|
wangsongsole
|
c8e183d658
|
修复 【兑换码-复制】复制已完结兑换码，兑换码生效时间无法修改。
|
2022-08-15 10:43:56 +08:00 |
|
Apple
|
bd5c9f5952
|
解决【追加key批次】提交审核时，后端提示“还有进行中的审批单”，创建/编辑成功后不需要请求审批接口
|
2022-08-15 10:25:28 +08:00 |
|
wangsongsole
|
272b9dd921
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-12 18:34:47 +08:00 |
|
wangsongsole
|
c0d4cf3bfb
|
提交
|
2022-08-12 18:34:45 +08:00 |
|
zhangds
|
305d9263be
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-12 18:18:37 +08:00 |