Commit Graph

1953 Commits

Author SHA1 Message Date
wangsongsole 705fd8dff3 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-28 16:20:31 +08:00
wangsongsole dbdf4f80ae fix:修复兑换码列表条件查询 翻页数据未重置 2022-10-28 16:20:29 +08:00
zhangds eb7328938c Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-28 16:17:48 +08:00
zhangds 9d6268d4f7 fix: 修复优惠券列表查询重置 2022-10-28 16:17:36 +08:00
Apple bf1f020245 fix:修改订单管理列表字段名词修改,“减扣价(元)”修改为“减扣(元)”,“结算价(元)”修改为“券后价(元)” 2022-10-28 14:01:10 +08:00
Apple 1e77ffaef9 fix:编辑器商品列表页自定义组件配置后,切换页面配置,配置导航归为商品列表页 2022-10-28 11:44:47 +08:00
wangsongsole 73c5188a37 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-28 10:20:13 +08:00
wangsongsole a1f8d69f9d fix:修复【后台】【兑换码】创建中兑换码,生效开始时间不能编辑。 2022-10-28 10:20:11 +08:00
zhangds 885b748419 fix: 修复复制立减金不能编辑 2022-10-27 16:50:48 +08:00
zhangds 6e0cf6c90a fix: 修复营销计划兑换码验证 2022-10-27 16:33:17 +08:00
zhangds d0a88f6726 fix: 修复计划编辑只能编辑一次 2022-10-27 16:03:49 +08:00
zhangds 0e358ce147 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-27 15:48:50 +08:00
zhangds 9ca647b8d5 fix: 修复key批次绑定对象 2022-10-27 15:48:43 +08:00
wangsongsole f5010cb4fa Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-27 15:36:51 +08:00
wangsongsole 5ec14fcfce fix:修复兑换码权益商品编辑时 未通过数据库存展示不正常bug 2022-10-27 15:36:49 +08:00
zhangds 5258d98c60 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-27 15:13:36 +08:00
zhangds 76e3c6a72c fix: 修复批次创建设置 2022-10-27 15:13:30 +08:00
wangsongsole 7e56f4268f fix:修复新增兑换码批次,商品类型放在映射商品上面,并且在请求分销商授权商品接口时,前端未传商品分类的type值 2022-10-27 14:42:17 +08:00
wangsongsole 463301398c Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-27 13:36:16 +08:00
wangsongsole e61b6a44a7 style:调整新建商品组件布局 2022-10-27 13:36:14 +08:00
zhangds 38b6f766f5 fix: 修复新建计划落地页错误问题 2022-10-27 10:39:12 +08:00
zhangds 599c6e8b76 fix: 修复key批次已作废不能复制 2022-10-27 09:57:32 +08:00
zhangds fc136f745b fix: 修复复制和编辑的状态判断 2022-10-26 16:51:21 +08:00
zhangds a21555f0d4 fix: 区分复制和编辑 2022-10-26 16:48:04 +08:00
zhangds ad7b1e5201 fix: 修复编辑不能编辑 2022-10-26 16:39:59 +08:00
zhangds 1abd810f1a Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-26 14:16:53 +08:00
zhangds 6ef022a3f5 fix: 修复优惠券新建商品选择 2022-10-26 14:16:47 +08:00
wangsongsole 330a70f359 fix:修复【兑换码管理】兑换码管理中的普通商品,商品类型不允许选择 2022-10-26 11:57:08 +08:00
zhangds c31f1f697f fix: 增加立减金库存 2022-10-26 11:38:54 +08:00
zhangds c8c580c4bb fix: 编辑优惠券不提交 2022-10-26 11:04:51 +08:00
zhangds 3e72ae9484 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-26 10:52:55 +08:00
zhangds 04b2869e53 fix: 修复默认商品权重 2022-10-26 10:48:32 +08:00
wangsongsole b1365d44f8 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-26 10:28:17 +08:00
wangsongsole 3e6139bb65 fix:修复编辑和复制兑换码数据勾选不正确问题 2022-10-26 10:28:14 +08:00
zhangds 61b4e484f3 fix: key批次绑定对象 2022-10-25 18:10:32 +08:00
Apple 28595d9cc9 fix(落地页列表):修复【落地页】预览显示与C端不一致bug 2022-10-25 17:02:39 +08:00
zhangds c75b9c4a01 fix: key批次优惠券 2022-10-25 14:23:13 +08:00
zhangds 57e0cc6dfe fix: key批次增加商品类型 2022-10-25 13:39:11 +08:00
zhangds 60f1adc2d0 fix: 增加key批次商品类型 2022-10-24 18:30:27 +08:00
zhangds f67fc9017b fix: key批次增加新增商品类型 2022-10-24 17:52:31 +08:00
zhangds 51fc29c8f4 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-24 16:36:23 +08:00
zhangds b255755b18 fix: 增加计划新建商品类型 2022-10-24 16:36:15 +08:00
zhangds 89dbb1c3e8 fix: 增加优惠券不能选择卡密 2022-10-24 16:27:24 +08:00
zhangds 26fbd2d452 fix: 营销计划增加商品类型 2022-10-24 15:58:07 +08:00
wangsongsole 884c686980 feat:商品范围列表立减金新增商品编号 2022-10-24 15:29:55 +08:00
zhangds f9f2b095a0 fix: 删除无用代码 2022-10-24 11:47:28 +08:00
zhangds 975bccbda8 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-24 11:42:33 +08:00
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
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