zhangds
|
0c98e767d2
|
解决冲突
|
2022-09-07 12:23:29 +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 |
Wind-58
|
b15550f65c
|
恢复文件
|
2022-09-07 12:11:39 +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 |
|
zhangds
|
16dce65170
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-07 11:51:31 +08:00 |
|
zhangds
|
2e73f3d77a
|
1) 完成新建有回去商品范围联动select
|
2022-09-07 11:51:24 +08:00 |
|
Wind-58
|
576cca15bf
|
订单列表新增优惠卷状态
|
2022-09-07 10:56:26 +08:00 |
|
Wind-58
|
fb58e6f1a1
|
兑换码新增绑定数正则验证
|
2022-09-07 10:38:17 +08:00 |
|
Wind-58
|
99e99df028
|
删除多余代码
|
2022-09-07 10:09:01 +08:00 |
|
zhangds
|
c8f5dab29a
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-06 19:18:19 +08:00 |
|
zhangds
|
6428c05efa
|
1） 新建优惠券接口优惠
|
2022-09-06 19:18:11 +08:00 |
|
Wind-58
|
acb5c92f63
|
修复兑换码新增和复制字段转换错误
|
2022-09-06 18:30:48 +08:00 |
许红梅
|
6fe7499eb0
|
落地页编辑器删除组件样式编写
|
2022-09-06 17:54:31 +08:00 |
|
许红梅
|
ac73e2954d
|
完成编辑器底部栏配置与预览联动
|
2022-09-06 16:11:35 +08:00 |
|
许红梅
|
911194dcbb
|
完成落地页编辑器搜索栏联动配置预览效果
|
2022-09-06 15:56:47 +08:00 |
|
许红梅
|
c47be2cc40
|
完成落地页编辑器底部栏数据组装
|
2022-09-06 11:23:52 +08:00 |
|
zhangds
|
b04840493a
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-05 18:33:33 +08:00 |
|
zhangds
|
5c6328a49c
|
1） 增加优惠券时间
|
2022-09-05 18:33:24 +08:00 |
|
Wind-58
|
3a8ce6d5f0
|
Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-05 18:15:14 +08:00 |
|
Wind-58
|
dc97671255
|
注释多余代码
|
2022-09-05 18:15:11 +08:00 |
|
zhangds
|
9e7055ed52
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-05 18:08:06 +08:00 |
|
zhangds
|
1168ea84f1
|
1） 增加优惠券立减金
|
2022-09-05 18:07:58 +08:00 |
|
许红梅
|
ea9800ddbf
|
完成落地页编辑器标题配置与预览联动
|
2022-09-05 17:44:41 +08:00 |
|
许红梅
|
c199ce1f0a
|
完成营销系统编辑器搜索栏框体颜色及文本对齐配置
|
2022-09-05 16:07:51 +08:00 |
|
zhangds
|
e54d19407f
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-05 15:46:27 +08:00 |
|
zhangds
|
30dd092399
|
1) 增加新建优惠券table
|
2022-09-05 15:46:18 +08:00 |
|
Wind-58
|
0eaf45c6f9
|
修复bug并新增兑换码绑定数字段同时与后端联调
|
2022-09-05 12:26:58 +08:00 |
|
许红梅
|
8cb1e3670c
|
完成编辑器搜索栏配置联动
|
2022-09-02 19:48:32 +08:00 |
|
许红梅
|
d94593cdcf
|
完成编辑器背景图联动
|
2022-09-02 14:09:39 +08:00 |
|
许红梅
|
ada8132384
|
完成图片组件配置预览
|
2022-09-02 13:36:36 +08:00 |
|
许红梅
|
fa4d0b940b
|
完成组件库图片配置与预览效果联动
|
2022-09-02 13:35:50 +08:00 |
|
Wind-58
|
1cfc91505c
|
优化兑换码列表代码 兑换码新增复制生效时间做限制
|
2022-09-02 11:13:35 +08:00 |
|
zhangds
|
a95eacc7a0
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-02 11:06:54 +08:00 |
|
zhangds
|
98fa4f7cbc
|
1) 增加优惠券新建商品
|
2022-09-02 11:06:47 +08:00 |
|
Wind-58
|
d597a7d93b
|
调整并优化兑换码代码
|
2022-09-02 10:44:48 +08:00 |
|
许红梅
|
1d351102da
|
编辑器基础组件库配置静态页面编写完毕
|
2022-09-02 10:43:38 +08:00 |
|
许红梅
|
3c4beb4c8e
|
完成优惠券编辑器商品列表页组件库布局
|
2022-09-02 09:43:05 +08:00 |
|
许红梅
|
deadaed2dc
|
Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-02 09:42:33 +08:00 |
|
许红梅
|
10458a43ca
|
no message
|
2022-09-02 09:42:15 +08:00 |
|
zhangds
|
a481802501
|
1) 增加js浮点运算准确度公用方法
|
2022-09-02 08:51:24 +08:00 |
|
许红梅
|
2c8f66a1b3
|
完成优惠券落地页编辑器底部栏配置静态页面编写
|
2022-09-01 17:40:02 +08:00 |
|
许红梅
|
54522ad248
|
完成优惠券落地页编辑器底部栏配置静态页面编写
|
2022-09-01 17:12:13 +08:00 |
|
zhangds
|
86d1c00b25
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-01 15:03:56 +08:00 |
|
zhangds
|
123435487c
|
1) 增加优惠券table
|
2022-09-01 15:03:46 +08:00 |
|
Wind-58
|
f052646034
|
修改兑换码
|
2022-09-01 14:16:32 +08:00 |
|
Wind-58
|
bcd82a9b16
|
区分兑换码编辑、新增、复制代码
|
2022-09-01 11:21:04 +08:00 |
|
Wind-58
|
72b4dae442
|
暂存提交
|
2022-09-01 10:42:40 +08:00 |
|
zhangds
|
502979a41d
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-09-01 10:17:56 +08:00 |