Commit Graph

1892 Commits

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