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 |
|
Apple
|
55072a56a1
|
解决key批次复制冲突
|
2022-08-08 11:34:25 +08:00 |
|
Apple
|
bf356f3c17
|
key批次管理一键复制
|
2022-08-08 11:32:26 +08:00 |
|
Apple
|
4b79bd8db3
|
Merge branch 'master' into addMenu-v1.4
|
2022-08-08 11:31:02 +08:00 |
|
Apple
|
83d73eaee1
|
商品名称16->20位
|
2022-08-08 10:30:51 +08:00 |
|
wangsongsole
|
3e5ccf5abd
|
暂存 防删
|
2022-08-05 18:57:29 +08:00 |
|
wangsongsole
|
93c7e9d0d1
|
修改兑换码一键复制
|
2022-08-05 11:26:12 +08:00 |
|
wangsongsole
|
86830177f8
|
提交
|
2022-08-04 18:31:43 +08:00 |
|
wangsongsole
|
898efb27cd
|
copy新增key 重写复制兑换码逻辑
|
2022-08-04 18:30:16 +08:00 |
|
zhangds
|
b756ef8075
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-04 15:19:31 +08:00 |
|
zhangds
|
0d30d79c86
|
1) 增加营销系统一键复制功能
|
2022-08-04 15:19:24 +08:00 |
|
wangsongsole
|
1ebf47ebd7
|
修复 立减金字段内容错误
|
2022-08-04 10:15:36 +08:00 |
|
wangsongsole
|
f36a7fe56d
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-03 18:29:46 +08:00 |
|
wangsongsole
|
0e014c0a1e
|
对接字段
|
2022-08-03 18:29:42 +08:00 |
|
zhangds
|
e131dbcda0
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-03 18:28:23 +08:00 |
|
zhangds
|
5fe01962e6
|
1) 更新兑换代码
|
2022-08-03 18:28:13 +08:00 |
|
wangsongsole
|
d1b04bbe8a
|
新增copy_code_batch_id字段
|
2022-08-03 17:07:54 +08:00 |
|
wangsongsole
|
d0b6e583a2
|
配合后端调整兑换码 新增逻辑 确认复制标识符以及复制次数字段
|
2022-08-03 16:51:02 +08:00 |
|
wangsongsole
|
5fc7ddc49f
|
重写 兑换码复制逻辑
|
2022-08-03 15:30:37 +08:00 |
|
zhangds
|
6bcce4a42a
|
1) 更新
|
2022-08-03 14:06:07 +08:00 |
|
wangsongsole
|
188fe12a0b
|
修复 一键复制兑换码 时间范围限制错误
|
2022-08-03 12:04:57 +08:00 |
|
wangsongsole
|
ac8ad4f8b1
|
兑换码列表 根据状态是否一键复制
|
2022-08-03 11:46:33 +08:00 |
|
wangsongsole
|
b006e45446
|
修复 商品组件 编辑商品权重为0时不能提交 验证问题
|
2022-08-03 11:28:12 +08:00 |
|
wangsongsole
|
2b41a4b9cd
|
立减金组件修复
|
2022-08-03 11:22:37 +08:00 |