wangsongsole
|
50e64532e6
|
fix:【兑换码管理】新增兑换码，直接点击新建商品或者新建立减金，前端应该提示“请选择计划”
|
2022-10-11 10:53:20 +08:00 |
zhangds
|
555f163541
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-11 10:50:33 +08:00 |
|
zhangds
|
5bac1b55f6
|
fix: 修复优惠券范围title 修复兑换码复制无数据问题
|
2022-10-11 10:50:28 +08:00 |
|
wangsongsole
|
b7dbe179f8
|
style:配合后端重新调试兑换码编辑接口 并调整数据接口和处理逻辑 前身代码保留 待删除
|
2022-10-11 10:35:02 +08:00 |
|
zhangds
|
1471f4a8d2
|
fix: 修复优惠券进行中、暂停中、未开始状态生效开始时间不能修改
|
2022-10-10 20:21:20 +08:00 |
|
zhangds
|
7a29f6f52c
|
fix: 增加优惠券列表生成中无操作状态
|
2022-10-10 20:10:51 +08:00 |
|
zhangds
|
e419a5dce9
|
fix: 修复复制优惠券立减金不能修改数据
|
2022-10-10 20:03:24 +08:00 |
|
zhangds
|
cc51d072b1
|
fix: 修复优惠券复制没有数据并且key批次名字不改变问题
|
2022-10-10 19:19:30 +08:00 |
|
zhangds
|
f10799066c
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-10 18:17:07 +08:00 |
|
zhangds
|
12cb381b44
|
fix: 修复兑换码商品范围展示
|
2022-10-10 18:17:02 +08:00 |
Apple
|
ce231d20ef
|
fix(模板中心)：控制自定义组件显示与否，搜索栏与底部栏配置，动态高度计算
|
2022-10-10 17:58:47 +08:00 |
|
zhangds
|
1f0113a776
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-10 17:54:21 +08:00 |
|
zhangds
|
d2e66e5b9c
|
fix: 修复key批次优惠券
|
2022-10-10 17:54:13 +08:00 |
|
zhangds
|
bbce9223ba
|
fix: 修复兑换码key批次编辑
|
2022-10-10 17:03:56 +08:00 |
|
Apple
|
d7b0c04388
|
style:调整编辑器预览区域兼容性，搜索栏，底部栏目样式
|
2022-10-10 16:13:21 +08:00 |
|
zhangds
|
8025aef880
|
fix: 修复兑换码key批次编辑
|
2022-10-10 15:57:55 +08:00 |
|
wangsongsole
|
a0976834b5
|
feat:【订单列表】新增字段“商品类型”
|
2022-10-10 10:10:47 +08:00 |
|
Apple
|
b3a9895c51
|
fix(编辑器模块)：立减金兑换说明标题删减名称显示
|
2022-10-10 09:57:46 +08:00 |
|
wangsongsole
|
40cc560e90
|
style:【订单列表】订单类型中的立减金和直充，修改为“虚拟”
|
2022-10-10 09:45:06 +08:00 |
|
zhangds
|
d015c4ae1b
|
fix: 修复优惠券key批次接口
|
2022-10-09 18:32:08 +08:00 |
|
zhangds
|
0b2c7ddf5c
|
fix: 修复兑换码key计划和key展示问题
|
2022-10-09 15:39:22 +08:00 |
|
zhangds
|
b1154b6533
|
fix: 修复创建中的优惠券不勾选不提交
|
2022-10-09 15:22:29 +08:00 |
|
zhangds
|
28843c43b5
|
fix: 修复key批次进行中编辑重复数据问题
|
2022-10-09 15:14:41 +08:00 |
|
zhangds
|
f977cb12f6
|
fix: 增加key批次创建中删除接口
|
2022-10-08 17:26:20 +08:00 |
|
zhangds
|
f035698053
|
fix: 修复计划绑定类型切换
|
2022-10-08 16:38:55 +08:00 |
|
zhangds
|
4140dd010d
|
fix: 修复优惠券减保留2位小数
|
2022-10-08 15:19:19 +08:00 |
|
zhangds
|
f346189eff
|
fix: 修复兑换码-优惠券列表key批次审核中无法撤销审核
|
2022-10-08 14:40:01 +08:00 |
|
zhangds
|
6a3b162e4e
|
fix: 增加营销计划左侧菜单栏
|
2022-10-08 14:27:32 +08:00 |
|
zhangds
|
f80077095f
|
fix: 修复key批次时间错误
|
2022-09-30 18:32:02 +08:00 |
|
zhangds
|
496197b6bf
|
fix: 修复key批次 兑换码新增有原数据
|
2022-09-30 18:23:47 +08:00 |
|
zhangds
|
769d16c3a0
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 18:08:51 +08:00 |
|
zhangds
|
abf29e5759
|
fix: 修复优惠券时间不能修改
|
2022-09-30 18:08:44 +08:00 |
|
wangsongsole
|
bac30b4521
|
feat(兑换码管理列表)：删除兑换码时新增提示确认框
|
2022-09-30 16:59:40 +08:00 |
|
wangsongsole
|
5c98718be5
|
style(兑换码管理列表-商品范围)：调整删除按钮为红色
|
2022-09-30 16:58:43 +08:00 |
|
wangsongsole
|
37958004df
|
fix(兑换码复制)：修复兑换码复制时商品不能编辑
|
2022-09-30 16:32:50 +08:00 |
|
wangsongsole
|
2d73e4b078
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-09-30 16:23:16 +08:00 |
|
wangsongsole
|
5b99fe656a
|
style:删除商品组件log
|
2022-09-30 16:23:14 +08:00 |
|
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
|
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 |
|
zhangds
|
e644424f09
|
1.优惠券管理列表=>编辑=>新增立减金时间问题-完成
2.优惠券=>商品、立减金h5模版恢复 -完成
3.优惠券编辑,开始时间不能修改-完成
|
2022-09-26 14:19:57 +08:00 |
|
Apple
|
222bf18b07
|
编辑器-搜索栏背景色增加透明度属性
|
2022-09-26 12:04:43 +08:00 |
|
Apple
|
3395cfc61a
|
解决落地页预览页面回显白屏
|
2022-09-23 16:36:25 +08:00 |
|
Apple
|
1e7997b3ef
|
编辑器整体自测
|
2022-09-23 15:20:03 +08:00 |
|
Apple
|
e49c6fd6e9
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
* 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
删除多余代码
1) 修复兑换h5模版错误问题
1) 优化计划优惠券模版h5显示问题
|
2022-09-23 15:08:23 +08:00 |
|
Apple
|
aa47a2e622
|
编辑器底部栏删除/添加组件联动
|
2022-09-23 14:32:26 +08:00 |
|
wangsongsole
|
2887ed778f
|
删除多余代码
|
2022-09-23 14:09:36 +08:00 |
|
zhangds
|
2da317b0a4
|
1) 修复兑换h5模版错误问题
|
2022-09-23 14:01:58 +08:00 |
|
zhangds
|
bdac625ed5
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-23 10:57:56 +08:00 |
|
zhangds
|
2ca4c395d2
|
1) 优化计划优惠券模版h5显示问题
|
2022-09-23 10:57:49 +08:00 |
|
Apple
|
bfcadeeb0b
|
编辑器-标题组件优化
|
2022-09-23 10:45:45 +08:00 |
|
zhangds
|
0b2b8647b4
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-22 18:32:07 +08:00 |
|
zhangds
|
0be89c1ed6
|
1） 增加key批次优惠券
|
2022-09-22 18:31:55 +08:00 |
|
Apple
|
571edf3c51
|
调整编辑器预览中心区域兼容样式
|
2022-09-22 17:31:09 +08:00 |