HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,927 Commits 12 Branches 0 Tags 188 MiB
Commit Graph

2606 Commits

Author SHA1 Message Date
zhangds 8b80420d95 fix: 修复优惠券列表查询时间不能超过3年 2022-10-31 11:20:05 +08:00
zhangds ca63c4a6ee Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-28 16:43:26 +08:00
zhangds 07ce002932 fix: 修复优惠券复制删除 id的过程 2022-10-28 16:43:20 +08:00
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
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
zhangds 1f0113a776 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-10 17:54:21 +08:00
zhangds d2e66e5b9c fix: 修复key批次优惠券 2022-10-10 17:54:13 +08:00
zhangds bbce9223ba fix: 修复兑换码key批次编辑 2022-10-10 17:03:56 +08:00
Apple d7b0c04388 style:调整编辑器预览区域兼容性，搜索栏，底部栏目样式 2022-10-10 16:13:21 +08:00
zhangds 8025aef880 fix: 修复兑换码key批次编辑 2022-10-10 15:57:55 +08:00
wangsongsole a0976834b5 feat:【订单列表】新增字段“商品类型” 2022-10-10 10:10:47 +08:00
Apple b3a9895c51 fix(编辑器模块)：立减金兑换说明标题删减名称显示 2022-10-10 09:57:46 +08:00
wangsongsole 40cc560e90 style:【订单列表】订单类型中的立减金和直充，修改为“虚拟” 2022-10-10 09:45:06 +08:00
zhangds d015c4ae1b fix: 修复优惠券key批次接口 2022-10-09 18:32:08 +08:00
zhangds 0b2c7ddf5c fix: 修复兑换码key计划和key展示问题 2022-10-09 15:39:22 +08:00
zhangds b1154b6533 fix: 修复创建中的优惠券不勾选不提交 2022-10-09 15:22:29 +08:00
zhangds 28843c43b5 fix: 修复key批次进行中编辑重复数据问题 2022-10-09 15:14:41 +08:00
zhangds f977cb12f6 fix: 增加key批次创建中删除接口 2022-10-08 17:26:20 +08:00
zhangds f035698053 fix: 修复计划绑定类型切换 2022-10-08 16:38:55 +08:00
zhangds 4140dd010d fix: 修复优惠券减保留2位小数 2022-10-08 15:19:19 +08:00
zhangds f346189eff fix: 修复兑换码-优惠券列表key批次审核中无法撤销审核 2022-10-08 14:40:01 +08:00
zhangds 6a3b162e4e fix: 增加营销计划左侧菜单栏 2022-10-08 14:27:32 +08:00
zhangds f80077095f fix: 修复key批次时间错误 2022-09-30 18:32:02 +08:00
zhangds 496197b6bf fix: 修复key批次 兑换码新增有原数据 2022-09-30 18:23:47 +08:00
zhangds 769d16c3a0 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 18:08:51 +08:00
zhangds abf29e5759 fix: 修复优惠券时间不能修改 2022-09-30 18:08:44 +08:00
wangsongsole bac30b4521 feat(兑换码管理列表)：删除兑换码时新增提示确认框 2022-09-30 16:59:40 +08:00
wangsongsole 5c98718be5 style(兑换码管理列表-商品范围)：调整删除按钮为红色 2022-09-30 16:58:43 +08:00
wangsongsole 37958004df fix(兑换码复制)：修复兑换码复制时商品不能编辑 2022-09-30 16:32:50 +08:00
wangsongsole 2d73e4b078 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 16:23:16 +08:00
wangsongsole 5b99fe656a style:删除商品组件log 2022-09-30 16:23:14 +08:00
Apple 4fef6f3c09 fix(我的模板):新增优惠券白名单模板，已经上传输入框，保存时仍提示【请上传落地页输入框】 2022-09-30 15:41:04 +08:00
zhangds 8827d70b24 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 15:34:50 +08:00
zhangds 6185b022cd fix: 修复key批次编辑绑定对象字段格式错误 2022-09-30 15:34:42 +08:00
wangsongsole 3c871f72f9 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 15:30:45 +08:00
wangsongsole c199b03973 teat(兑换码管理)：新增 生成中状态 2022-09-30 15:30:42 +08:00
zhangds 70dbb143e3 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 15:21:55 +08:00
zhangds 44b730dbf7 fix: 增加优惠券生成中状态并且增加删除功能 2022-09-30 15:21:42 +08:00
wangsongsole 2e3e045c66 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 15:02:49 +08:00
wangsongsole 66e7c20d1f fix(新增key):修复新增key 样式问提 2022-09-30 15:02:46 +08:00
Apple e6800826fd fix(系统模板)：优惠券在商品列表页新增图片，将跳转链接的限制12个字符，修改为50个字符 2022-09-30 15:01:16 +08:00
Apple 3b353c244b 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: 修复商品范围列表table一样
 2022-09-30 14:46:23 +08:00
Apple d259d8537e style(落地页编辑)：调整侧边栏目缩放样式比例 2022-09-30 14:45:41 +08:00
zhangds 1948db63af Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 14:44:08 +08:00
zhangds b36bd95504 fix: 修复商品范围列表table一样 2022-09-30 14:44:01 +08:00
wangsongsole 5816ae453c Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 14:41:13 +08:00
wangsongsole 6cc1a099a1 feat(api):新增兑换码删除接口 
feat(兑换码列表)：新增兑换码删除逻辑
 2022-09-30 14:41:11 +08:00
zhangds 99cc27f69e fix: 修复优惠券商品范围列表 类型 2022-09-30 14:40:55 +08:00
zhangds fb1a35b82c fix: 修复优惠券商品的时间 2022-09-30 14:34:59 +08:00
zhangds 4754ba441d Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 14:28:57 +08:00
zhangds 4fc4bbdbeb fix: 修复编辑、复制、新增落地页白名单数据 2022-09-30 14:28:51 +08:00
wangsongsole 9240377b56 style(兑换码管理列表)：抽离静态文件增加可读性 
feat(兑换码管理列表)：根据测试点调整状态操作按钮并新增删除操作
 2022-09-30 14:00:34 +08:00
zhangds 0318356dfa Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 13:38:23 +08:00
zhangds 2cd4c83532 fix: 修复key批次绑定对象回显问题 2022-09-30 13:38:15 +08:00
wangsongsole bb3fe18b37 fix：修复兑换码切换 已结束状态报错 2022-09-30 12:01:52 +08:00
wangsongsole a1061ddf63 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 11:45:09 +08:00
wangsongsole d46f2cf858 fix:修复兑换码复制时回显计划和批次 2022-09-30 11:45:07 +08:00
zhangds e183c32f5d fix: 修复优惠券编辑根据计划时间选择 2022-09-30 11:19:54 +08:00
zhangds 08f28aaad0 fix: 修复优惠券复制、编辑归属key不能编辑 2022-09-30 10:49:35 +08:00
zhangds f5c8853a78 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-30 10:23:57 +08:00
zhangds 2e7a0fad9f fix: 修复key批次绑定类型不可修改 2022-09-30 10:23:42 +08:00
wangsongsole 9756c22b35 合并冲突 2022-09-30 10:22:26 +08:00
wangsongsole c864e82dea fix:兑换码新增、复制请求新增addCode标识 2022-09-30 10:21:46 +08:00
zhangds de0737711d fix: 修复兑换码批次无法新增 2022-09-29 18:37:44 +08:00
zhangds 9acdabaa55 fix: 修复key批次绑定对象审批是否可编辑 2022-09-29 18:19:21 +08:00
zhangds 8a6709a1ff fix: 修复计划编辑时间无法修改 2022-09-29 16:37:53 +08:00
zhangds 2dba919238 fix: 修复key下载模版为https模式 2022-09-29 16:19:20 +08:00
zhangds b20726b53d Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-09-29 15:18:37 +08:00
zhangds 41d07e3771 fix: 兑换码无法显示select 2022-09-29 15:18:27 +08:00
zhangds df8b667bf8 1) 修复计划复制、编辑、新增绑定类型切换落地页切换 2022-09-29 10:23:50 +08:00
wangsongsole 5357a6b41e 订单管理新增状态限制 2022-09-28 18:32:06 +08:00
wangsongsole 8670b0b8ca 订单列表新增下拉筛选状态 2022-09-28 17:22:17 +08:00
zhangds 623cf6b926 key 批次审核 2022-09-28 16:32:10 +08:00
wangsongsole 4c347bf71e 订单列表新增支付状态 2022-09-28 16:08:04 +08:00
wangsongsole 88f6d5d509 优化menu代码 2022-09-28 15:58:49 +08:00
zhangds f9c4b9f3a8 1） 修复立减金时间问题 2022-09-27 17:02:46 +08:00
zhangds dfbd7cd67a 1) 增加优惠券列表tab切换错误 2022-09-27 16:30:07 +08:00
zhangds 09a61bbb47 1) 落地页重新获取数据 2022-09-27 15:57:59 +08:00
zhangds aafce8ea5d 1) 修复key批次新建不能选择对象绑定 2022-09-26 16:55:27 +08:00
zhangds 49ac172d38 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-26 14:20:08 +08:00
zhangds e644424f09 1.优惠券管理列表=>编辑=>新增立减金时间问题-完成 
2.优惠券=>商品、立减金h5模版恢复 -完成
3.优惠券编辑,开始时间不能修改-完成
 2022-09-26 14:19:57 +08:00
