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 |
|
zhangds
|
140d6720c2
|
1） 修复导出带hash值 2） 修复订单复制回显数据
|
2022-08-12 18:18:28 +08:00 |
|
wangsongsole
|
1ade133568
|
修正 【订单列表】选择查询日期后，前端的page应该传1
|
2022-08-12 18:01:05 +08:00 |
|
wangsongsole
|
a25166197f
|
立减金可用时间 动态样式
|
2022-08-12 17:50:39 +08:00 |
|
zhangds
|
e729725d52
|
1) 修复营销系统上传查询hash 值
|
2022-08-12 16:00:52 +08:00 |
|
zhangds
|
fac9dc2937
|
1) 增加file 重新选择文件功能
|
2022-08-11 18:12:36 +08:00 |
|
zhangds
|
e4057c7cfa
|
1） 修改复制接口
|
2022-08-11 17:37:07 +08:00 |
|
zhangds
|
65e45dfa41
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 17:21:44 +08:00 |
|
zhangds
|
efbf16ebe2
|
1) 修改复制请求详情接口
|
2022-08-11 17:21:37 +08:00 |
Apple
|
e016b4502a
|
菜单营销系统管理显示
|
2022-08-11 16:38:47 +08:00 |
|
Apple
|
bf34d67690
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 16:34:45 +08:00 |
|
Apple
|
167cd279e9
|
解决登录不进
|
2022-08-11 16:34:36 +08:00 |
|
wangsongsole
|
54166bb504
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 16:00:06 +08:00 |
|
wangsongsole
|
de262ad4ae
|
优化keys 列表重置效果
|
2022-08-11 16:00:04 +08:00 |
|
zhangds
|
ed4b2266e0
|
update
|
2022-08-11 15:55:41 +08:00 |
|
zhangds
|
d389d10365
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 15:52:09 +08:00 |
|
zhangds
|
470bc6e6ba
|
1) 增加table 操作带bash值
|
2022-08-11 15:51:59 +08:00 |
|
wangsongsole
|
74ff14c3c1
|
删除无用代码
|
2022-08-11 15:37:53 +08:00 |
|
wangsongsole
|
34ddc85715
|
key批次审核未通过，其下进行中的兑换码不可进行复制。
|
2022-08-11 15:33:00 +08:00 |
|
zhangds
|
afed5b5129
|
1) 修复批量删除带被删除的条件
|
2022-08-11 15:26:43 +08:00 |
|
zhangds
|
a33128fe82
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 15:06:25 +08:00 |
|
zhangds
|
fd178f3b64
|
1) 营销系统增加导出
|
2022-08-11 15:06:16 +08:00 |
|
wangsongsole
|
27cb9e8518
|
修正 复制兑换码后，被复制的兑换码数据没有回显。
|
2022-08-11 14:55:57 +08:00 |
|
wangsongsole
|
a56e94825c
|
key批次列表创建中状态的key批次，把更多按钮置灰掉
|
2022-08-11 14:03:49 +08:00 |
|
wangsongsole
|
343a5a9763
|
提交
|
2022-08-11 10:43:04 +08:00 |
|
wangsongsole
|
06b62673d5
|
修复立减金组件字段兼容
|
2022-08-11 10:39:14 +08:00 |
|
wangsongsole
|
114c40ae16
|
修复keys查询字段错误
|
2022-08-11 10:19:36 +08:00 |
|
wangsongsole
|
8f98e59bcb
|
修改动态提示
|
2022-08-10 17:46:53 +08:00 |
|
wangsongsole
|
2e50dcdbad
|
合并冲突
|
2022-08-10 17:41:19 +08:00 |
|
zhangds
|
d2e5eed984
|
update
|
2022-08-10 17:37:06 +08:00 |
|
wangsongsole
|
713d07c828
|
提交
|
2022-08-10 17:35:33 +08:00 |
|
zhangds
|
facec5e5b4
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-10 17:27:25 +08:00 |
|
zhangds
|
cd35c6fa8a
|
1) 增加计划导出功能
|
2022-08-10 17:21:51 +08:00 |
|
wangsongsole
|
0a69eb9ff3
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-10 17:02:42 +08:00 |
|
wangsongsole
|
abf7420f23
|
修复 bug
|
2022-08-10 17:02:40 +08:00 |
|
Apple
|
52727f0047
|
【账号管理】新建账号，在请求角色接口时，长度限制1000,增加页码查询
|
2022-08-10 16:50:55 +08:00 |
|
wangsongsole
|
8ba912366b
|
修复bug
|
2022-08-10 16:24:39 +08:00 |
|
wangsongsole
|
b4a28a252f
|
修复 【key批次列表】创建中、审核中、审核驳回、已作废状态的key批次，不允许批量发送key批次
|
2022-08-10 15:42:28 +08:00 |
|
wangsongsole
|
abf371b86c
|
key码列表默认填充状态
|
2022-08-10 15:14:33 +08:00 |
|
wangsongsole
|
8229476356
|
修正 【key码列表管理】页面文字未对齐
|
2022-08-10 15:03:32 +08:00 |
|
wangsongsole
|
3a9399390b
|
修正 【key批次列表】未勾选，批量发送按钮应该置灰
|
2022-08-10 14:26:26 +08:00 |
|
wangsongsole
|
62bd09d6b8
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-10 14:20:09 +08:00 |
|
wangsongsole
|
5da50bfb20
|
修复 【key码列表管理】分销商和计划名称查询框，应该为预测性输入框
|
2022-08-10 14:20:06 +08:00 |
|
Apple
|
e19e5ac576
|
解决【营销计划-复制】key批次复制后，编辑兑换码，点击新增商品和新建立减金，提示“请添加映射分销商”
|
2022-08-10 14:07:18 +08:00 |
|
wangsongsole
|
3ce6eb0a3d
|
修改 待使用为可使用
|
2022-08-10 12:00:16 +08:00 |
|
wangsongsole
|
510ee43702
|
修改 立减金组件删除样式
|
2022-08-10 11:34:33 +08:00 |
|
wangsongsole
|
478505ed98
|
修改立减金组件样式
|
2022-08-10 11:16:40 +08:00 |
|
wangsongsole
|
2fe21b4b78
|
修改 基本信息中，券模板编号的券字前端写错了
|
2022-08-10 10:41:07 +08:00 |