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 |
|
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 |
|
zhangds
|
4bd3adfb40
|
1) 修复计划无法新增
|
2022-09-01 10:17:45 +08:00 |
|
Wind-58
|
932c4c107a
|
优化商品组件样式代码
|
2022-09-01 09:50:27 +08:00 |
Apple
|
4170bc65d0
|
完善优惠券编辑组件库模块编写
|
2022-09-01 09:44:33 +08:00 |
|
Apple
|
bf2b867ebf
|
完成编辑器商品列表页框架搭建
|
2022-09-01 09:42:27 +08:00 |
|
wangsongsole
|
ba55a7917f
|
Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-31 18:34:45 +08:00 |
|
wangsongsole
|
2fb3d6916a
|
提交兑换码代码
|
2022-08-31 18:34:43 +08:00 |
|
zhangds
|
3e969f0a78
|
1） 增加js正则校验公用方法 2）增加新建优惠券表单校验
|
2022-08-31 18:11:04 +08:00 |
|
zhangds
|
ce00c7779b
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-31 14:09:56 +08:00 |
|
zhangds
|
357f958437
|
1) 优化公用input 样式 2） 增加新增优惠券表单验证
|
2022-08-31 14:09:49 +08:00 |
|
Apple
|
75fb80965f
|
排查icon引入不生效
|
2022-08-31 14:09:17 +08:00 |
|
Apple
|
fe10abce01
|
引入字体图标库
|
2022-08-31 11:09:33 +08:00 |
|
zhangds
|
e6c43029dc
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-31 10:51:47 +08:00 |
|
zhangds
|
a82f1ed8ae
|
1) 表单
|
2022-08-31 10:51:41 +08:00 |
|
wangsongsole
|
2c6707d618
|
优化兑换码模块代码
|
2022-08-31 10:45:55 +08:00 |
|
wangsongsole
|
d90f8b6dc4
|
优化公用Form报错
|
2022-08-31 10:05:37 +08:00 |
|
wangsongsole
|
b884dc68eb
|
优化兑换码编辑title展示字段，新增兑换码新增发放总量验证
|
2022-08-31 09:55:38 +08:00 |
|
zhangds
|
3afd84ad17
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-31 09:45:26 +08:00 |
|
Apple
|
eb79a228f2
|
优化落地页编辑多余引入css样式
|
2022-08-30 16:44:06 +08:00 |
|
Apple
|
d141c1a2dc
|
编码实现落地页编辑模块功能，完成优惠券落地页数据处理，配置与预览功能模块
|
2022-08-30 15:12:05 +08:00 |
|
zhangds
|
2a695254d3
|
1) 增加表格动态改变Column
|
2022-08-29 18:02:22 +08:00 |
|
wangsongsole
|
dc2aa9e2f2
|
修复app.css代码错误
|
2022-08-29 11:37:33 +08:00 |
|
wangsongsole
|
685ad20e3a
|
优化登录界面代码
|
2022-08-29 10:54:56 +08:00 |
|
wangsongsole
|
8cc7012a18
|
根据原型调整兑换码页面
|
2022-08-29 10:21:28 +08:00 |
|
zhangds
|
394890ae37
|
1) 增加优惠券新增列表
|
2022-08-29 10:10:48 +08:00 |
|
zhangds
|
86708c2688
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-26 18:33:22 +08:00 |
|
zhangds
|
dd2181293b
|
1） 增加优惠券页面
|
2022-08-26 18:33:00 +08:00 |
|
wangsongsole
|
f14e72c486
|
修复订单列表 切换table条件时 page未重置 优化app.css代码
|
2022-08-26 15:17:02 +08:00 |
|
wangsongsole
|
708ed6f42d
|
修改兑换码新增样式
|
2022-08-26 14:46:44 +08:00 |
|
wangsongsole
|
fb81e2e16c
|
修改product组件样式
|
2022-08-26 14:39:58 +08:00 |
|
wangsongsole
|
95e1fc97a1
|
修复app.css样式覆盖问题
|
2022-08-26 14:23:44 +08:00 |
|
wangsongsole
|
ed908b1d97
|
更改公共样式 统一select和datepicker样式
|
2022-08-26 14:16:28 +08:00 |
|
wangsongsole
|
8ab5cfb506
|
新增兑换码复制逻辑
|
2022-08-26 13:35:02 +08:00 |
|
Apple
|
e36f8c6f3f
|
优化表格组件checkbox样式，订单管理列表宽度调整
|
2022-08-26 11:53:15 +08:00 |
|
wangsongsole
|
06097d73eb
|
修复 grid 合并丢失数据 禁用兑换码编辑、复制、新增相关表单
|
2022-08-26 09:47:28 +08:00 |
|
Apple
|
dad624a1bc
|
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) 增加消费卷table
|
2022-08-25 18:07:16 +08:00 |
|
Apple
|
17c2a620bd
|
解决优惠券导航选中，路由与一级菜单高亮不匹配
|
2022-08-25 18:07:05 +08:00 |
|
zhangds
|
ae512f3eb2
|
1) 增加优惠券增加
|
2022-08-25 18:06:41 +08:00 |
|
zhangds
|
4706289d02
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-25 16:29:24 +08:00 |
|
zhangds
|
aa2b41e0e1
|
1) 增加消费卷table
|
2022-08-25 16:29:18 +08:00 |
|
Apple
|
fb97d83dcb
|
删减模版中心CSS样式多余引入，订单模块入口调整
|
2022-08-25 16:16:52 +08:00 |
|
zhangds
|
867e8a13cd
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-25 15:32:37 +08:00 |
|
zhangds
|
1e8bc9b06c
|
1）修改样式
|
2022-08-25 15:32:22 +08:00 |
|
wangsongsole
|
67dace7e1c
|
Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-25 15:18:57 +08:00 |
|
wangsongsole
|
3fd4a8a33c
|
新增兑换码 静态数据分离
|
2022-08-25 15:18:54 +08:00 |
|
zhangds
|
0f87400e64
|
Merge branch 'couponV1.5' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-25 15:18:36 +08:00 |
|
zhangds
|
9dbcd50af7
|
1) 增加优惠券
|
2022-08-25 15:18:29 +08:00 |
|
wangsongsole
|
2978f01f3b
|
提交优化代码
|
2022-08-25 14:58:49 +08:00 |
|
Apple
|
ac7c618762
|
删减落地页编辑模块多余引入
|
2022-08-25 14:46:13 +08:00 |
|
Apple
|
f01f22a563
|
优化落地页预览动态尺寸计算
|
2022-08-25 14:36:03 +08:00 |
|
wangsongsole
|
9e7cb54f82
|
Merge branch 'couponV1.5' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into couponV1.5
|
2022-08-25 14:24:35 +08:00 |
|
wangsongsole
|
701d3ac0ec
|
优化代码 新增字段
|
2022-08-25 14:24:32 +08:00 |
|
Apple
|
c3adcf62f1
|
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-08-25 14:23:26 +08:00 |
|
Apple
|
2241437012
|
优化落地页编辑模块代码
|
2022-08-25 14:22:08 +08:00 |
|
wangsongsole
|
c0e14bcb99
|
融合 兑换码编辑、新增、复制为一个页面 以及相关配置和代码优化
|
2022-08-25 13:46:30 +08:00 |
|
wangsongsole
|
2f2c7b746b
|
配置新建兑换码路由以及新建兑换码相关文件
|
2022-08-25 11:00:28 +08:00 |
|
wangsongsole
|
3d733e2205
|
Merge branch 'clickCopyv1.4' into lazyRouter
|
2022-08-24 18:10:08 +08:00 |
|
wangsongsole
|
a90dfa654f
|
提交
|
2022-08-24 18:10:02 +08:00 |
|
Apple
|
97c98bb22c
|
keys查询新增加载效果
|
2022-08-24 18:01:10 +08:00 |
|
Apple
|
08120a9c2b
|
回退keyList
|
2022-08-24 17:51:53 +08:00 |
|
wangsongsole
|
5ea9708d11
|
提交
|
2022-08-24 17:48:04 +08:00 |
|
wangsongsole
|
1510ce8664
|
修复keys查询bug以及grid
|
2022-08-24 16:44:20 +08:00 |
|
Apple
|
f72ee90688
|
封装table表格组件加载效果
|
2022-08-24 14:07:51 +08:00 |
|
wangsongsole
|
abca49beae
|
优化loading
|
2022-08-24 11:27:03 +08:00 |
|
wangsongsole
|
4d4812e29b
|
重置 grid滚动条
|
2022-08-24 10:57:37 +08:00 |
|
wangsongsole
|
811223c738
|
修改订单类型
|
2022-08-24 09:50:51 +08:00 |
|
wangsongsole
|
a40fe057a0
|
优化gird代码 loading时间延长
|
2022-08-24 09:38:43 +08:00 |
|
wangsongsole
|
24d8c1e754
|
优化gird代码 loading时间延长
|
2022-08-24 09:37:53 +08:00 |
|
wangsongsole
|
a0d124b525
|
Merge branch 'clickCopyv1.4' into lazyRouter
|
2022-08-23 18:25:50 +08:00 |
|
wangsongsole
|
bfcff50495
|
修改 组件grid样式
|
2022-08-23 18:25:36 +08:00 |
|
wangsongsole
|
6ed530163d
|
Merge branch 'clickCopyv1.4' into lazyRouter
|
2022-08-23 18:22:03 +08:00 |
|
wangsongsole
|
e42f6034de
|
修改gird组件 loading效果
|
2022-08-23 18:21:38 +08:00 |
|
wangsongsole
|
2769cd98c2
|
优化代码
|
2022-08-19 17:36:16 +08:00 |
|
wangsongsole
|
c8b1ccc1da
|
优化立减金组件 规则日期方法代码
|
2022-08-19 17:32:13 +08:00 |
|
wangsongsole
|
180bd5953b
|
Merge branch 'clickCopyv1.4' into lazyRouter
|
2022-08-19 15:58:04 +08:00 |