Apple 222bf18b07 编辑器-搜索栏背景色增加透明度属性 2022-09-26 12:04:43 +08:00
Apple 3395cfc61a 解决落地页预览页面回显白屏 2022-09-23 16:36:25 +08:00
Apple 1e7997b3ef 编辑器整体自测 2022-09-23 15:20:03 +08:00
Apple e49c6fd6e9 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 
* 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
  删除多余代码
  1) 修复兑换h5模版错误问题
  1) 优化计划优惠券模版h5显示问题
 2022-09-23 15:08:23 +08:00
Apple aa47a2e622 编辑器底部栏删除/添加组件联动 2022-09-23 14:32:26 +08:00
wangsongsole 2887ed778f 删除多余代码 2022-09-23 14:09:36 +08:00
zhangds 2da317b0a4 1) 修复兑换h5模版错误问题 2022-09-23 14:01:58 +08:00
zhangds bdac625ed5 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-23 10:57:56 +08:00
zhangds 2ca4c395d2 1) 优化计划优惠券模版h5显示问题 2022-09-23 10:57:49 +08:00
Apple bfcadeeb0b 编辑器-标题组件优化 2022-09-23 10:45:45 +08:00
zhangds 0b2b8647b4 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-22 18:32:07 +08:00
zhangds 0be89c1ed6 1） 增加key批次优惠券 2022-09-22 18:31:55 +08:00
Apple 571edf3c51 调整编辑器预览中心区域兼容样式 2022-09-22 17:31:09 +08:00
zhangds 3e20513d93 1) 增加key批次复制 2022-09-22 16:58:27 +08:00
zhangds 6d0bc162f4 1) 增加优惠券立减金模版 2022-09-22 16:28:30 +08:00
zhangds 6782d76dfe Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-22 15:51:47 +08:00
zhangds 0713d0491b 1) 增加key编辑 2022-09-22 15:51:40 +08:00
Apple ea2efa7f18 系统模版流程自测，细节优化 2022-09-22 15:20:59 +08:00
Apple 70723332c8 优化编辑器兼容样式 2022-09-22 13:45:22 +08:00
zhangds 2c0d558cb8 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-22 13:41:02 +08:00
zhangds 34c2519505 1） 增加key批次优惠券 2022-09-22 13:40:56 +08:00
Apple abba6a9dd8 优惠券编辑器底部栏默认配置回填 2022-09-22 11:05:00 +08:00
Apple 4e200cc75a 落地页编辑接口（优惠券&优惠券白名单）联调 2022-09-22 09:48:44 +08:00
Apple 1b0fd5af7a 编辑器商品详情页（兑换码/白名单/优惠券）优化 2022-09-21 18:17:45 +08:00
zhangds 86f4bad792 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-21 18:06:58 +08:00
zhangds 530fe828db 1） 增加优惠券编辑 2022-09-21 18:06:51 +08:00
Apple c877a44579 优化编辑器优惠券商品列表页基础配置代码 2022-09-21 17:34:31 +08:00
zhangds d33c244727 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-21 16:04:01 +08:00
zhangds 992f82c540 1) 增加优惠复制 2022-09-21 16:03:55 +08:00
Apple d3078b55dd 优化编辑器落地页代码 2022-09-21 15:50:14 +08:00
Apple 2f88d2d1a7 优化编辑器兑换码/白名单/优惠券落地页代码 2022-09-21 15:48:38 +08:00
zhangds 4d345aab9f 1) 优化优惠券管理商品数据 2022-09-21 15:25:21 +08:00
zhangds 398e5130a2 1) 修改文件路径 2022-09-21 14:31:43 +08:00
Apple b78af56fb7 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 
* 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
  1) 优惠计划优惠券
  1） 增加优惠券
 2022-09-21 14:26:07 +08:00
Apple cd1c37268d 更改文件名称 2022-09-21 14:25:55 +08:00
zhangds 851e91ce02 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-21 14:21:17 +08:00
zhangds 24b1744063 1) 优惠计划优惠券 2022-09-21 14:21:11 +08:00
Apple e732ba67c9 优化落地页兑换码/白名单/优惠券目录结构,抽离公用组件 2022-09-21 14:18:31 +08:00
zhangds 54d7b196a8 1） 增加优惠券 2022-09-21 12:01:41 +08:00
zhangds 49b2d3f6ad Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-21 09:59:45 +08:00
zhangds 0866805d51 1) 修改tabpage 第一次不加载 2022-09-21 09:59:37 +08:00
Apple cbfb32a6eb 编辑器-优惠券/优惠券白名单静默设定 2022-09-21 09:59:28 +08:00
zhangds 81c632cca4 1) 增加h5 2022-09-20 17:58:28 +08:00
Apple 8a31ec46aa 模板中心代码优化，预览模板老数据兼容处理 2022-09-20 17:28:48 +08:00
zhangds a5c794eae7 1) 增加优惠券管理列表搜索 2022-09-20 14:40:24 +08:00
zhangds ae7b20d473 1) 优惠券弹窗 2022-09-20 14:29:02 +08:00
zhangds e1d0f8292b Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-20 14:28:24 +08:00
zhangds 486624c530 1) 优惠券编辑样式修改 2022-09-20 14:16:52 +08:00
wangsongsole a888b05722 库存数量取整 2022-09-20 12:11:26 +08:00
zhangds 2afb56c48e 1) 增加优惠券 2022-09-20 12:02:30 +08:00
Apple 4582b2ccea 优化编辑器富文本存储数据组装 2022-09-20 11:29:19 +08:00
Apple 04621019a1 优化编辑器富文本 2022-09-20 11:04:24 +08:00
wangsongsole 22e4a218a2 修改立减金和兑换码库存计算错误 2022-09-20 11:02:53 +08:00
Apple b41a3697a1 完成编辑器预览-详情页 2022-09-19 18:24:41 +08:00
Apple 720b12704c 完成编辑器配置新增/编辑预览商品列表页搜索栏配置，背景图融入/底部栏，兼容性样式处理 2022-09-19 17:38:13 +08:00
Apple c27ebf9bed 解决优惠券/优惠券白名单Tab切换，输入框图片与上传不一致，组件未及时更新 2022-09-19 14:34:04 +08:00
zhangds 3a8fdd7f44 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-19 12:05:09 +08:00
zhangds 42598e6854 1) 增加计划优惠券 2022-09-19 12:04:54 +08:00
Apple f91182f41e Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 
* 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
  与后端对接订单列表优惠卷-待支付状态以及字段修复
 2022-09-19 11:01:26 +08:00
Apple a6d24316b4 优惠券与优惠券白名单Tab切换，数据处理 2022-09-19 11:01:17 +08:00
wangsongsole 66ea51b220 与后端对接订单列表优惠卷-待支付状态以及字段修复 2022-09-19 10:42:23 +08:00
Apple e775c28ba3 修复【编辑落地页】搜索栏设置框体/背景/文字颜色配置不一致bug 2022-09-19 09:58:08 +08:00
许红梅 9f298f07ef 优化视图背景颜色 2022-09-18 19:46:14 +08:00
许红梅 10e4d29b9f 系统模板编辑回显页面处理 2022-09-16 16:45:43 +08:00
许红梅 1e65e269b3 Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-16 16:45:10 +08:00
许红梅 7457efe98f 系统模板新增/编辑接口联调，数据处理 2022-09-16 16:44:50 +08:00
zhangds d4b062df7e Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-16 15:36:02 +08:00
zhangds 5db99f4103 1) 修复新建优惠券key批次查询错误 2022-09-16 15:35:52 +08:00
许红梅 72ee4b2b11 修改变量名称，与后端统一 2022-09-16 14:40:01 +08:00
许红梅 10b4d02838 解决优惠券白名单商品列表页面基础组建增加删除数据不匹配 2022-09-16 11:01:03 +08:00
许红梅 17f38c3491 我的模板列表，落地页类型渲染处理，兑换码 3 
白名单   1
优惠券   4
优惠券白名单  8
 2022-09-16 09:39:40 +08:00
