Commit Graph

2836 Commits

Author SHA1 Message Date
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