zhangds
|
c9b2ae8fe0
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-20 15:08:51 +08:00 |
|
zhangds
|
81959781b1
|
fix: 增加key批次名字可修改
|
2022-10-20 15:08:45 +08:00 |
wangsongsole
|
f0f3ddd975
|
fix:打开商品类型选择
|
2022-10-20 11:11:24 +08:00 |
|
zhangds
|
cb80925a37
|
fix: 优化营销计划状态样式
|
2022-10-19 18:14:05 +08:00 |
|
zhangds
|
b5f6b0de4c
|
fix: key批次复制可编辑
|
2022-10-19 16:36:30 +08:00 |
|
zhangds
|
b1970c5ead
|
fix: 作废订单不编辑 2作废超过计划时间不能复制
|
2022-10-19 16:29:25 +08:00 |
|
zhangds
|
967d0b2d8e
|
fix: 修复优惠券归属key不请求接口
|
2022-10-19 15:53:03 +08:00 |
Apple
|
056c247e68
|
style(ipt组件)：修改ipt组件禁用样式
|
2022-10-19 14:37:08 +08:00 |
|
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 |