许红梅 6b6b5b098f 落地页模板优惠券白名单/优惠券新增数据处理 2022-09-15 16:36:23 +08:00
许红梅 d2b65933fd 优化编辑器配置 2022-09-15 16:17:09 +08:00
许红梅 da71305704 编辑器优惠券白名单数据处理 2022-09-14 13:58:37 +08:00
许红梅 fbf79f06d1 Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-14 13:58:12 +08:00
zhangds 7a21b16397 1) 增加优惠券编辑接口 2022-09-14 13:50:04 +08:00
许红梅 8f90a194b9 编辑器优惠券白名单数据处理 2022-09-14 13:39:42 +08:00
zhangds b63367e30a 1) 修复优惠券列表初始化页面请求两次 2022-09-14 10:20:26 +08:00
zhangds 1ce706af15 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-13 18:15:17 +08:00
zhangds 70ab76ce00 1） 增加优惠券列表启用停用接口 2）增加优惠券撤销审批接口 3）增加优惠券商品范围列表 2022-09-13 18:07:08 +08:00
许红梅 1fa59939a8 编辑器融入优惠券白名单模板 2022-09-13 17:58:55 +08:00
许红梅 ae7369180c 修复编辑器立减金模板样式错乱 2022-09-13 16:26:08 +08:00
许红梅 1f011a2085 编辑器商品详情页立减金数据联动，实时渲染展示 2022-09-13 14:57:20 +08:00
zhangds 66d39d2f1e 1) 增加列表状态显示 2022-09-13 14:13:34 +08:00
Wind-58 080532a25c 删除兑换码组件多余代码 2022-09-13 11:19:20 +08:00
Wind-58 a8348c198f 补充复制兑换码丢失绑定数 2022-09-13 11:03:28 +08:00
许红梅 8775714379 优惠券立减金页面编写 2022-09-09 19:08:59 +08:00
许红梅 dd738fffbd 优惠券商品详情页页面编写10% 2022-09-09 18:28:31 +08:00
许红梅 6c764cb521 商品列表页配置预览优化完毕 2022-09-09 18:05:30 +08:00
许红梅 1451ca3e47 编辑器视图区预览兼容性调整 2022-09-09 17:29:05 +08:00
许红梅 fcb6b32e45 调整编辑器删除框文本 2022-09-09 16:36:53 +08:00
许红梅 1e99514aa1 优化编辑器预览视图兼容性适配方案，scale计算 2022-09-09 16:25:29 +08:00
zhangds 704b5ff62a Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-09 12:21:46 +08:00
zhangds 94705aadb3 1） 增加优惠券列表 2022-09-09 12:21:37 +08:00
许红梅 f2637a0dea 完成编辑器底部栏限制，配置一个时，不显示bottomBar 2022-09-09 11:42:21 +08:00
许红梅 5d052825ea 完成编辑器背景图新增背景颜色配置，渲染处理 2022-09-09 11:30:53 +08:00
许红梅 ab98bd7872 完成标题文字Tab切换，配置栏新增传图，优化预览区代码 2022-09-09 11:11:40 +08:00
许红梅 90635e1a83 完成搜索栏配置 2022-09-08 18:09:31 +08:00
许红梅 702a52941c Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-08 18:09:10 +08:00
许红梅 3063dc1998 完成编辑器搜索栏新增背景颜色，输入文字颜色配置 2022-09-08 18:09:00 +08:00
zhangds 16a68c54de 1) 增加新建优惠券接，归属计划和归属key 2022-09-08 17:03:20 +08:00
zhangds 1d7973c384 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-08 16:42:48 +08:00
zhangds 80a5184a80 1） 增加新建优惠券接口联调 2022-09-08 16:42:36 +08:00
许红梅 eff0085d73 美化编辑器优惠券滚动条样式 2022-09-08 15:03:33 +08:00
许红梅 10463263e3 修正优化券模板设置字段限制 2022-09-08 11:16:42 +08:00
许红梅 d6da93a358 删除console 2022-09-07 18:56:10 +08:00
许红梅 cbc57b9c27 Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-07 18:55:37 +08:00
许红梅 03289ae434 调整底部栏render数据 2022-09-07 18:55:26 +08:00
zhangds c60a5ec1ae Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-07 18:49:41 +08:00
zhangds 868727ad49 1) 增加立减金联动商品范围 2022-09-07 18:49:34 +08:00
许红梅 6e61ab1239 落地页编辑器删除组件后页面交互处理 2022-09-07 18:48:22 +08:00
许红梅 2a70efa63d 编辑器数据组装，流程测试 2022-09-07 18:23:54 +08:00
zhangds 76d5fbd79f Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-07 18:18:03 +08:00
zhangds 72bcc02051 1) 增加商品编辑选中联动 2022-09-07 18:17:56 +08:00
Wind-58 d817aed67a Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-07 17:29:21 +08:00
Wind-58 a136830e0d 修复编辑兑换码接口请求错误 2022-09-07 17:29:19 +08:00
zhangds 53ac05411f Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-07 17:19:00 +08:00
zhangds 6d8f62c89b 1) 修复商品联动 2022-09-07 17:18:52 +08:00
许红梅 2b3d681027 编辑器删除：计算div最顶边距离浏览器的位置，控制删除框定位 2022-09-07 15:50:13 +08:00
zhangds 046ab5dd5b 1) 完成新建优惠券编辑 2022-09-07 15:35:26 +08:00
zhangds a79f5628df Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-07 12:22:15 +08:00
zhangds 7a215ea249 1) 增加商品范围删除联动 2022-09-07 12:08:59 +08:00
Wind-58 1e393e5571 解决优惠卷组件冲突 2022-09-07 12:07:55 +08:00
Wind-58 c19b54f266 营销计划增加优惠卷组件以及修改优惠卷组件 2022-09-07 12:02:01 +08:00
zhangds 16dce65170 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-07 11:51:31 +08:00
zhangds 2e73f3d77a 1) 完成新建有回去商品范围联动select 2022-09-07 11:51:24 +08:00
Wind-58 576cca15bf 订单列表新增优惠卷状态 2022-09-07 10:56:26 +08:00
Wind-58 fb58e6f1a1 兑换码新增绑定数正则验证 2022-09-07 10:38:17 +08:00
Wind-58 99e99df028 删除多余代码 2022-09-07 10:09:01 +08:00
zhangds c8f5dab29a Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-06 19:18:19 +08:00
zhangds 6428c05efa 1） 新建优惠券接口优惠 2022-09-06 19:18:11 +08:00
Wind-58 acb5c92f63 修复兑换码新增和复制字段转换错误 2022-09-06 18:30:48 +08:00
许红梅 6fe7499eb0 落地页编辑器删除组件样式编写 2022-09-06 17:54:31 +08:00
许红梅 ac73e2954d 完成编辑器底部栏配置与预览联动 2022-09-06 16:11:35 +08:00
许红梅 911194dcbb 完成落地页编辑器搜索栏联动配置预览效果 2022-09-06 15:56:47 +08:00
许红梅 c47be2cc40 完成落地页编辑器底部栏数据组装 2022-09-06 11:23:52 +08:00
zhangds b04840493a Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-05 18:33:33 +08:00
zhangds 5c6328a49c 1） 增加优惠券时间 2022-09-05 18:33:24 +08:00
Wind-58 3a8ce6d5f0 Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-05 18:15:14 +08:00
Wind-58 dc97671255 注释多余代码 2022-09-05 18:15:11 +08:00
zhangds 9e7055ed52 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-05 18:08:06 +08:00
zhangds 1168ea84f1 1） 增加优惠券立减金 2022-09-05 18:07:58 +08:00
许红梅 ea9800ddbf 完成落地页编辑器标题配置与预览联动 2022-09-05 17:44:41 +08:00
许红梅 c199ce1f0a 完成营销系统编辑器搜索栏框体颜色及文本对齐配置 2022-09-05 16:07:51 +08:00
zhangds e54d19407f Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-05 15:46:27 +08:00
zhangds 30dd092399 1) 增加新建优惠券table 2022-09-05 15:46:18 +08:00
Wind-58 0eaf45c6f9 修复bug并新增兑换码绑定数字段同时与后端联调 2022-09-05 12:26:58 +08:00
许红梅 8cb1e3670c 完成编辑器搜索栏配置联动 2022-09-02 19:48:32 +08:00
许红梅 d94593cdcf 完成编辑器背景图联动 2022-09-02 14:09:39 +08:00
许红梅 ada8132384 完成图片组件配置预览 2022-09-02 13:36:36 +08:00
许红梅 fa4d0b940b 完成组件库图片配置与预览效果联动 2022-09-02 13:35:50 +08:00
Wind-58 1cfc91505c 优化兑换码列表代码 兑换码新增复制生效时间做限制 2022-09-02 11:13:35 +08:00
zhangds a95eacc7a0 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-02 11:06:54 +08:00
zhangds 98fa4f7cbc 1) 增加优惠券新建商品 2022-09-02 11:06:47 +08:00
Wind-58 d597a7d93b 调整并优化兑换码代码 2022-09-02 10:44:48 +08:00
许红梅 1d351102da 编辑器基础组件库配置静态页面编写完毕 2022-09-02 10:43:38 +08:00
许红梅 3c4beb4c8e 完成优惠券编辑器商品列表页组件库布局 2022-09-02 09:43:05 +08:00
许红梅 deadaed2dc Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-02 09:42:33 +08:00
许红梅 10458a43ca no message 2022-09-02 09:42:15 +08:00
zhangds a481802501 1) 增加js浮点运算准确度公用方法 2022-09-02 08:51:24 +08:00
许红梅 2c8f66a1b3 完成优惠券落地页编辑器底部栏配置静态页面编写 2022-09-01 17:40:02 +08:00
许红梅 54522ad248 完成优惠券落地页编辑器底部栏配置静态页面编写 2022-09-01 17:12:13 +08:00
zhangds 86d1c00b25 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-01 15:03:56 +08:00
zhangds 123435487c 1) 增加优惠券table 2022-09-01 15:03:46 +08:00
Wind-58 f052646034 修改兑换码 2022-09-01 14:16:32 +08:00
Wind-58 bcd82a9b16 区分兑换码编辑、新增、复制代码 2022-09-01 11:21:04 +08:00
Wind-58 72b4dae442 暂存提交 2022-09-01 10:42:40 +08:00
zhangds 502979a41d Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-09-01 10:17:56 +08:00
zhangds 4bd3adfb40 1) 修复计划无法新增 2022-09-01 10:17:45 +08:00
Wind-58 932c4c107a 优化商品组件样式代码 2022-09-01 09:50:27 +08:00
Apple 4170bc65d0 完善优惠券编辑组件库模块编写 2022-09-01 09:44:33 +08:00
Apple bf2b867ebf 完成编辑器商品列表页框架搭建 2022-09-01 09:42:27 +08:00
wangsongsole ba55a7917f Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-31 18:34:45 +08:00
wangsongsole 2fb3d6916a 提交兑换码代码 2022-08-31 18:34:43 +08:00
zhangds 3e969f0a78 1） 增加js正则校验公用方法 2）增加新建优惠券表单校验 2022-08-31 18:11:04 +08:00
zhangds ce00c7779b Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-31 14:09:56 +08:00
zhangds 357f958437 1) 优化公用input 样式 2） 增加新增优惠券表单验证 2022-08-31 14:09:49 +08:00
Apple 75fb80965f 排查icon引入不生效 2022-08-31 14:09:17 +08:00
Apple fe10abce01 引入字体图标库 2022-08-31 11:09:33 +08:00
zhangds e6c43029dc Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-31 10:51:47 +08:00
zhangds a82f1ed8ae 1) 表单 2022-08-31 10:51:41 +08:00
wangsongsole 2c6707d618 优化兑换码模块代码 2022-08-31 10:45:55 +08:00
wangsongsole d90f8b6dc4 优化公用Form报错 2022-08-31 10:05:37 +08:00
wangsongsole b884dc68eb 优化兑换码编辑title展示字段，新增兑换码新增发放总量验证 2022-08-31 09:55:38 +08:00
zhangds 3afd84ad17 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-31 09:45:26 +08:00
Apple eb79a228f2 优化落地页编辑多余引入css样式 2022-08-30 16:44:06 +08:00
Apple d141c1a2dc 编码实现落地页编辑模块功能，完成优惠券落地页数据处理，配置与预览功能模块 2022-08-30 15:12:05 +08:00
zhangds 2a695254d3 1) 增加表格动态改变Column 2022-08-29 18:02:22 +08:00
wangsongsole dc2aa9e2f2 修复app.css代码错误 2022-08-29 11:37:33 +08:00
wangsongsole 685ad20e3a 优化登录界面代码 2022-08-29 10:54:56 +08:00
wangsongsole 8cc7012a18 根据原型调整兑换码页面 2022-08-29 10:21:28 +08:00
zhangds 394890ae37 1) 增加优惠券新增列表 2022-08-29 10:10:48 +08:00
zhangds 86708c2688 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-26 18:33:22 +08:00
zhangds dd2181293b 1） 增加优惠券页面 2022-08-26 18:33:00 +08:00
wangsongsole f14e72c486 修复订单列表 切换table条件时 page未重置 优化app.css代码 2022-08-26 15:17:02 +08:00
wangsongsole 708ed6f42d 修改兑换码新增样式 2022-08-26 14:46:44 +08:00
wangsongsole fb81e2e16c 修改product组件样式 2022-08-26 14:39:58 +08:00
wangsongsole 95e1fc97a1 修复app.css样式覆盖问题 2022-08-26 14:23:44 +08:00
wangsongsole ed908b1d97 更改公共样式 统一select和datepicker样式 2022-08-26 14:16:28 +08:00
wangsongsole 8ab5cfb506 新增兑换码复制逻辑 2022-08-26 13:35:02 +08:00
Apple e36f8c6f3f 优化表格组件checkbox样式，订单管理列表宽度调整 2022-08-26 11:53:15 +08:00
wangsongsole 06097d73eb 修复 grid 合并丢失数据 禁用兑换码编辑、复制、新增相关表单 2022-08-26 09:47:28 +08:00
Apple dad624a1bc Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 
* 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
  1) 增加优惠券增加
  1) 增加消费卷table
 2022-08-25 18:07:16 +08:00
