HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • ff234a06ef style:调整图片组件样式 Apple 2022-10-17 11:51:26 +0800
  • 7ac263ecb4 fix(系统模板)：修复在优惠券中上传背景图后，页面展示空白，前端报错（偶现bug） Apple 2022-10-17 11:32:12 +0800
  • 221acec118 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-14 14:08:47 +0800
  • 71047d6415 fix: 优化立减金加载速度 zhangds 2022-10-14 14:08:42 +0800
  • 1244f03fa7 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-10-14 13:54:51 +0800
  • 47fb96cb1b style：调整样式 wangsongsole 2022-10-14 13:54:50 +0800
  • ef0f8071e6 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-14 13:46:48 +0800
  • 99916f222f fix: 修复table格式错误 zhangds 2022-10-14 13:46:40 +0800
  • 31a046c4f4 feat:【订单管理】已支付，充值失败的订单，新增按钮”改为成功 wangsongsole 2022-10-13 18:18:13 +0800
  • 413e23864b feat:【订单管理】已支付，充值失败的订单，新增按钮重试退款、手动退款“ wangsongsole 2022-10-13 18:12:36 +0800
  • 3346611a49 fix(模板中心):修复模板中心模板预览与落地页类型数据不一致bug Apple 2022-10-13 17:44:20 +0800
  • 01aa8131f2 feat:模板中心自定义组件增加返回按钮，返回到商品列表设置页面 Apple 2022-10-13 17:06:57 +0800
  • 5a29ddd3b0 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-13 16:17:11 +0800
  • 80bc7f709f fix: 修复商品范围时间错误 优化立减金数据回显示问题 zhangds 2022-10-13 16:16:59 +0800
  • faf2f5bb7f fix:解决复制系统模板后，不能编辑模板bug Apple 2022-10-13 14:25:52 +0800
  • 39d9f0ab49 fix:编辑器底部栏配置，根据文本实时更新预览显示 Apple 2022-10-13 14:06:58 +0800
  • 1e5f5ea9bb feat:订单管理列表 新增待支付状态可以作废 wangsongsole 2022-10-13 11:24:31 +0800
  • 55b65d77e8 style:调整订单管理操作栏位置 wangsongsole 2022-10-13 10:55:31 +0800
  • 5318ba9210 fix:修复【系统营销模板】模板类型不同，保存时传值与设置不匹配 Apple 2022-10-13 10:26:54 +0800
  • e19cebe4d3 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-12 18:08:53 +0800
  • 9a2f630744 fix: 修复复制时间不可选择 zhangds 2022-10-12 18:08:48 +0800
  • 89c599a3fa Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-10-12 17:25:44 +0800
  • eb85be4aa5 fix:修复兑换码编辑、赋值、新增剩余数量 已使用数量计算错误 wangsongsole 2022-10-12 17:25:41 +0800
  • 1b04a801a4 fix: 修复优惠券列表 table展示字段 zhangds 2022-10-12 16:03:06 +0800
  • 6438534e17 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-12 15:59:56 +0800
  • 473d715097 fix: 如果是复制，映射商品可编辑 zhangds 2022-10-12 15:59:48 +0800
  • ffe2bee7e0 fix(系统模板)：修复【系统营销模板】兑换码、白名单、优惠券、优惠券白名单保存，前端传值有误 Apple 2022-10-12 15:51:21 +0800
  • e3c81251f9 fix: 1、修复兑换码复制 商品不能编辑问题 2、修复新增兑换码没有默认剩余数量、已使用数量问题 3、注释无用代码 待删除 wangsongsole 2022-10-12 15:45:59 +0800
  • 6b0440837c fix: 修复复制营销计划时间无法编辑 zhangds 2022-10-12 14:42:40 +0800
  • 24fc6a1349 fix: 修复git合并错误问题 zhangds 2022-10-12 14:28:52 +0800
  • afe43b4724 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 Apple 2022-10-12 11:42:38 +0800
  • 44a240172a fix(系统模板):修复优惠券添加背景图，切换时，背景不展示 Apple 2022-10-12 11:40:45 +0800
  • 19b4596892 fix: 修复优惠券浮点计算精度缺失 修复分销商id不对 zhangds 2022-10-12 10:35:46 +0800
  • da538eabda fix(模板中心):修复后端返回coupon为null，前端渲染报错处理 Apple 2022-10-11 20:17:39 +0800
  • ee94f44529 fix(模板中心):修复【落地页管理】使用已存在的模板，打开模板1展示空白，再打开模板2，展示的是模板1的内容 Apple 2022-10-11 20:02:26 +0800
  • b4074d5604 fix(系统模板):修复新增营销模板，修改权重为999，新增优惠券的图片、背景图、搜索栏、底部栏、标题，保存时，前端未传相关值 Apple 2022-10-11 19:34:28 +0800
  • 6109e4809c fix(系统营销模板):修复优惠券中，上传背景图设置，上传成功后，前端未展示 Apple 2022-10-11 19:03:11 +0800
  • 402b877caf Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-11 16:52:19 +0800
  • 39026de7ee fix: 修复白名单key数量不能为0 zhangds 2022-10-11 16:52:09 +0800
  • 482ccfb007 style:删除log wangsongsole 2022-10-11 16:17:27 +0800
  • f665dfe2b7 fix：修复兑换码新增立减金商品，生效时间不能正常选择。 wangsongsole 2022-10-11 16:00:35 +0800
  • 0d514f7f31 feat:配合后端对接订单列表商品类型 wangsongsole 2022-10-11 15:41:54 +0800
  • cc0b86c123 fix: 优惠券复制改名字 zhangds 2022-10-11 15:24:38 +0800
  • b5b46911b6 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-11 15:11:02 +0800
  • 31783fe647 fix: 修复优惠券勾选无法提交 zhangds 2022-10-11 15:10:46 +0800
  • 2be0ae8b07 fix(系统模板)：修复【系统营销模板】在白名单（优惠券、优惠券白名单）中保存时，前端传的标题有误 Apple 2022-10-11 14:51:43 +0800
  • 78553e8748 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-11 14:37:19 +0800
  • a002bd2ab8 fix: 修复兑换码管理统一使用计划的商品组件 zhangds 2022-10-11 14:36:35 +0800
  • e2123996ab fix:去掉兑换码新增-新增商品必选归属key的验证 wangsongsole 2022-10-11 13:43:31 +0800
  • 0236ca61e8 fix: 修复无数据table提示问题 zhangds 2022-10-11 12:30:19 +0800
  • 36cd7338c1 fix: 修复编辑商品无商品类型 zhangds 2022-10-11 12:23:39 +0800
  • ee05ff8e1f fix: 修复复制时间按计划来 zhangds 2022-10-11 12:00:52 +0800
  • 0db88833c3 fix: 有数据审核失败编辑规则不能编辑 zhangds 2022-10-11 11:45:07 +0800
  • 78e5365812 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-11 11:12:13 +0800
  • f19c700a76 fix: 修复兑换码优惠券校验 zhangds 2022-10-11 11:10:01 +0800
  • 13de482ca7 Merge branches 'couponV2.0' and 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-10-11 10:53:22 +0800
  • 50e64532e6 fix:【兑换码管理】新增兑换码，直接点击新建商品或者新建立减金，前端应该提示“请选择计划” wangsongsole 2022-10-11 10:53:20 +0800
  • 555f163541 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-11 10:50:33 +0800
  • 5bac1b55f6 fix: 修复优惠券范围title 修复兑换码复制无数据问题 zhangds 2022-10-11 10:50:28 +0800
  • b7dbe179f8 style:配合后端重新调试兑换码编辑接口 并调整数据接口和处理逻辑 前身代码保留 待删除 wangsongsole 2022-10-11 10:35:02 +0800
  • 1471f4a8d2 fix: 修复优惠券进行中、暂停中、未开始状态生效开始时间不能修改 zhangds 2022-10-10 20:21:20 +0800
  • 7a29f6f52c fix: 增加优惠券列表生成中无操作状态 zhangds 2022-10-10 20:10:51 +0800
  • e419a5dce9 fix: 修复复制优惠券立减金不能修改数据 zhangds 2022-10-10 20:03:24 +0800
  • cc51d072b1 fix: 修复优惠券复制没有数据并且key批次名字不改变问题 zhangds 2022-10-10 19:19:30 +0800
  • f10799066c Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-10 18:17:07 +0800
  • 12cb381b44 fix: 修复兑换码商品范围展示 zhangds 2022-10-10 18:17:02 +0800
  • ce231d20ef fix(模板中心)：控制自定义组件显示与否，搜索栏与底部栏配置，动态高度计算 Apple 2022-10-10 17:58:47 +0800
  • 1f0113a776 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-10-10 17:54:21 +0800
  • d2e66e5b9c fix: 修复key批次优惠券 zhangds 2022-10-10 17:54:13 +0800
  • bbce9223ba fix: 修复兑换码key批次编辑 zhangds 2022-10-10 17:03:56 +0800
  • d7b0c04388 style:调整编辑器预览区域兼容性，搜索栏，底部栏目样式 Apple 2022-10-10 16:13:21 +0800
  • 8025aef880 fix: 修复兑换码key批次编辑 zhangds 2022-10-10 15:57:55 +0800
  • a0976834b5 feat:【订单列表】新增字段“商品类型” wangsongsole 2022-10-10 10:10:47 +0800
  • b3a9895c51 fix(编辑器模块)：立减金兑换说明标题删减名称显示 Apple 2022-10-10 09:57:46 +0800
  • 40cc560e90 style:【订单列表】订单类型中的立减金和直充，修改为“虚拟” wangsongsole 2022-10-10 09:45:06 +0800
  • d015c4ae1b fix: 修复优惠券key批次接口 zhangds 2022-10-09 18:32:08 +0800
  • 0b2c7ddf5c fix: 修复兑换码key计划和key展示问题 zhangds 2022-10-09 15:39:22 +0800
  • b1154b6533 fix: 修复创建中的优惠券不勾选不提交 zhangds 2022-10-09 15:22:29 +0800
  • 28843c43b5 fix: 修复key批次进行中编辑重复数据问题 zhangds 2022-10-09 15:14:41 +0800
  • f977cb12f6 fix: 增加key批次创建中删除接口 zhangds 2022-10-08 17:26:20 +0800
  • f035698053 fix: 修复计划绑定类型切换 zhangds 2022-10-08 16:38:55 +0800
  • 4140dd010d fix: 修复优惠券减保留2位小数 zhangds 2022-10-08 15:19:19 +0800
  • f346189eff fix: 修复兑换码-优惠券列表key批次审核中无法撤销审核 zhangds 2022-10-08 14:40:01 +0800
  • 6a3b162e4e fix: 增加营销计划左侧菜单栏 zhangds 2022-10-08 14:27:32 +0800
  • f80077095f fix: 修复key批次时间错误 zhangds 2022-09-30 18:32:02 +0800
  • 496197b6bf fix: 修复key批次 兑换码新增有原数据 zhangds 2022-09-30 18:23:47 +0800
  • 769d16c3a0 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-09-30 18:08:51 +0800
  • abf29e5759 fix: 修复优惠券时间不能修改 zhangds 2022-09-30 18:08:44 +0800
  • bac30b4521 feat(兑换码管理列表)：删除兑换码时新增提示确认框 wangsongsole 2022-09-30 16:59:40 +0800
  • 5c98718be5 style(兑换码管理列表-商品范围)：调整删除按钮为红色 wangsongsole 2022-09-30 16:58:43 +0800
  • 37958004df fix(兑换码复制)：修复兑换码复制时商品不能编辑 wangsongsole 2022-09-30 16:32:50 +0800
  • 2d73e4b078 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-09-30 16:23:16 +0800
  • 5b99fe656a style:删除商品组件log wangsongsole 2022-09-30 16:23:14 +0800
  • 4fef6f3c09 fix(我的模板):新增优惠券白名单模板，已经上传输入框，保存时仍提示【请上传落地页输入框】 Apple 2022-09-30 15:41:04 +0800
  • 8827d70b24 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-09-30 15:34:50 +0800
  • 6185b022cd fix: 修复key批次编辑绑定对象字段格式错误 zhangds 2022-09-30 15:34:42 +0800
  • 3c871f72f9 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 wangsongsole 2022-09-30 15:30:45 +0800
  • c199b03973 teat(兑换码管理)：新增 生成中状态 wangsongsole 2022-09-30 15:30:42 +0800
  • 70dbb143e3 Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0 zhangds 2022-09-30 15:21:55 +0800
  • 44b730dbf7 fix: 增加优惠券生成中状态并且增加删除功能 zhangds 2022-09-30 15:21:42 +0800