wangsongsole
|
930ea9c20f
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-16 15:44:06 +08:00 |
|
wangsongsole
|
52a1450b35
|
修复 立减金生效时间限制范围
|
2022-08-16 15:44:03 +08:00 |
zhangds
|
a5dc4e1a6f
|
update
|
2022-08-16 15:18:04 +08:00 |
Apple
|
e323ebf7b6
|
订单充值中（即生成订单未向上游投递的状态），可以作废
|
2022-08-16 14:41:17 +08:00 |
|
wangsongsole
|
30bd46c9d5
|
优化代码
|
2022-08-16 13:56:13 +08:00 |
|
wangsongsole
|
e784e7df49
|
修正 兑换码复制，审核驳回的兑换码不应该被复制。
|
2022-08-16 11:26:36 +08:00 |
|
wangsongsole
|
6dd00c149c
|
删除多余代码
|
2022-08-16 11:09:36 +08:00 |
|
wangsongsole
|
e588e85315
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-16 11:03:00 +08:00 |
|
wangsongsole
|
7a80493748
|
更改兑换码 立减金 生效时间以营销计划时间为限制 。原：批次时间
|
2022-08-16 11:02:58 +08:00 |
|
wangsongsole
|
ba71b5932b
|
更改兑换码 立减金 生效时间以营销计划时间为限制 。原：批次时间
|
2022-08-16 11:02:30 +08:00 |
|
zhangds
|
496047276b
|
1) 暂存
|
2022-08-16 10:48:14 +08:00 |
|
zhangds
|
93e9cd5379
|
1) 修复营销计划审核中编辑，时间空白问题
|
2022-08-16 10:41:32 +08:00 |
|
wangsongsole
|
c9860ac6a4
|
新增 key批次状态为生成中时，操作按钮全部置灰，生成状态的key批次放在进行中tab页中展示
|
2022-08-16 09:47:05 +08:00 |
|
Apple
|
2c855f9f64
|
解决导航重复渲染bug
|
2022-08-15 18:10:24 +08:00 |
|
wangsongsole
|
50c676d83e
|
修复【追加key批次】追加key批次，撤销审批，在编辑页面，兑换码批次的商品范围会将之前的商品展示在最新的兑换码批次中
|
2022-08-15 17:25:18 +08:00 |
|
wangsongsole
|
bfb5f30916
|
禁止立减金 使用规则 富文本全屏
|
2022-08-15 16:49:14 +08:00 |
|
wangsongsole
|
be7942ae0b
|
优化代码
|
2022-08-15 15:51:59 +08:00 |
|
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 |