Apple 17c2a620bd 解决优惠券导航选中，路由与一级菜单高亮不匹配 2022-08-25 18:07:05 +08:00
zhangds ae512f3eb2 1) 增加优惠券增加 2022-08-25 18:06:41 +08:00
zhangds 4706289d02 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 16:29:24 +08:00
zhangds aa2b41e0e1 1) 增加消费卷table 2022-08-25 16:29:18 +08:00
Apple fb97d83dcb 删减模版中心CSS样式多余引入，订单模块入口调整 2022-08-25 16:16:52 +08:00
zhangds 867e8a13cd Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 15:32:37 +08:00
zhangds 1e8bc9b06c 1）修改样式 2022-08-25 15:32:22 +08:00
wangsongsole 67dace7e1c Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 15:18:57 +08:00
wangsongsole 3fd4a8a33c 新增兑换码 静态数据分离 2022-08-25 15:18:54 +08:00
zhangds 0f87400e64 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 15:18:36 +08:00
zhangds 9dbcd50af7 1) 增加优惠券 2022-08-25 15:18:29 +08:00
wangsongsole 2978f01f3b 提交优化代码 2022-08-25 14:58:49 +08:00
Apple ac7c618762 删减落地页编辑模块多余引入 2022-08-25 14:46:13 +08:00
Apple f01f22a563 优化落地页预览动态尺寸计算 2022-08-25 14:36:03 +08:00
wangsongsole 9e7cb54f82 Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 2022-08-25 14:24:35 +08:00
wangsongsole 701d3ac0ec 优化代码 新增字段 2022-08-25 14:24:32 +08:00
Apple c3adcf62f1 Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5 
* 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend:
  融合 兑换码编辑、新增、复制为一个页面 以及相关配置和代码优化
  配置新建兑换码路由以及新建兑换码相关文件
 2022-08-25 14:23:26 +08:00
