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,419 Commits 12 Branches 0 Tags 188 MiB
Commit Graph

2288 Commits

Author SHA1 Message Date
Apple 5404552b6b feat：下载增加导出加载效果 2023-01-04 18:03:52 +08:00
Apple 5bd4201b2d feat:订单下载导出列表提交测试 2023-01-04 17:51:27 +08:00
Apple 12457e6569 feat:增加订单下载任务状态 2023-01-04 15:04:24 +08:00
Apple 46ac80198e feat:导出订单成功后挑战订单下载列表 2023-01-04 11:37:16 +08:00
Apple 3a478b61ce style：删除调试 2023-01-04 11:26:13 +08:00
Apple 2edb5a4296 feat:新增订单下载列表删除，下载，查询接口联调 2023-01-04 11:20:31 +08:00
Apple 20932d07dd fix: 修复keys文件上传同一文件无法上传 2023-01-04 09:40:09 +08:00
zhangds b03f7795a6 fix: 修复keys文件上传同一文件无法上传 2023-01-03 15:52:20 +08:00
Apple 372094bf3e fix：keys查询 限制100 业务开放 2023-01-03 15:49:36 +08:00
Apple f264ac900f fix：keys查询 限制100 业务开放 2023-01-03 10:56:04 +08:00
Apple 1aa782c195 style：调整导出订单列表【删除】按钮禁用样式 2023-01-03 10:47:50 +08:00
Apple 916dfb3514 style:优化订单下载列表模块样式 2022-12-30 16:16:51 +08:00
Apple 99dfe397a6 feat:订单下载列表增加导出 2022-12-30 11:44:28 +08:00
Apple c6d19b339f feat:完善订单下载列表页面 2022-12-30 11:27:45 +08:00
Apple fd8d0ac740 style:调整订单下载列表样式 2022-12-29 18:17:28 +08:00
Apple 82182d9367 feat:增加营销系统订单下载列表静态页面 2022-12-29 18:14:25 +08:00
Apple 732971d6e7 feat:增加订单下载列表静态页面 2022-12-29 18:11:26 +08:00
Apple c01154a4f9 fix：立减金核销状态，（已过期：3）展示为（未核销：1） 2022-12-29 11:13:16 +08:00
Apple 2a4229e53a fix:修复营销系统模板中心面包屑错乱bug 2022-12-28 10:52:46 +08:00
Apple b2e2ecab2b fix:解决标签引用报错 2022-12-27 18:03:30 +08:00
Apple 9614778235 fix:优化filterBar组件联动 2022-12-27 17:59:25 +08:00
Apple 4c6765925b fix:优化filterBar组件，点击document关闭状态菜单悬浮框 2022-12-27 17:03:47 +08:00
Apple c69a2a5b7f feat:订单列表增加立减金核销状态voucher_status 2022-12-27 14:40:03 +08:00
Apple 8f921eaed9 fix：修改订单核销状态名次 2022-12-26 16:06:01 +08:00
wangsongsole 7adf694859 fix:修复订单导出未传部分字段bug 
feat：新增订单状态、支付状态多选
feat：新增订单表格字段
 2022-12-13 17:54:32 +08:00
