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 |