Apple 2241437012 优化落地页编辑模块代码 2022-08-25 14:22:08 +08:00
wangsongsole c0e14bcb99 融合 兑换码编辑、新增、复制为一个页面 以及相关配置和代码优化 2022-08-25 13:46:30 +08:00
wangsongsole 2f2c7b746b 配置新建兑换码路由以及新建兑换码相关文件 2022-08-25 11:00:28 +08:00
wangsongsole 3d733e2205 Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-24 18:10:08 +08:00
wangsongsole a90dfa654f 提交 2022-08-24 18:10:02 +08:00
Apple 97c98bb22c keys查询新增加载效果 2022-08-24 18:01:10 +08:00
Apple 08120a9c2b 回退keyList 2022-08-24 17:51:53 +08:00
wangsongsole 5ea9708d11 提交 2022-08-24 17:48:04 +08:00
wangsongsole 1510ce8664 修复keys查询bug以及grid 2022-08-24 16:44:20 +08:00
Apple f72ee90688 封装table表格组件加载效果 2022-08-24 14:07:51 +08:00
wangsongsole abca49beae 优化loading 2022-08-24 11:27:03 +08:00
wangsongsole 4d4812e29b 重置 grid滚动条 2022-08-24 10:57:37 +08:00
wangsongsole 811223c738 修改订单类型 2022-08-24 09:50:51 +08:00
wangsongsole a40fe057a0 优化gird代码 loading时间延长 2022-08-24 09:38:43 +08:00
wangsongsole 24d8c1e754 优化gird代码 loading时间延长 2022-08-24 09:37:53 +08:00
wangsongsole a0d124b525 Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-23 18:25:50 +08:00
wangsongsole bfcff50495 修改 组件grid样式 2022-08-23 18:25:36 +08:00
wangsongsole 6ed530163d Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-23 18:22:03 +08:00
wangsongsole e42f6034de 修改gird组件 loading效果 2022-08-23 18:21:38 +08:00
wangsongsole 2769cd98c2 优化代码 2022-08-19 17:36:16 +08:00
wangsongsole c8b1ccc1da 优化立减金组件 规则日期方法代码 2022-08-19 17:32:13 +08:00
wangsongsole 180bd5953b Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-19 15:58:04 +08:00
wangsongsole 3de1c2fd75 修复bug 2022-08-19 15:37:00 +08:00
wangsongsole 0c77acfc2a Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-19 15:29:09 +08:00
wangsongsole c5a13b5bc8 修复 立减金固定时间不能大于生效时间 2022-08-19 15:28:53 +08:00
wangsongsole 52b0549ac5 Merge branch 'clickCopyv1.4' into lazyRouter 2022-08-19 15:20:38 +08:00
wangsongsole 2264e57920 提交 2022-08-19 15:14:06 +08:00
wangsongsole b825fa2ed9 修复bug 2022-08-19 15:05:40 +08:00
wangsongsole b487a569cf 解决立减金固定时间不能选择 2022-08-19 14:46:00 +08:00
wangsongsole c527ff09e7 修复 代码书写错误 2022-08-19 10:25:12 +08:00
wangsongsole 4bf0af36e4 删除注释 2022-08-18 16:03:59 +08:00
wangsongsole 93bfb654ab 修复 兑换码列表 复制状态错误展示 2022-08-18 15:24:34 +08:00
wangsongsole 9c1d31c640 修复 复制兑换码时间 不能选择问题 2022-08-18 15:23:20 +08:00
wangsongsole 1c197bb685 1、修复 兑换码复制状态判断错误 
2、修复 兑换码复制 时间不能选座错误
 2022-08-18 15:17:03 +08:00
