Apple
|
faf2f5bb7f
|
fix:解决复制系统模板后，不能编辑模板bug
|
2022-10-13 14:25:52 +08:00 |
|
Apple
|
39d9f0ab49
|
fix:编辑器底部栏配置，根据文本实时更新预览显示
|
2022-10-13 14:06:58 +08:00 |
wangsongsole
|
1e5f5ea9bb
|
feat:订单管理列表 新增待支付状态可以作废
|
2022-10-13 11:24:31 +08:00 |
|
wangsongsole
|
55b65d77e8
|
style:调整订单管理操作栏位置
|
2022-10-13 10:55:31 +08:00 |
|
Apple
|
5318ba9210
|
fix:修复【系统营销模板】模板类型不同，保存时传值与设置不匹配
|
2022-10-13 10:26:54 +08:00 |
zhangds
|
e19cebe4d3
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-12 18:08:53 +08:00 |
|
zhangds
|
9a2f630744
|
fix: 修复复制时间不可选择
|
2022-10-12 18:08:48 +08:00 |
|
wangsongsole
|
89c599a3fa
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-12 17:25:44 +08:00 |
|
wangsongsole
|
eb85be4aa5
|
fix:修复兑换码编辑、赋值、新增剩余数量 已使用数量计算错误
|
2022-10-12 17:25:41 +08:00 |
|
zhangds
|
1b04a801a4
|
fix: 修复优惠券列表 table展示字段
|
2022-10-12 16:03:06 +08:00 |
|
zhangds
|
6438534e17
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-12 15:59:56 +08:00 |
|
zhangds
|
473d715097
|
fix: 如果是复制，映射商品可编辑
|
2022-10-12 15:59:48 +08:00 |
|
Apple
|
ffe2bee7e0
|
fix(系统模板)：修复【系统营销模板】兑换码、白名单、优惠券、优惠券白名单保存，前端传值有误
|
2022-10-12 15:51:21 +08:00 |
|
wangsongsole
|
e3c81251f9
|
fix:
1、修复兑换码复制 商品不能编辑问题
2、修复新增兑换码没有默认剩余数量、已使用数量问题
3、注释无用代码 待删除
|
2022-10-12 15:45:59 +08:00 |
|
zhangds
|
6b0440837c
|
fix: 修复复制营销计划时间无法编辑
|
2022-10-12 14:42:40 +08:00 |
|
zhangds
|
24fc6a1349
|
fix: 修复git合并错误问题
|
2022-10-12 14:28:52 +08:00 |
|
Apple
|
afe43b4724
|
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: 修复优惠券浮点计算精度缺失 修复分销商id不对
|
2022-10-12 11:42:38 +08:00 |
|
Apple
|
44a240172a
|
fix(系统模板):修复优惠券添加背景图，切换时，背景不展示
|
2022-10-12 11:40:45 +08:00 |
|
zhangds
|
19b4596892
|
fix: 修复优惠券浮点计算精度缺失 修复分销商id不对
|
2022-10-12 10:35:46 +08:00 |
|
Apple
|
da538eabda
|
fix(模板中心):修复后端返回coupon为null，前端渲染报错处理
|
2022-10-11 20:17:39 +08:00 |
|
Apple
|
ee94f44529
|
fix(模板中心):修复【落地页管理】使用已存在的模板，打开模板1展示空白，再打开模板2，展示的是模板1的内容
|
2022-10-11 20:02:26 +08:00 |
|
Apple
|
b4074d5604
|
fix(系统模板):修复新增营销模板，修改权重为999，新增优惠券的图片、背景图、搜索栏、底部栏、标题，保存时，前端未传相关值
|
2022-10-11 19:34:28 +08:00 |
|
Apple
|
6109e4809c
|
fix(系统营销模板):修复优惠券中，上传背景图设置，上传成功后，前端未展示
|
2022-10-11 19:03:11 +08:00 |
|
zhangds
|
402b877caf
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-11 16:52:19 +08:00 |
|
zhangds
|
39026de7ee
|
fix: 修复白名单key数量不能为0
|
2022-10-11 16:52:09 +08:00 |
|
wangsongsole
|
482ccfb007
|
style:删除log
|
2022-10-11 16:17:27 +08:00 |
|
wangsongsole
|
f665dfe2b7
|
fix：修复兑换码新增立减金商品，生效时间不能正常选择。
|
2022-10-11 16:00:35 +08:00 |
|
wangsongsole
|
0d514f7f31
|
feat:配合后端对接订单列表商品类型
|
2022-10-11 15:41:54 +08:00 |
|
zhangds
|
cc0b86c123
|
fix: 优惠券复制改名字
|
2022-10-11 15:24:38 +08:00 |
|
zhangds
|
b5b46911b6
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-11 15:11:02 +08:00 |
|
zhangds
|
31783fe647
|
fix: 修复优惠券勾选无法提交
|
2022-10-11 15:10:46 +08:00 |
|
Apple
|
2be0ae8b07
|
fix(系统模板)：修复【系统营销模板】在白名单（优惠券、优惠券白名单）中保存时，前端传的标题有误
|
2022-10-11 14:51:43 +08:00 |
|
zhangds
|
78553e8748
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-11 14:37:19 +08:00 |
|
zhangds
|
a002bd2ab8
|
fix: 修复兑换码管理统一使用计划的商品组件
|
2022-10-11 14:36:35 +08:00 |
|
wangsongsole
|
e2123996ab
|
fix:去掉兑换码新增-新增商品必选归属key的验证
|
2022-10-11 13:43:31 +08:00 |
|
zhangds
|
0236ca61e8
|
fix: 修复无数据table提示问题
|
2022-10-11 12:30:19 +08:00 |
|
zhangds
|
36cd7338c1
|
fix: 修复编辑商品无商品类型
|
2022-10-11 12:23:39 +08:00 |
|
zhangds
|
ee05ff8e1f
|
fix: 修复复制时间按计划来
|
2022-10-11 12:00:52 +08:00 |
|
zhangds
|
0db88833c3
|
fix: 有数据审核失败编辑规则不能编辑
|
2022-10-11 11:45:07 +08:00 |
|
zhangds
|
78e5365812
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-11 11:12:13 +08:00 |
|
zhangds
|
f19c700a76
|
fix: 修复兑换码优惠券校验
|
2022-10-11 11:10:01 +08:00 |
|
wangsongsole
|
13de482ca7
|
Merge branches 'couponV2.0' and 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-11 10:53:22 +08:00 |
|
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 |