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 |
|
wangsongsole
|
ae86f6c810
|
删除压缩包
|
2022-08-10 09:43:13 +08:00 |
|
Apple
|
4315561afd
|
调整兑换码复制名称
|
2022-08-09 15:07:58 +08:00 |
|
Apple
|
04c8bf80a1
|
兑换码复制面包屑调整
|
2022-08-09 15:07:02 +08:00 |
|
zhangds
|
3991829fb0
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-09 14:51:43 +08:00 |
|
zhangds
|
ca839ca6f0
|
1） 修改菜单
|
2022-08-09 14:51:35 +08:00 |
|
wangsongsole
|
bcdd504161
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-09 14:04:07 +08:00 |
|
wangsongsole
|
5c9f9067ba
|
key列表条件查询 优化
|
2022-08-09 14:04:04 +08:00 |
|
Apple
|
2371b8d3eb
|
key批次复制增加copy_key_batch_id，计算复制次数
|
2022-08-09 11:50:51 +08:00 |
|
wangsongsole
|
78cc74e746
|
合并冲突
|
2022-08-09 11:26:28 +08:00 |
|
wangsongsole
|
d1f7ad65c7
|
删除无用代码
|
2022-08-09 11:17:17 +08:00 |
|
wangsongsole
|
4f58d9322c
|
删除 无用文件
|
2022-08-09 11:10:11 +08:00 |
|
wangsongsole
|
5b705ee327
|
修改 add
|
2022-08-09 11:00:55 +08:00 |
|
wangsongsole
|
12126a64b5
|
删除 无用文件
|
2022-08-09 10:59:40 +08:00 |
|
zhangds
|
bc1d38d195
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-09 09:58:24 +08:00 |
|
zhangds
|
bbf3444e2a
|
1) 删除无用文件
|
2022-08-09 09:58:17 +08:00 |
|
Apple
|
6545da20dd
|
处理Ipt组件计算
|
2022-08-09 09:57:44 +08:00 |
|
wangsongsole
|
0fbe515adf
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-08 18:30:16 +08:00 |
|
wangsongsole
|
2842610ebf
|
测试兑换码
|
2022-08-08 18:30:14 +08:00 |
|
zhangds
|
86800a06ab
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-08 17:10:04 +08:00 |
|
zhangds
|
d8f674b7db
|
1) 删除无用文件
|
2022-08-08 17:09:53 +08:00 |
|
wangsongsole
|
df442e145b
|
修复 字段报错
|
2022-08-08 16:01:30 +08:00 |
|
zhangds
|
177c3d26ce
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-08 14:51:57 +08:00 |
|
zhangds
|
7d3af028b2
|
1) 修复一键复制接口
|
2022-08-08 14:51:51 +08:00 |
|
wangsongsole
|
0b7d3ca40f
|
静态数据分离
|
2022-08-08 14:29:37 +08:00 |
|
wangsongsole
|
dd143f5c70
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-08 14:08:50 +08:00 |
|
wangsongsole
|
f6d3326674
|
修复字段错误
|
2022-08-08 14:08:48 +08:00 |
|
zhangds
|
459a484e9b
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-08 13:44:29 +08:00 |
|
zhangds
|
d72d36e952
|
1) 完成营销计划 预览功能
|
2022-08-08 13:43:15 +08:00 |
|
wangsongsole
|
af3ff49cee
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-08 11:45:19 +08:00 |
|
wangsongsole
|
97f7cdc6d9
|
修改一键复制兑换码
|
2022-08-08 11:45:16 +08:00 |