Commit Graph

2156 Commits

Author SHA1 Message Date
zhangds 12bf112c20 fix: 修改立减金库存数量 2022-10-24 11:42:27 +08:00
wangsongsole dd29248466 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-24 11:41:42 +08:00
wangsongsole 0fb9a31c33 fix:修复立减金商品库存计算错误 2022-10-24 11:41:40 +08:00
zhangds dd6110e4d6 fix: 新建商品增加已经选择的不能选择 2022-10-24 11:23:06 +08:00
zhangds c89faffc0b 增加商品权重值 2022-10-24 10:58:16 +08:00
zhangds 23c0eda18a fix: 修复优惠券商品范围商品编号 2022-10-24 10:55:34 +08:00
zhangds dc56b584a6 fix: 修复新建商品映射商品 2022-10-24 10:53:07 +08:00
zhangds e6e61dccc3 fix: 修复新增立减金报错 2022-10-24 09:47:06 +08:00
zhangds 852a94362a fix: 增加新建商品编辑 2022-10-21 18:32:07 +08:00
zhangds 55200cfedc Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-21 18:19:14 +08:00
zhangds f8f61f5ba9 fix: 增加新建商品编辑 2022-10-21 18:19:08 +08:00
zhangds dc40ac8587 fix: 新建商品新增完成 2022-10-21 17:09:25 +08:00
zhangds 28b15a22b4 fix: 优化swriper 2022-10-21 16:48:16 +08:00
Apple c63c2c0c2b fix:修复编辑器底部栏目分类未回显
style:美化编辑器预览区域样式
2022-10-21 16:16:14 +08:00
zhangds 850b34545a fix: 增加数据格式 2022-10-21 16:11:15 +08:00
zhangds e093e7d9ac fix: 增加图片上传接口 2022-10-21 15:46:38 +08:00
Apple 5f7050d9de style:优化编辑器色盘选择器样式 2022-10-21 11:35:39 +08:00
zhangds f05c9e5d77 fix: 修复商品 2022-10-20 18:33:50 +08:00
Apple f3b20eaeae feat(编辑器):落地页增加输入框实时显示文字颜色交互 2022-10-20 16:46:21 +08:00
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