wangsongsole 4483b324c7 删除注释 2022-08-18 13:58:18 +08:00
wangsongsole 57f46ad4ea 优化代码 2022-08-18 11:01:16 +08:00
zhangds ec4c63fa46 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-18 11:00:00 +08:00
zhangds 1fb4c8e050 1) 修复营销计划时间不改变文件 2022-08-18 10:59:49 +08:00
wangsongsole a583b23e03 优化路由 2022-08-18 09:51:52 +08:00
Apple d7bc189aaa 营销系统V1_4版本锁版，取消版本号 2022-08-17 21:46:45 +08:00
wangsongsole 855218556e 提交 2022-08-17 21:28:35 +08:00
wangsongsole d4bab7a8ab Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-17 21:26:47 +08:00
wangsongsole 0e7456b049 修复时间立减金生效时间报错 2022-08-17 21:26:45 +08:00
Apple ca7d3dc8d2 立减金微信券模板编号默认为空 2022-08-17 21:15:57 +08:00
Apple 34d546459c 营销系统计划为生成中，不允许操作编辑/复制/预览/作废/发送 2022-08-17 20:49:05 +08:00
wangsongsole 1d992c42ec 删除 错误代码 2022-08-17 18:39:23 +08:00
wangsongsole f630a8c639 提交 2022-08-17 18:18:57 +08:00
wangsongsole 41719e0a85 修复bug 2022-08-17 18:18:32 +08:00
wangsongsole cd0be062da Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-17 18:04:54 +08:00
wangsongsole ff02de0c98 修复 商品列表数据 丢失问题以及优化代码 2022-08-17 18:04:52 +08:00
Apple 2eeec7fe3e 优化表格组件，禁用行，点击全选控件不勾选 2022-08-17 18:03:45 +08:00
wangsongsole e8d9b6312e 修复商品bug 2022-08-17 17:45:50 +08:00
wangsongsole 34911c5d66 修复 面包屑报错 2022-08-17 16:11:47 +08:00
wangsongsole c8c47c6674 删除无用引用 2022-08-17 15:59:21 +08:00
wangsongsole 22f2aeedf9 解决报错 2022-08-17 15:58:39 +08:00
wangsongsole 70228f96fb 添加路由懒加载 2022-08-17 15:48:25 +08:00
Apple 2dc0c664f1 订单状态限制兑换码，状态为0，充值中展示作废按钮 2022-08-17 14:23:24 +08:00
zhangds 3405ba0312 1） 增加重置后table 为空 2022-08-17 09:58:50 +08:00
zhangds d5aba67616 1) 删除无用代码 2022-08-16 15:56:43 +08:00
zhangds fa60290ba8 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-16 15:50:24 +08:00
zhangds 26927cbe6d 1) 优化key列表 2） 刷新列表 2022-08-16 15:50:15 +08:00
wangsongsole 930ea9c20f Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-16 15:44:06 +08:00
wangsongsole 52a1450b35 修复 立减金生效时间限制范围 2022-08-16 15:44:03 +08:00
zhangds a5dc4e1a6f update 2022-08-16 15:18:04 +08:00
Apple e323ebf7b6 订单充值中（即生成订单未向上游投递的状态），可以作废 2022-08-16 14:41:17 +08:00
wangsongsole 30bd46c9d5 优化代码 2022-08-16 13:56:13 +08:00
wangsongsole e784e7df49 修正 兑换码复制，审核驳回的兑换码不应该被复制。 2022-08-16 11:26:36 +08:00
wangsongsole 6dd00c149c 删除多余代码 2022-08-16 11:09:36 +08:00
wangsongsole 7a80493748 更改兑换码 立减金 生效时间以营销计划时间为限制 。原：批次时间 2022-08-16 11:02:58 +08:00
zhangds 496047276b 1) 暂存 2022-08-16 10:48:14 +08:00
zhangds 93e9cd5379 1) 修复营销计划审核中编辑，时间空白问题 2022-08-16 10:41:32 +08:00
wangsongsole c9860ac6a4 新增 key批次状态为生成中时，操作按钮全部置灰，生成状态的key批次放在进行中tab页中展示 2022-08-16 09:47:05 +08:00
Apple 2c855f9f64 解决导航重复渲染bug 2022-08-15 18:10:24 +08:00
wangsongsole 50c676d83e 修复【追加key批次】追加key批次，撤销审批，在编辑页面，兑换码批次的商品范围会将之前的商品展示在最新的兑换码批次中 2022-08-15 17:25:18 +08:00
wangsongsole bfb5f30916 禁止立减金 使用规则 富文本全屏 2022-08-15 16:49:14 +08:00
wangsongsole be7942ae0b 优化代码 2022-08-15 15:51:59 +08:00
zhangds b7f5960fa4 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 15:23:10 +08:00
zhangds 6fb3c6af20 1）修复复制计划后，表单验证 2022-08-15 15:23:02 +08:00
wangsongsole 727e5d3c9f Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 15:14:12 +08:00
wangsongsole 232feed09b 修正文件夹错误 2022-08-15 15:14:10 +08:00
zhangds 56f13879aa Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 14:33:12 +08:00
zhangds a93a67e3be 1) 修复时间空白 2022-08-15 14:33:05 +08:00
wangsongsole c55dc2affe 删除无用代码 2022-08-15 14:18:51 +08:00
wangsongsole cf6a4b6350 修改样式 2022-08-15 14:18:17 +08:00
wangsongsole c84501d5bf x修复 key创建中 置灰更多按钮 2022-08-15 14:09:16 +08:00
zhangds 91607146ad 删除page 2022-08-15 11:56:51 +08:00
zhangds a86dd06885 1) 修改page 2022-08-15 11:56:34 +08:00
zhangds 979a862672 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 11:28:14 +08:00
zhangds 42a8e419a8 1) 修复立减金复制不能编辑 2）修复列表状态操作 2022-08-15 11:28:08 +08:00
wangsongsole d7831705a9 提交 2022-08-15 11:08:16 +08:00
wangsongsole c8e183d658 修复 【兑换码-复制】复制已完结兑换码，兑换码生效时间无法修改。 2022-08-15 10:43:56 +08:00
wangsongsole 8bb93a7308 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-15 10:25:43 +08:00
wangsongsole 925f149a1e 修复可用时间段中，选择“有效期内，不规则日期可用”在预览图中未展示可用时间 2022-08-15 10:25:41 +08:00
Apple bd5c9f5952 解决【追加key批次】提交审核时，后端提示“还有进行中的审批单”，创建/编辑成功后不需要请求审批接口 2022-08-15 10:25:28 +08:00
wangsongsole 272b9dd921 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-12 18:34:47 +08:00
wangsongsole c0d4cf3bfb 提交 2022-08-12 18:34:45 +08:00
zhangds 305d9263be Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-12 18:18:37 +08:00
zhangds 140d6720c2 1） 修复导出带hash值 2） 修复订单复制回显数据 2022-08-12 18:18:28 +08:00
wangsongsole 1ade133568 修正 【订单列表】选择查询日期后，前端的page应该传1 2022-08-12 18:01:05 +08:00
wangsongsole a25166197f 立减金可用时间 动态样式 2022-08-12 17:50:39 +08:00
zhangds e729725d52 1) 修复营销系统上传查询hash 值 2022-08-12 16:00:52 +08:00
zhangds fac9dc2937 1) 增加file 重新选择文件功能 2022-08-11 18:12:36 +08:00
zhangds e4057c7cfa 1） 修改复制接口 2022-08-11 17:37:07 +08:00
zhangds 65e45dfa41 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 17:21:44 +08:00
zhangds efbf16ebe2 1) 修改复制请求详情接口 2022-08-11 17:21:37 +08:00
Apple e016b4502a 菜单营销系统管理显示 2022-08-11 16:38:47 +08:00
Apple bf34d67690 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 16:34:45 +08:00
Apple 167cd279e9 解决登录不进 2022-08-11 16:34:36 +08:00
wangsongsole 54166bb504 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 16:00:06 +08:00
wangsongsole de262ad4ae 优化keys 列表重置效果 2022-08-11 16:00:04 +08:00
zhangds ed4b2266e0 update 2022-08-11 15:55:41 +08:00
zhangds d389d10365 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 15:52:09 +08:00
zhangds 470bc6e6ba 1) 增加table 操作带bash值 2022-08-11 15:51:59 +08:00
wangsongsole 74ff14c3c1 删除无用代码 2022-08-11 15:37:53 +08:00
wangsongsole 34ddc85715 key批次审核未通过，其下进行中的兑换码不可进行复制。 2022-08-11 15:33:00 +08:00
zhangds afed5b5129 1) 修复批量删除带被删除的条件 2022-08-11 15:26:43 +08:00
zhangds a33128fe82 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-11 15:06:25 +08:00
zhangds fd178f3b64 1) 营销系统增加导出 2022-08-11 15:06:16 +08:00
wangsongsole 27cb9e8518 修正 复制兑换码后，被复制的兑换码数据没有回显。 2022-08-11 14:55:57 +08:00
wangsongsole a56e94825c key批次列表创建中状态的key批次，把更多按钮置灰掉 2022-08-11 14:03:49 +08:00
wangsongsole 343a5a9763 提交 2022-08-11 10:43:04 +08:00
wangsongsole 06b62673d5 修复立减金组件字段兼容 2022-08-11 10:39:14 +08:00
wangsongsole 114c40ae16 修复keys查询字段错误 2022-08-11 10:19:36 +08:00
wangsongsole 8f98e59bcb 修改动态提示 2022-08-10 17:46:53 +08:00
wangsongsole 2e50dcdbad 合并冲突 2022-08-10 17:41:19 +08:00
zhangds d2e5eed984 update 2022-08-10 17:37:06 +08:00
wangsongsole 713d07c828 提交 2022-08-10 17:35:33 +08:00
zhangds facec5e5b4 Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-10 17:27:25 +08:00
zhangds cd35c6fa8a 1) 增加计划导出功能 2022-08-10 17:21:51 +08:00
wangsongsole 0a69eb9ff3 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-10 17:02:42 +08:00
wangsongsole abf7420f23 修复 bug 2022-08-10 17:02:40 +08:00
Apple 52727f0047 【账号管理】新建账号，在请求角色接口时，长度限制1000,增加页码查询 2022-08-10 16:50:55 +08:00
wangsongsole 8ba912366b 修复bug 2022-08-10 16:24:39 +08:00
wangsongsole b4a28a252f 修复 【key批次列表】创建中、审核中、审核驳回、已作废状态的key批次，不允许批量发送key批次 2022-08-10 15:42:28 +08:00
wangsongsole abf371b86c key码列表默认填充状态 2022-08-10 15:14:33 +08:00
wangsongsole 8229476356 修正 【key码列表管理】页面文字未对齐 2022-08-10 15:03:32 +08:00
wangsongsole 3a9399390b 修正 【key批次列表】未勾选，批量发送按钮应该置灰 2022-08-10 14:26:26 +08:00
wangsongsole 62bd09d6b8 Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4 2022-08-10 14:20:09 +08:00
wangsongsole 5da50bfb20 修复 【key码列表管理】分销商和计划名称查询框，应该为预测性输入框 2022-08-10 14:20:06 +08:00
Apple e19e5ac576 解决【营销计划-复制】key批次复制后，编辑兑换码，点击新增商品和新建立减金，提示“请添加映射分销商” 2022-08-10 14:07:18 +08:00
wangsongsole 3ce6eb0a3d 修改 待使用为可使用 2022-08-10 12:00:16 +08:00
wangsongsole 510ee43702 修改 立减金组件删除样式 2022-08-10 11:34:33 +08:00
wangsongsole 478505ed98 修改立减金组件样式 2022-08-10 11:16:40 +08:00
wangsongsole 2fe21b4b78 修改 基本信息中，券模板编号的券字前端写错了 2022-08-10 10:41:07 +08:00
Apple 4315561afd 调整兑换码复制名称 2022-08-09 15:07:58 +08:00
Apple 04c8bf80a1 兑换码复制面包屑调整 2022-08-09 15:07:02 +08:00
zhangds 3991829fb0 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-09 14:51:43 +08:00
zhangds ca839ca6f0 1） 修改菜单 2022-08-09 14:51:35 +08:00
wangsongsole bcdd504161 Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-09 14:04:07 +08:00
wangsongsole 5c9f9067ba key列表条件查询 优化 2022-08-09 14:04:04 +08:00
Apple 2371b8d3eb key批次复制增加copy_key_batch_id，计算复制次数 2022-08-09 11:50:51 +08:00
wangsongsole 78cc74e746 合并冲突 2022-08-09 11:26:28 +08:00
wangsongsole d1f7ad65c7 删除无用代码 2022-08-09 11:17:17 +08:00
wangsongsole 4f58d9322c 删除 无用文件 2022-08-09 11:10:11 +08:00
wangsongsole 5b705ee327 修改 add 2022-08-09 11:00:55 +08:00
wangsongsole 12126a64b5 删除 无用文件 2022-08-09 10:59:40 +08:00
zhangds bc1d38d195 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-09 09:58:24 +08:00
zhangds bbf3444e2a 1) 删除无用文件 2022-08-09 09:58:17 +08:00
Apple 6545da20dd 处理Ipt组件计算 2022-08-09 09:57:44 +08:00
wangsongsole 0fbe515adf Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 18:30:16 +08:00
wangsongsole 2842610ebf 测试兑换码 2022-08-08 18:30:14 +08:00
zhangds 86800a06ab Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 17:10:04 +08:00
zhangds d8f674b7db 1) 删除无用文件 2022-08-08 17:09:53 +08:00
wangsongsole df442e145b 修复 字段报错 2022-08-08 16:01:30 +08:00
zhangds 177c3d26ce Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 14:51:57 +08:00
zhangds 7d3af028b2 1) 修复一键复制接口 2022-08-08 14:51:51 +08:00
wangsongsole 0b7d3ca40f 静态数据分离 2022-08-08 14:29:37 +08:00
wangsongsole dd143f5c70 Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 14:08:50 +08:00
wangsongsole f6d3326674 修复字段错误 2022-08-08 14:08:48 +08:00
zhangds 459a484e9b Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 13:44:29 +08:00
zhangds d72d36e952 1) 完成营销计划 预览功能 2022-08-08 13:43:15 +08:00
wangsongsole af3ff49cee Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-08 11:45:19 +08:00
wangsongsole 97f7cdc6d9 修改一键复制兑换码 2022-08-08 11:45:16 +08:00
Apple 55072a56a1 解决key批次复制冲突 2022-08-08 11:34:25 +08:00
Apple bf356f3c17 key批次管理一键复制 2022-08-08 11:32:26 +08:00
Apple 4b79bd8db3 Merge branch 'master' into addMenu-v1.4 2022-08-08 11:31:02 +08:00
Apple 83d73eaee1 商品名称16->20位 2022-08-08 10:30:51 +08:00
wangsongsole 3e5ccf5abd 暂存 防删 2022-08-05 18:57:29 +08:00
wangsongsole 93c7e9d0d1 修改兑换码一键复制 2022-08-05 11:26:12 +08:00
wangsongsole 86830177f8 提交 2022-08-04 18:31:43 +08:00
wangsongsole 898efb27cd copy新增key 重写复制兑换码逻辑 2022-08-04 18:30:16 +08:00
zhangds b756ef8075 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-04 15:19:31 +08:00
zhangds 0d30d79c86 1) 增加营销系统一键复制功能 2022-08-04 15:19:24 +08:00
wangsongsole 1ebf47ebd7 修复 立减金字段内容错误 2022-08-04 10:15:36 +08:00
wangsongsole f36a7fe56d Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-03 18:29:46 +08:00
wangsongsole 0e014c0a1e 对接字段 2022-08-03 18:29:42 +08:00
zhangds e131dbcda0 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-03 18:28:23 +08:00
zhangds 5fe01962e6 1) 更新兑换代码 2022-08-03 18:28:13 +08:00
wangsongsole d1b04bbe8a 新增copy_code_batch_id字段 2022-08-03 17:07:54 +08:00
wangsongsole d0b6e583a2 配合后端调整兑换码 新增逻辑 确认复制标识符以及复制次数字段 2022-08-03 16:51:02 +08:00
wangsongsole 5fc7ddc49f 重写 兑换码复制逻辑 2022-08-03 15:30:37 +08:00
zhangds 6bcce4a42a 1) 更新 2022-08-03 14:06:07 +08:00
wangsongsole 188fe12a0b 修复 一键复制兑换码 时间范围限制错误 2022-08-03 12:04:57 +08:00
wangsongsole ac8ad4f8b1 兑换码列表 根据状态是否一键复制 2022-08-03 11:46:33 +08:00
wangsongsole b006e45446 修复 商品组件 编辑商品权重为0时不能提交 验证问题 2022-08-03 11:28:12 +08:00
wangsongsole 2b41a4b9cd 立减金组件修复 2022-08-03 11:22:37 +08:00
zhangds ac026ca21e 1) 删除api 接口线上接口 2022-08-02 17:46:04 +08:00
zhangds e74c909e44 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-08-02 17:16:11 +08:00
zhangds 865805b4fc 1) 增加已完成可复制 2022-08-02 17:15:58 +08:00
zhangds a8fd4dc716 1) 增加图片 2022-08-02 17:10:38 +08:00
wangsongsole d5d3ce3c43 对接可用时间字段 2022-08-02 16:53:26 +08:00
wangsongsole f91249159d 修复 营销计划列表展示不完整错误 2022-08-01 16:35:54 +08:00
zhangds 995c0deef0 1） 增加复制key 2022-08-01 16:35:51 +08:00
zhangds 57f6332dbe 1) 增加复制计划列表 2022-08-01 13:56:14 +08:00
wangsongsole f1269eb72e 修复编辑 KEY报错问题 2022-08-01 10:32:46 +08:00
zhangds 99dde0615f Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-29 18:25:08 +08:00
zhangds ee0647d821 1) 增加复制key 2022-07-29 18:24:59 +08:00
zhangds 25f60dfecd 1） 增加复制计划 2022-07-29 18:02:47 +08:00
wangsongsole 1d4675f87f 修改 key列表管理样式 2022-07-29 17:38:57 +08:00
wangsongsole 9097e7775c 修改sha1字段为hash 2022-07-29 17:34:04 +08:00
wangsongsole fce9d9898a 删除 key列表管理多余数据 2022-07-29 17:05:22 +08:00
wangsongsole 6aa0c00521 恢复代码 2022-07-29 17:02:13 +08:00
wangsongsole 93b43374dd 修改 兑换码列表 样式 2022-07-29 16:45:08 +08:00
wangsongsole 00d84202bf 完善兑换码复制操作 等待对接接口 2022-07-29 16:24:39 +08:00
wangsongsole db4a7f8160 新增兑换码复制按钮和相关操作 2022-07-29 16:22:45 +08:00
wangsongsole 18000eba59 完成批量发送key 接口对接 2022-07-29 16:20:09 +08:00
zhangds a04373396b 1) 增加批量上传作废和已使用功能 2022-07-28 17:37:48 +08:00
zhangds 39d0c903a0 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-28 16:13:47 +08:00
zhangds ceee9c8235 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-28 16:12:18 +08:00
wangsongsole 33e5a49f9f 1、修复 key列表管理条件查询组件 输入框清除报错问题 
2、与后端对接 key列表管理条件查询组件 静态字段
3、调试完成key列表展示以及相关操作
4、优化代码
 2022-07-28 15:44:33 +08:00
