Apple
|
4fef6f3c09
|
fix(我的模板):新增优惠券白名单模板，已经上传输入框，保存时仍提示【请上传落地页输入框】
|
2022-09-30 15:41:04 +08:00 |
zhangds
|
8827d70b24
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 15:34:50 +08:00 |
|
zhangds
|
6185b022cd
|
fix: 修复key批次编辑绑定对象字段格式错误
|
2022-09-30 15:34:42 +08:00 |
wangsongsole
|
3c871f72f9
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 15:30:45 +08:00 |
|
wangsongsole
|
c199b03973
|
teat(兑换码管理)：新增 生成中状态
|
2022-09-30 15:30:42 +08:00 |
|
zhangds
|
70dbb143e3
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 15:21:55 +08:00 |
|
zhangds
|
44b730dbf7
|
fix: 增加优惠券生成中状态并且增加删除功能
|
2022-09-30 15:21:42 +08:00 |
|
wangsongsole
|
2e3e045c66
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 15:02:49 +08:00 |
|
wangsongsole
|
66e7c20d1f
|
fix(新增key):修复新增key 样式问提
|
2022-09-30 15:02:46 +08:00 |
|
Apple
|
e6800826fd
|
fix(系统模板)：优惠券在商品列表页新增图片，将跳转链接的限制12个字符，修改为50个字符
|
2022-09-30 15:01:16 +08:00 |
|
Apple
|
3b353c244b
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
* 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
fix: 修复商品范围列表table一样
|
2022-09-30 14:46:23 +08:00 |
|
Apple
|
d259d8537e
|
style(落地页编辑)：调整侧边栏目缩放样式比例
|
2022-09-30 14:45:41 +08:00 |
|
zhangds
|
1948db63af
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 14:44:08 +08:00 |
|
zhangds
|
b36bd95504
|
fix: 修复商品范围列表table一样
|
2022-09-30 14:44:01 +08:00 |
|
wangsongsole
|
5816ae453c
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 14:41:13 +08:00 |
|
wangsongsole
|
6cc1a099a1
|
feat(api):新增兑换码删除接口
feat(兑换码列表)：新增兑换码删除逻辑
|
2022-09-30 14:41:11 +08:00 |
|
zhangds
|
99cc27f69e
|
fix: 修复优惠券商品范围列表 类型
|
2022-09-30 14:40:55 +08:00 |
|
zhangds
|
fb1a35b82c
|
fix: 修复优惠券商品的时间
|
2022-09-30 14:34:59 +08:00 |
|
zhangds
|
4754ba441d
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 14:28:57 +08:00 |
|
zhangds
|
4fc4bbdbeb
|
fix: 修复编辑、复制、新增落地页白名单数据
|
2022-09-30 14:28:51 +08:00 |
|
wangsongsole
|
9240377b56
|
style(兑换码管理列表)：抽离静态文件增加可读性
feat(兑换码管理列表)：根据测试点调整状态操作按钮并新增删除操作
|
2022-09-30 14:00:34 +08:00 |
|
zhangds
|
0318356dfa
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 13:38:23 +08:00 |
|
zhangds
|
2cd4c83532
|
fix: 修复key批次绑定对象回显问题
|
2022-09-30 13:38:15 +08:00 |
|
wangsongsole
|
bb3fe18b37
|
fix：修复兑换码切换 已结束状态报错
|
2022-09-30 12:01:52 +08:00 |
|
wangsongsole
|
a1061ddf63
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 11:45:09 +08:00 |
|
wangsongsole
|
d46f2cf858
|
fix:修复兑换码复制时回显计划和批次
|
2022-09-30 11:45:07 +08:00 |
|
zhangds
|
e183c32f5d
|
fix: 修复优惠券编辑根据计划时间选择
|
2022-09-30 11:19:54 +08:00 |
|
zhangds
|
08f28aaad0
|
fix: 修复优惠券复制、编辑归属key不能编辑
|
2022-09-30 10:49:35 +08:00 |
|
zhangds
|
f5c8853a78
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 10:23:57 +08:00 |
|
zhangds
|
2e7a0fad9f
|
fix: 修复key批次绑定类型不可修改
|
2022-09-30 10:23:42 +08:00 |
|
wangsongsole
|
9756c22b35
|
合并冲突
|
2022-09-30 10:22:26 +08:00 |
|
wangsongsole
|
c864e82dea
|
fix:兑换码新增、复制请求新增addCode标识
|
2022-09-30 10:21:46 +08:00 |
|
zhangds
|
de0737711d
|
fix: 修复兑换码批次无法新增
|
2022-09-29 18:37:44 +08:00 |
|
zhangds
|
9acdabaa55
|
fix: 修复key批次绑定对象审批是否可编辑
|
2022-09-29 18:19:21 +08:00 |
|
zhangds
|
f77773c3e2
|
fix: 修复key批次下载模版无法下载
|
2022-09-29 16:39:54 +08:00 |
|
zhangds
|
8a6709a1ff
|
fix: 修复计划编辑时间无法修改
|
2022-09-29 16:37:53 +08:00 |
|
zhangds
|
2dba919238
|
fix: 修复key下载模版为https模式
|
2022-09-29 16:19:20 +08:00 |
|
zhangds
|
b20726b53d
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-29 15:18:37 +08:00 |
|
zhangds
|
41d07e3771
|
fix: 兑换码无法显示select
|
2022-09-29 15:18:27 +08:00 |
|
zhangds
|
df8b667bf8
|
1) 修复计划复制、编辑、新增绑定类型切换落地页切换
|
2022-09-29 10:23:50 +08:00 |
|
wangsongsole
|
5357a6b41e
|
订单管理新增状态限制
|
2022-09-28 18:32:06 +08:00 |
|
wangsongsole
|
8670b0b8ca
|
订单列表新增下拉筛选状态
|
2022-09-28 17:22:17 +08:00 |
|
zhangds
|
623cf6b926
|
key 批次审核
|
2022-09-28 16:32:10 +08:00 |
|
wangsongsole
|
4c347bf71e
|
订单列表新增支付状态
|
2022-09-28 16:08:04 +08:00 |
|
wangsongsole
|
88f6d5d509
|
优化menu代码
|
2022-09-28 15:58:49 +08:00 |
|
zhangds
|
f9c4b9f3a8
|
1） 修复立减金时间问题
|
2022-09-27 17:02:46 +08:00 |
|
zhangds
|
dfbd7cd67a
|
1) 增加优惠券列表tab切换错误
|
2022-09-27 16:30:07 +08:00 |
|
zhangds
|
09a61bbb47
|
1) 落地页重新获取数据
|
2022-09-27 15:57:59 +08:00 |
|
zhangds
|
aafce8ea5d
|
1) 修复key批次新建不能选择对象绑定
|
2022-09-26 16:55:27 +08:00 |
|
zhangds
|
49ac172d38
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-26 14:20:08 +08:00 |