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 |
|
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 |
|
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 |
|
zhangds
|
ac026ca21e
|
1) 删除api 接口线上接口
|
2022-08-02 17:46:04 +08:00 |
|
zhangds
|
e74c909e44
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-02 17:16:11 +08:00 |
|
zhangds
|
865805b4fc
|
1) 增加已完成可复制
|
2022-08-02 17:15:58 +08:00 |
|
zhangds
|
a8fd4dc716
|
1) 增加图片
|
2022-08-02 17:10:38 +08:00 |
|
wangsongsole
|
d5d3ce3c43
|
对接可用时间字段
|
2022-08-02 16:53:26 +08:00 |
|
wangsongsole
|
f91249159d
|
修复 营销计划列表展示不完整错误
|
2022-08-01 16:35:54 +08:00 |
|
zhangds
|
995c0deef0
|
1） 增加复制key
|
2022-08-01 16:35:51 +08:00 |
|
zhangds
|
57f6332dbe
|
1) 增加复制计划列表
|
2022-08-01 13:56:14 +08:00 |
|
wangsongsole
|
f1269eb72e
|
修复编辑 KEY报错问题
|
2022-08-01 10:32:46 +08:00 |
|
zhangds
|
99dde0615f
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-29 18:25:08 +08:00 |
|
zhangds
|
ee0647d821
|
1) 增加复制key
|
2022-07-29 18:24:59 +08:00 |
|
zhangds
|
25f60dfecd
|
1） 增加复制计划
|
2022-07-29 18:02:47 +08:00 |
|
wangsongsole
|
1d4675f87f
|
修改 key列表管理样式
|
2022-07-29 17:38:57 +08:00 |
|
wangsongsole
|
9097e7775c
|
修改sha1字段为hash
|
2022-07-29 17:34:04 +08:00 |
|
wangsongsole
|
fce9d9898a
|
删除 key列表管理多余数据
|
2022-07-29 17:05:22 +08:00 |
|
wangsongsole
|
6aa0c00521
|
恢复代码
|
2022-07-29 17:02:13 +08:00 |
|
wangsongsole
|
93b43374dd
|
修改 兑换码列表 样式
|
2022-07-29 16:45:08 +08:00 |
|
wangsongsole
|
00d84202bf
|
完善兑换码复制操作 等待对接接口
|
2022-07-29 16:24:39 +08:00 |
|
wangsongsole
|
db4a7f8160
|
新增兑换码复制按钮和相关操作
|
2022-07-29 16:22:45 +08:00 |
|
wangsongsole
|
18000eba59
|
完成批量发送key 接口对接
|
2022-07-29 16:20:09 +08:00 |
|
zhangds
|
a04373396b
|
1) 增加批量上传作废和已使用功能
|
2022-07-28 17:37:48 +08:00 |
|
zhangds
|
39d0c903a0
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-28 16:13:47 +08:00 |
|
zhangds
|
ceee9c8235
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-28 16:12:18 +08:00 |
|
wangsongsole
|
33e5a49f9f
|
1、修复 key列表管理条件查询组件 输入框清除报错问题
2、与后端对接 key列表管理条件查询组件 静态字段
3、调试完成key列表展示以及相关操作
4、优化代码
|
2022-07-28 15:44:33 +08:00 |
|
zhangds
|
5986a7e753
|
1) 删除key
|
2022-07-28 15:28:13 +08:00 |
|
wangsongsole
|
f29bd59fc0
|
修改代码
|
2022-07-28 14:55:37 +08:00 |
|
wangsongsole
|
231fba2694
|
合并冲突
|
2022-07-28 14:50:52 +08:00 |
|
wangsongsole
|
6f5defa911
|
对接字段
|
2022-07-28 14:50:02 +08:00 |
|
zhangds
|
f35fbe3d93
|
1) 删除key管理
|
2022-07-28 13:54:23 +08:00 |
|
zhangds
|
47b042d639
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-28 13:46:13 +08:00 |
|
zhangds
|
7ecec8ffde
|
update
|
2022-07-28 13:45:58 +08:00 |
|
wangsongsole
|
ef95bf21fc
|
修改 key表格样式
|
2022-07-28 11:34:13 +08:00 |
|
wangsongsole
|
43adddd11f
|
修改 key列表查询组件
|
2022-07-28 11:27:25 +08:00 |
|
wangsongsole
|
634b7ad29e
|
修改key列表文件
|
2022-07-28 11:15:06 +08:00 |
|
wangsongsole
|
2da88498aa
|
配key列表路由
|
2022-07-28 11:02:19 +08:00 |
|
wangsongsole
|
f6da7c08cf
|
修改key列表文件名称
|
2022-07-28 10:52:23 +08:00 |
|
wangsongsole
|
c72c357f61
|
新增keylist
|
2022-07-28 10:47:07 +08:00 |
|
wangsongsole
|
e66daf8b65
|
恢复代码
|
2022-07-28 10:46:57 +08:00 |
|
zhangds
|
46c2c20629
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-28 10:37:03 +08:00 |
|
wangsongsole
|
7b22810deb
|
修改key查询组件
|
2022-07-28 10:14:34 +08:00 |
|
zhangds
|
2adac54895
|
update
|
2022-07-28 10:12:00 +08:00 |
|
wangsongsole
|
d6de2e2731
|
新增 使用规则说明
|
2022-07-27 11:49:29 +08:00 |
|
wangsongsole
|
0bc09a158f
|
修改立减租价样式
|
2022-07-27 10:21:38 +08:00 |
|
wangsongsole
|
4a09c9a5bb
|
修复 模板编号输入框无响应bug
|
2022-07-27 10:13:25 +08:00 |
|
wangsongsole
|
c331d95c92
|
配合后端确认 模板编号字段
|
2022-07-27 10:08:47 +08:00 |
|
wangsongsole
|
2716dbb51e
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-26 16:41:22 +08:00 |
|
wangsongsole
|
7517a3ca07
|
立减金组件 回显样式控制
|
2022-07-26 16:41:19 +08:00 |
|
zhangds
|
13128ae664
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-26 16:12:06 +08:00 |
|
zhangds
|
b6c05cb183
|
1) 增加批量上传查询
|
2022-07-26 16:11:57 +08:00 |
|
wangsongsole
|
13e7aaa317
|
优化代码
|
2022-07-26 15:53:19 +08:00 |
|
wangsongsole
|
ce023b0eac
|
1、立减金组件新增 可用时间段 规则字段
2、新增模板编号字段
|
2022-07-26 15:26:12 +08:00 |
|
wangsongsole
|
6779556cfa
|
新增属性
|
2022-07-25 17:44:14 +08:00 |
|
wangsongsole
|
aa397e655b
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-25 17:34:54 +08:00 |
|
wangsongsole
|
ac7222e983
|
修改keys查询组件
|
2022-07-25 17:34:52 +08:00 |
|
zhangds
|
232c9d7cf5
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-25 15:36:34 +08:00 |
|
zhangds
|
a2a9374d81
|
1) 增加批量上传 弹窗
|
2022-07-25 15:36:22 +08:00 |
|
wangsongsole
|
62941ada28
|
1、新增keys条件查询组件静态数据
2、营销计划key列表新增批量发送按钮
|
2022-07-25 15:01:31 +08:00 |
|
wangsongsole
|
9e12956b15
|
修改立减金组件样式
|
2022-07-25 14:26:55 +08:00 |
|
wangsongsole
|
3664455790
|
合并
|
2022-07-25 14:18:05 +08:00 |
|
zhangds
|
24579f8604
|
1) 增加 keys 批量上传
|
2022-07-25 14:08:56 +08:00 |
|
wangsongsole
|
d6cdd5a87f
|
修改key列表组件样式
|
2022-07-25 14:05:58 +08:00 |
|
wangsongsole
|
d82d49fcf5
|
新增 key列表查询组件
|
2022-07-25 11:57:38 +08:00 |
|
wangsongsole
|
d6d8178538
|
修复商品logo上传报错
|
2022-07-20 11:08:26 +08:00 |
|
wangsongsole
|
69aaec89e3
|
切换到测试环境
|
2022-07-20 10:08:53 +08:00 |
|
wangsongsole
|
dc2344cd4a
|
测试商品
|
2022-07-20 09:59:07 +08:00 |
|
wangsongsole
|
d4dc80c683
|
api回归
|
2022-07-19 16:01:36 +08:00 |
|
wangsongsole
|
9a4291c43f
|
单个api切换正式环境
|
2022-07-19 14:07:20 +08:00 |
|
wangsongsole
|
2ae91d724d
|
修复商品报错
|
2022-07-19 09:58:28 +08:00 |
|
wangsongsole
|
4cfe9ea44f
|
商品图片修改id
|
2022-07-18 10:21:44 +08:00 |
|
wangsongsole
|
fa2af2981e
|
测试商品图片
|
2022-07-18 10:11:37 +08:00 |
|
wangsongsole
|
470f85e40d
|
修复商品图片编辑不能删除
|
2022-07-15 11:49:19 +08:00 |
|
Apple
|
c81a0e4683
|
调整登录获取验证码样式
|
2022-07-15 11:24:45 +08:00 |
|
wangsongsole
|
6724462545
|
修复商品不能删除问题
|
2022-07-15 11:00:27 +08:00 |
|
wangsongsole
|
73ad399267
|
优化预警百分比
|
2022-07-13 06:19:24 +08:00 |
|
wangsongsole
|
c99c10a60b
|
提交
|
2022-07-13 06:05:47 +08:00 |
|
wangsongsole
|
53cfdd2905
|
验证预警百分比
|
2022-07-13 05:52:55 +08:00 |
|
wangsongsole
|
85fee8080a
|
修复bug
|
2022-07-13 05:48:53 +08:00 |
|
Apple
|
118eb64510
|
立减金后台V1_3_0锁定版本
|
2022-07-13 05:27:21 +08:00 |
|
wangsongsole
|
80712660b5
|
根据权限禁用新增立减金按钮
|
2022-07-12 22:26:32 +08:00 |