zhangds 5986a7e753 1) 删除key 2022-07-28 15:28:13 +08:00
wangsongsole f29bd59fc0 修改代码 2022-07-28 14:55:37 +08:00
wangsongsole 231fba2694 合并冲突 2022-07-28 14:50:52 +08:00
wangsongsole 6f5defa911 对接字段 2022-07-28 14:50:02 +08:00
zhangds f35fbe3d93 1) 删除key管理 2022-07-28 13:54:23 +08:00
zhangds 47b042d639 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-28 13:46:13 +08:00
zhangds 7ecec8ffde update 2022-07-28 13:45:58 +08:00
wangsongsole ef95bf21fc 修改 key表格样式 2022-07-28 11:34:13 +08:00
wangsongsole 43adddd11f 修改 key列表查询组件 2022-07-28 11:27:25 +08:00
wangsongsole 634b7ad29e 修改key列表文件 2022-07-28 11:15:06 +08:00
wangsongsole 2da88498aa 配key列表路由 2022-07-28 11:02:19 +08:00
wangsongsole f6da7c08cf 修改key列表文件名称 2022-07-28 10:52:23 +08:00
wangsongsole c72c357f61 新增keylist 2022-07-28 10:47:07 +08:00
wangsongsole e66daf8b65 恢复代码 2022-07-28 10:46:57 +08:00
zhangds 46c2c20629 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-28 10:37:03 +08:00
wangsongsole 7b22810deb 修改key查询组件 2022-07-28 10:14:34 +08:00
zhangds 2adac54895 update 2022-07-28 10:12:00 +08:00
wangsongsole d6de2e2731 新增 使用规则说明 2022-07-27 11:49:29 +08:00
wangsongsole 0bc09a158f 修改立减租价样式 2022-07-27 10:21:38 +08:00
wangsongsole 4a09c9a5bb 修复 模板编号输入框无响应bug 2022-07-27 10:13:25 +08:00
wangsongsole c331d95c92 配合后端确认 模板编号字段 2022-07-27 10:08:47 +08:00
wangsongsole 2716dbb51e Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-26 16:41:22 +08:00
wangsongsole 7517a3ca07 立减金组件 回显样式控制 2022-07-26 16:41:19 +08:00
zhangds 13128ae664 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-26 16:12:06 +08:00
zhangds b6c05cb183 1) 增加批量上传查询 2022-07-26 16:11:57 +08:00
wangsongsole 13e7aaa317 优化代码 2022-07-26 15:53:19 +08:00
wangsongsole ce023b0eac 1、立减金组件新增 可用时间段 规则字段 
2、新增模板编号字段
 2022-07-26 15:26:12 +08:00
wangsongsole 6779556cfa 新增属性 2022-07-25 17:44:14 +08:00
wangsongsole aa397e655b Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-25 17:34:54 +08:00
wangsongsole ac7222e983 修改keys查询组件 2022-07-25 17:34:52 +08:00
zhangds 232c9d7cf5 Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4 2022-07-25 15:36:34 +08:00
zhangds a2a9374d81 1) 增加批量上传 弹窗 2022-07-25 15:36:22 +08:00
wangsongsole 62941ada28 1、新增keys条件查询组件静态数据 
2、营销计划key列表新增批量发送按钮
 2022-07-25 15:01:31 +08:00
