zhangds
|
05eec75753
|
fix: 增加优惠券不勾选判断
|
2022-10-19 11:53:53 +08:00 |
|
zhangds
|
a11f09a30d
|
fix: 优惠券增加不勾选不展示
|
2022-10-19 11:28:00 +08:00 |
|
zhangds
|
b4eaba643f
|
fix: 修复立减金按钮loading
|
2022-10-19 11:04:46 +08:00 |
|
zhangds
|
b1fbde1599
|
fix: 修复key批次状态操作
|
2022-10-19 10:28:52 +08:00 |
|
zhangds
|
ce1e9142e7
|
fix: 修复时间如果打包判断错误
|
2022-10-18 18:22:06 +08:00 |
|
zhangds
|
12e60f94ff
|
fix: 优惠券如果是审核有删除
|
2022-10-18 17:47:59 +08:00 |
|
zhangds
|
85a0309e1c
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-18 16:07:11 +08:00 |
|
zhangds
|
233f6a8ab5
|
fix: 优惠营销系统状态
|
2022-10-18 16:07:06 +08:00 |
|
zhangds
|
b94aa4a175
|
fix: 优化立减金不用请求商品接口 复制可以修改映射商品
|
2022-10-18 16:06:07 +08:00 |
Apple
|
2f78bfb7ab
|
fix(模板中心)：修复预览模板，在优惠券的列表页中，后端返回了底部栏的图标，前端未展示
|
2022-10-18 15:49:20 +08:00 |
|
zhangds
|
a97c7c7bf9
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-18 15:30:14 +08:00 |
|
zhangds
|
af6944e53a
|
fix: 修复计划如果是创建中可以修改映射商品
|
2022-10-18 15:30:06 +08:00 |
|
Apple
|
ead575916c
|
fix:修复模板中心预览商品详情页，查看说明，富文本渲染异常
|
2022-10-18 14:16:38 +08:00 |
|
Apple
|
400a3aba6d
|
style:调整编辑器商品列表页面背景颜色
|
2022-10-18 11:57:39 +08:00 |
|
Apple
|
3698ffab6f
|
fix(系统模板):修复在优惠券中增加了图片、背景图、搜索栏、底部栏，切换进行保存时，增加的基础组件消失不见
|
2022-10-18 11:43:54 +08:00 |
|
zhangds
|
57fc9746be
|
fix: 未通过增加作废操作
|
2022-10-18 11:31:03 +08:00 |
|
zhangds
|
aec6d19577
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-18 11:02:59 +08:00 |
|
zhangds
|
46ee64d7fa
|
fix: 优惠列表只有 old_status = 1进行中/2暂停中 可以作废
|
2022-10-18 11:02:52 +08:00 |
wangsongsole
|
024a27236b
|
style:删除无用文件product
|
2022-10-18 10:34:53 +08:00 |
|
wangsongsole
|
92a2813fd0
|
style:删除无用代码和文件
|
2022-10-18 10:33:43 +08:00 |
|
zhangds
|
3895b3a94c
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-18 10:31:07 +08:00 |
|
zhangds
|
daff92c12d
|
fix: 修复key批次编辑绑定类型，不勾选不提交数据
|
2022-10-18 10:30:59 +08:00 |
|
Apple
|
69ad4b34b9
|
fix:修复编辑器详情页预览占位图不显示
|
2022-10-17 18:13:21 +08:00 |
|
wangsongsole
|
06136d9de5
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-17 17:56:52 +08:00 |
|
wangsongsole
|
13d3fb908c
|
fix：兑换码列表未通过状态 部分兑换码不能作废
|
2022-10-17 17:56:49 +08:00 |
|
Apple
|
aa9ed7c934
|
fix:修复模板预览详情页，缺少默认商品图
|
2022-10-17 17:51:05 +08:00 |
|
wangsongsole
|
921cc96581
|
fix:修复兑换码审核中依旧能删除bug
|
2022-10-17 17:36:48 +08:00 |
|
wangsongsole
|
db81c92fda
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-17 17:30:22 +08:00 |
|
wangsongsole
|
ed14f247dd
|
fix:重新对接兑换码列表删除状态
|
2022-10-17 17:30:20 +08:00 |
|
Apple
|
b753ab39ac
|
style：限制落地页预览，横向滚动条
|
2022-10-17 17:13:28 +08:00 |
|
Apple
|
d266466216
|
style(编辑器):优化编辑器预览模块代码，调整商品详情页支付按钮预览时悬浮锁定兼容性样式
|
2022-10-17 17:10:14 +08:00 |
|
zhangds
|
36e5064568
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-17 15:31:54 +08:00 |
|
zhangds
|
a5305cec9c
|
fix: 修复营销系统立减金编辑loading没消失
|
2022-10-17 15:31:47 +08:00 |
|
Apple
|
5bb0066e97
|
fix(模板中心):修复模板中心点击【使用】按钮进入编辑器页面，默认回显数据异常
style:清除console
|
2022-10-17 14:22:44 +08:00 |
|
Apple
|
82ce579267
|
style:调整编辑器预览区域验证码图案样式位置
|
2022-10-17 14:03:46 +08:00 |
|
Apple
|
ff234a06ef
|
style:调整图片组件样式
|
2022-10-17 11:51:26 +08:00 |
|
Apple
|
7ac263ecb4
|
fix(系统模板)：修复在优惠券中上传背景图后，页面展示空白，前端报错（偶现bug）
|
2022-10-17 11:32:12 +08:00 |
|
zhangds
|
221acec118
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-14 14:08:47 +08:00 |
|
zhangds
|
71047d6415
|
fix: 优化立减金加载速度
|
2022-10-14 14:08:42 +08:00 |
|
wangsongsole
|
1244f03fa7
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-14 13:54:51 +08:00 |
|
wangsongsole
|
47fb96cb1b
|
style：调整样式
|
2022-10-14 13:54:50 +08:00 |
|
zhangds
|
ef0f8071e6
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-14 13:46:48 +08:00 |
|
zhangds
|
99916f222f
|
fix: 修复table格式错误
|
2022-10-14 13:46:40 +08:00 |
|
wangsongsole
|
31a046c4f4
|
feat:【订单管理】已支付，充值失败的订单，新增按钮”改为成功
|
2022-10-13 18:18:13 +08:00 |
|
wangsongsole
|
413e23864b
|
feat:【订单管理】已支付，充值失败的订单，新增按钮重试退款、手动退款“
|
2022-10-13 18:12:36 +08:00 |
|
Apple
|
3346611a49
|
fix(模板中心):修复模板中心模板预览与落地页类型数据不一致bug
|
2022-10-13 17:44:20 +08:00 |
|
Apple
|
01aa8131f2
|
feat:模板中心自定义组件增加返回按钮，返回到商品列表设置页面
|
2022-10-13 17:06:57 +08:00 |
|
zhangds
|
5a29ddd3b0
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-13 16:17:11 +08:00 |
|
zhangds
|
80bc7f709f
|
fix: 修复商品范围时间错误 优化立减金数据回显示问题
|
2022-10-13 16:16:59 +08:00 |
|
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
|
44a240172a
|
fix(系统模板):修复优惠券添加背景图，切换时，背景不展示
|
2022-10-12 11:40:45 +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 |
|
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 |