Apple e9e0905e14 fix:优化filterSelect组件，默认不勾选，展示‘请选择’ 2022-12-13 13:58:08 +08:00
Apple 005d6f2f71 feat：订单多选 2022-12-13 12:02:37 +08:00
Apple 2d77e50224 feat:优化下拉选择过滤查询 2022-12-13 10:40:04 +08:00
Apple b518bcea8e fix:提换二维码工具地址，线上发版 2022-12-12 11:19:32 +08:00
Apple 236d6dc133 fix：提换二维码工具地址 2022-12-10 14:39:16 +08:00
Apple d7b8d7531c style:优化二维码工具样式 2022-12-10 10:05:10 +08:00
Apple 3af22afb8d feat:线上增加二维码小工具 2022-12-09 17:33:24 +08:00
Apple 52cca11125 feat:优化下拉选择过滤查询 2022-12-02 17:41:54 +08:00
zhangds aee7186813 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-23 03:33:35 +08:00
zhangds b9263aa93d fix: 修复卡密时间选择 2022-11-23 03:33:23 +08:00
Apple b4c816b771 fix：兼容历史订单无商品类型，显示/ 2022-11-23 02:45:16 +08:00
zhangds 6f6031aab6 fix: 删除本地存储时间datetime 改用knockGold_effectDate 2022-11-23 02:27:45 +08:00
zhangds 615d377526 fix: 增加字段说明 2022-11-22 15:34:35 +08:00
zhangds 6cf9c96698 fix: 1) 修复优惠券、兑换码列表审核中启用停用状态为old_status 2022-11-22 15:22:56 +08:00
zhangds 2a45863a06 fix: 1).修复优惠券列表启用停用展示 2). 修复审核中状态作废至灰 2022-11-22 14:34:56 +08:00
Apple eb26eecfeb fix:[卡密有效期]-》【卡密有效期至】 2022-11-22 10:52:17 +08:00
zhangds 5f8794d741 1）合并maset 2022-11-21 10:19:08 +08:00
Apple bf97273c3e fix:处理优惠券列表页面空白，路由匹配bug 2022-11-19 10:24:26 +08:00
zhangds c8d746e4e4 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-17 14:52:19 +08:00
zhangds 5d1a3e765a fix: 修复优惠券管理时间问题 2022-11-17 14:52:04 +08:00
Wind-58 45c423a7e1 fix:修复【立减金商品】预警通知人中，前端未展示后端返回的预警人姓名 2022-11-16 14:49:24 +08:00
zhangds 27ccc88f71 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-11 10:50:15 +08:00
zhangds e617078c63 fix: 修复时间 2022-11-11 10:50:09 +08:00
Apple f4edbea179 fix:优惠券自定义组件删除后，配置视图切换到商品列表页 2022-11-11 10:19:43 +08:00
Apple fb7a49a841 style:优化编辑器代码 2022-11-11 10:09:50 +08:00
zhangds eca3d58c60 fix: 修复兑换码、优惠券时间问题 2022-11-09 17:56:30 +08:00
zhangds aebc2afc9a Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-07 15:26:05 +08:00
Apple 083f1419de fix:修复优惠券列表卷总数->券总数 2022-11-07 15:25:50 +08:00
zhangds 2a7c152a8b Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-07 15:25:32 +08:00
zhangds a0d33c3275 fix: 修复营销计划复制不现实商品编号 2022-11-07 15:25:24 +08:00
wangsongsole 362edb14be Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-07 14:09:09 +08:00
wangsongsole 3fd5718356 fix:修复复制兑换码时 立减金不应该存在商品ID 2022-11-07 14:09:07 +08:00
Apple 3ac8055ead style：调整编辑器输入框展位图样式 2022-11-07 10:55:37 +08:00
Apple 4485c2fa46 style：营销系统编辑器样式美化 2022-11-04 11:11:54 +08:00
zhangds bfb43d57ae fix: 删除无用控制台输出 2022-11-03 15:22:43 +08:00
zhangds cfdff429da flx: 绑定类型为优惠券锁定域名 2022-11-02 17:01:23 +08:00
zhangds bc0d1a3403 fix: 修改卡密有效期文字 2022-11-02 14:10:34 +08:00
zhangds 5f411474b5 fix: 增加兑换码时间的禁用 2022-11-02 13:53:08 +08:00
zhangds b06cf8f31b fix: 优化时间不能选择当天的时间 2022-11-02 13:48:02 +08:00
zhangds a395eef12e fix: 修复计划提交 2022-11-02 11:22:38 +08:00
zhangds e79b2df5e2 fix: 增加批次卡密时间 2022-11-02 10:25:17 +08:00
zhangds 02f9c97b28 fix: 增加计划卡密兑换 2022-11-01 18:25:19 +08:00
zhangds d58dd8e6a8 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-01 17:24:19 +08:00
zhangds f842d644d2 fix: 增加优惠券兑换时间 2022-11-01 17:23:59 +08:00
wangsongsole f43f833703 fix:修复【后台】充值失败订单，不展示改为成功button。 2022-11-01 14:00:56 +08:00
wangsongsole 92ef1332f1 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-01 13:51:14 +08:00
wangsongsole df117412ec fix:卡密订单，在订单详情中，不展示充值账号 2022-11-01 13:51:12 +08:00
zhangds 2ea28a13e7 fix: 优化优惠券防抖功能 2022-11-01 10:57:26 +08:00
zhangds e21637338f fix: 修复key批次审核驳回不能编辑的问题 2022-11-01 10:40:20 +08:00
zhangds f645700e25 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-11-01 09:48:54 +08:00
zhangds 96e333acdc fix: 修复立减金库存校验 优惠券列表出现222 2022-11-01 09:48:47 +08:00
wangsongsole d2262ea923 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 2022-10-31 18:19:16 +08:00
wangsongsole 0f7e6fcfa8 fix:订单列表 卡密订单隐藏卡密订单账号 2022-10-31 18:19:14 +08:00
zhangds 8d00f01e46 fix: 增加优惠券按钮防抖 2022-10-31 17:00:55 +08:00
zhangds f6cf046e0e fix: 编辑，新增库存计算 2022-10-31 16:19:51 +08:00
zhangds 84e3cbd5ab fix: 修复立减金库存舍去小数点 2022-10-31 15:55:04 +08:00
zhangds 0a744b0524 fix: 修复立减金复制库存重新计算 2022-10-31 15:43:19 +08:00
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