wangsongsole 9e12956b15 修改立减金组件样式 2022-07-25 14:26:55 +08:00
wangsongsole 3664455790 合并 2022-07-25 14:18:05 +08:00
zhangds 24579f8604 1) 增加 keys 批量上传 2022-07-25 14:08:56 +08:00
wangsongsole d6cdd5a87f 修改key列表组件样式 2022-07-25 14:05:58 +08:00
wangsongsole d82d49fcf5 新增 key列表查询组件 2022-07-25 11:57:38 +08:00
wangsongsole d6d8178538 修复商品logo上传报错 2022-07-20 11:08:26 +08:00
wangsongsole 69aaec89e3 切换到测试环境 2022-07-20 10:08:53 +08:00
wangsongsole dc2344cd4a 测试商品 2022-07-20 09:59:07 +08:00
wangsongsole d4dc80c683 api回归 2022-07-19 16:01:36 +08:00
wangsongsole 9a4291c43f 单个api切换正式环境 2022-07-19 14:07:20 +08:00
wangsongsole 2ae91d724d 修复商品报错 2022-07-19 09:58:28 +08:00
wangsongsole 4cfe9ea44f 商品图片修改id 2022-07-18 10:21:44 +08:00
wangsongsole fa2af2981e 测试商品图片 2022-07-18 10:11:37 +08:00
wangsongsole 470f85e40d 修复商品图片编辑不能删除 2022-07-15 11:49:19 +08:00
Apple c81a0e4683 调整登录获取验证码样式 2022-07-15 11:24:45 +08:00
wangsongsole 6724462545 修复商品不能删除问题 2022-07-15 11:00:27 +08:00
wangsongsole 73ad399267 优化预警百分比 2022-07-13 06:19:24 +08:00
wangsongsole c99c10a60b 提交 2022-07-13 06:05:47 +08:00
wangsongsole 53cfdd2905 验证预警百分比 2022-07-13 05:52:55 +08:00
wangsongsole 85fee8080a 修复bug 2022-07-13 05:48:53 +08:00
Apple 118eb64510 立减金后台V1_3_0锁定版本 2022-07-13 05:27:21 +08:00
wangsongsole 80712660b5 根据权限禁用新增立减金按钮 2022-07-12 22:26:32 +08:00
Apple f4beb25607 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-07-12 22:22:14 +08:00
Apple b84a491aec 处理立减金添加者权限 2022-07-12 22:22:05 +08:00
wangsongsole bbf0f8829a 删除多余数据 2022-07-12 21:45:36 +08:00
Apple 14dafd4d67 调整模板中心预览页面样式 2022-07-12 15:11:00 +08:00
wangsongsole 123557e255 1、根据需求优化批次商品名称显示长短 
2、根据需求限制面额保留两位小数
 2022-07-12 11:14:16 +08:00
Apple 307178d1ce 镜像环境 2022-07-12 10:48:20 +08:00
wangsongsole 1c99827e94 修复bug 2022-07-05 13:42:10 +08:00
zhangds 44bc51bc96 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-30 15:23:00 +08:00
wangsongsole fc038e74da 商品图片Key修改为唯一 2022-06-30 14:39:55 +08:00
wangsongsole 155b18d3ae 修复 【营销计划-后台】兑换码编辑页面，商品范围列表没有展示立减金商品id 2022-06-29 16:38:56 +08:00
zhangds 6a8dfec703 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-24 18:27:15 +08:00
zhangds 7b0a4e9e3b update 2022-06-24 18:27:09 +08:00
wangsongsole f1f7e8b22d 修复 商品回显编辑报错问题 2022-06-24 17:10:24 +08:00
zhangds 8b19c1e484 Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-24 16:10:36 +08:00
wangsongsole b6256fd0c7 合并代码 2022-06-24 16:09:37 +08:00
zhangds e0779faaa9 1) 修复对话图片上传 2022-06-24 16:09:12 +08:00
zhangds 5d76ccdf7a 1） 增加图片name 2022-06-24 16:00:31 +08:00
zhangds bea8c996ff Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-24 15:51:32 +08:00
wangsongsole a086ca2180 修改营销计划 商品新增 2022-06-24 15:49:17 +08:00
wangsongsole ab0c153fc6 修改兑换码管理 2022-06-24 15:46:10 +08:00
zhangds 752f5ef5d3 1) 修复新增图片默认图片 2022-06-24 15:43:38 +08:00
wangsongsole 81236ab66b 修改兑换码 2022-06-24 14:33:09 +08:00
wangsongsole afdb690a45 提交 2022-06-23 17:21:29 +08:00
wangsongsole 5fdfea77ef 提交 2022-06-23 17:20:13 +08:00
wangsongsole 23f0e6a022 提交 2022-06-23 14:21:18 +08:00
Apple 24a0d71580 订单模块筛选状态order_type更改type 2022-06-21 14:06:49 +08:00
Apple bb3cd38685 处理营销系统立减金【订单列表】筛选立减金和商品状态前端数据请求 2022-06-21 10:11:54 +08:00
Apple f53a2482f7 订单管理【已过期】显示详情 2022-06-20 16:34:05 +08:00
wangsongsole 535bfc83bb 兑换码管理 当没有分销商时 可以修改时间 但不能进行其他操作 2022-06-20 11:45:48 +08:00
wangsongsole 659f5f225e 修复 修改兑换码批次的生效时间，如果立减金的有效期大于了修改后的时间，立减金的生效时间也要跟着修改 2022-06-20 10:35:12 +08:00
wangsongsole c4c491e752 创建中不允许编辑 2022-06-20 09:52:35 +08:00
wangsongsole dbbb13e2da 新增 兑换码驳回编辑 2022-06-19 20:24:27 +08:00
wangsongsole cc5efc4f4d 提交 2022-06-19 14:26:50 +08:00
wangsongsole 3ebd1cc7e0 修复bug 2022-06-19 13:53:46 +08:00
wangsongsole ef5b7558a6 解决bug 2022-06-19 13:36:25 +08:00
wangsongsole 98b65fc49f Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-19 12:22:24 +08:00
wangsongsole e36438b6d5 修正 【营销计划】新增立减金商品，可用时间段在生效时间段内，提交后，前端还是会提示“有效期不允许大于生效时间段” 2022-06-19 12:22:21 +08:00
Apple 54b14bba78 【key批次】兑换码统计中，去掉已完结数 2022-06-19 11:04:16 +08:00
Apple f4799298b6 解决【key批次】新增key批次提交后返回到key批次列表，列表左上方未展示计划名称 2022-06-17 17:49:41 +08:00
Apple 9c55a9da0f 解决【key批次】新增key批次，路由会跳到兑换码管理上 2022-06-17 16:08:46 +08:00
wangsongsole b5ac3c6d75 添加注释 2022-06-17 15:48:11 +08:00
wangsongsole 677191c586 兑换码 商品列表反选 2022-06-17 15:44:08 +08:00
wangsongsole 37e415a9d9 修复 2022-06-17 15:19:38 +08:00
wangsongsole 1bc75b1870 Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-17 14:20:08 +08:00
wangsongsole 0be43d1a94 修复 2022-06-17 14:20:07 +08:00
Apple f73e7384f1 营销计划列表增加【更新时间】 
key批次列表增加【更新时间】
 2022-06-17 13:58:17 +08:00
Apple 52d74f5c4f 订单列表筛选输入框调整样式，增加平台批次号搜索 
订单列表增加归属key批次字端。
 2022-06-17 13:44:23 +08:00
wangsongsole 1f44a225f4 修复 bug 2022-06-17 12:01:27 +08:00
wangsongsole 9648b012ab Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu 2022-06-17 11:58:23 +08:00
wangsongsole 4119501a49 修复bug 2022-06-17 11:58:20 +08:00
Apple b4f5e888ba key批次列表【使用key总数】改【消耗key总数】 
key批次列表 悬停或点击【消耗key总数】字段数值（蓝色），展示 统计的兑换码 【作废数】【已使用数】【已完结数】【已失效数】
 2022-06-17 11:23:08 +08:00
wangsongsole a9ff8e1171 修改 新增立减金商品提交后进入编辑页面，修改领取时间段再次提交并进入编辑页面，之前修改的领取时间未生效 2022-06-17 11:02:10 +08:00