zhangds
|
b7f5960fa4
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 15:23:10 +08:00 |
|
zhangds
|
6fb3c6af20
|
1）修复复制计划后，表单验证
|
2022-08-15 15:23:02 +08:00 |
wangsongsole
|
727e5d3c9f
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 15:14:12 +08:00 |
|
wangsongsole
|
232feed09b
|
修正文件夹错误
|
2022-08-15 15:14:10 +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
|
c55dc2affe
|
删除无用代码
|
2022-08-15 14:18:51 +08:00 |
|
wangsongsole
|
cf6a4b6350
|
修改样式
|
2022-08-15 14:18:17 +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 |
|
wangsongsole
|
8bb93a7308
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 10:25:43 +08:00 |
|
wangsongsole
|
925f149a1e
|
修复可用时间段中，选择“有效期内，不规则日期可用”在预览图中未展示可用时间
|
2022-08-15 10:25:41 +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 |
|
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 |