zhangds
|
f9c4b9f3a8
|
1) 修复立减金时间问题
|
2022-09-27 17:02:46 +08:00 |
zhangds
|
dfbd7cd67a
|
1) 增加优惠券列表tab切换错误
|
2022-09-27 16:30:07 +08:00 |
zhangds
|
aafce8ea5d
|
1) 修复key批次新建不能选择对象绑定
|
2022-09-26 16:55:27 +08:00 |
zhangds
|
e644424f09
|
1.优惠券管理列表=>编辑=>新增立减金时间问题-完成
2.优惠券=>商品、立减金h5模版恢复 -完成
3.优惠券编辑,开始时间不能修改-完成
|
2022-09-26 14:19:57 +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
|
6d0bc162f4
|
1) 增加优惠券立减金模版
|
2022-09-22 16:28:30 +08:00 |
zhangds
|
0713d0491b
|
1) 增加key编辑
|
2022-09-22 15:51:40 +08:00 |
zhangds
|
34c2519505
|
1) 增加key批次优惠券
|
2022-09-22 13:40:56 +08:00 |
zhangds
|
530fe828db
|
1) 增加优惠券编辑
|
2022-09-21 18:06:51 +08:00 |
zhangds
|
992f82c540
|
1) 增加优惠复制
|
2022-09-21 16:03:55 +08:00 |
zhangds
|
4d345aab9f
|
1) 优化优惠券管理商品数据
|
2022-09-21 15:25:21 +08:00 |
zhangds
|
24b1744063
|
1) 优惠计划优惠券
|
2022-09-21 14:21:11 +08:00 |
zhangds
|
54d7b196a8
|
1) 增加优惠券
|
2022-09-21 12:01:41 +08:00 |
zhangds
|
0866805d51
|
1) 修改tabpage 第一次不加载
|
2022-09-21 09:59:37 +08:00 |
zhangds
|
81c632cca4
|
1) 增加h5
|
2022-09-20 17:58:28 +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 |
wangsongsole
|
a888b05722
|
库存数量取整
|
2022-09-20 12:11:26 +08:00 |
zhangds
|
2afb56c48e
|
1) 增加优惠券
|
2022-09-20 12:02:30 +08:00 |
wangsongsole
|
22e4a218a2
|
修改立减金和兑换码库存计算错误
|
2022-09-20 11:02:53 +08:00 |
zhangds
|
42598e6854
|
1) 增加计划优惠券
|
2022-09-19 12:04:54 +08:00 |
zhangds
|
5db99f4103
|
1) 修复新建优惠券key批次查询错误
|
2022-09-16 15:35:52 +08:00 |
zhangds
|
7a21b16397
|
1) 增加优惠券编辑接口
|
2022-09-14 13:50:04 +08:00 |
zhangds
|
b63367e30a
|
1) 修复优惠券列表初始化页面请求两次
|
2022-09-14 10:20:26 +08:00 |
zhangds
|
70ab76ce00
|
1) 增加优惠券列表启用停用接口 2)增加优惠券撤销审批接口 3)增加优惠券商品范围列表
|
2022-09-13 18:07:08 +08:00 |
zhangds
|
94705aadb3
|
1) 增加优惠券列表
|
2022-09-09 12:21:37 +08:00 |
zhangds
|
16a68c54de
|
1) 增加新建优惠券接,归属计划和归属key
|
2022-09-08 17:03:20 +08:00 |
zhangds
|
80a5184a80
|
1) 增加新建优惠券接口联调
|
2022-09-08 16:42:36 +08:00 |
zhangds
|
868727ad49
|
1) 增加立减金联动商品范围
|
2022-09-07 18:49:34 +08:00 |
zhangds
|
72bcc02051
|
1) 增加商品编辑选中联动
|
2022-09-07 18:17:56 +08:00 |
zhangds
|
6d8f62c89b
|
1) 修复商品联动
|
2022-09-07 17:18:52 +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
|
2e73f3d77a
|
1) 完成新建有回去商品范围联动select
|
2022-09-07 11:51:24 +08:00 |
zhangds
|
6428c05efa
|
1) 新建优惠券接口优惠
|
2022-09-06 19:18:11 +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
|
1168ea84f1
|
1) 增加优惠券立减金
|
2022-09-05 18:07:58 +08:00 |
zhangds
|
30dd092399
|
1) 增加新建优惠券table
|
2022-09-05 15:46:18 +08:00 |
zhangds
|
98fa4f7cbc
|
1) 增加优惠券新建商品
|
2022-09-02 11:06:47 +08:00 |
zhangds
|
a481802501
|
1) 增加js浮点运算准确度公用方法
|
2022-09-02 08:51:24 +08:00 |
zhangds
|
123435487c
|
1) 增加优惠券table
|
2022-09-01 15:03:46 +08:00 |
zhangds
|
3e969f0a78
|
1) 增加js正则校验公用方法 2)增加新建优惠券表单校验
|
2022-08-31 18:11:04 +08:00 |
zhangds
|
357f958437
|
1) 优化公用input 样式 2) 增加新增优惠券表单验证
|
2022-08-31 14:09:49 +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
|
d90f8b6dc4
|
优化公用Form报错
|
2022-08-31 10:05:37 +08:00 |
zhangds
|
2a695254d3
|
1) 增加表格动态改变Column
|
2022-08-29 18:02:22 +08:00 |
zhangds
|
394890ae37
|
1) 增加优惠券新增列表
|
2022-08-29 10:10:48 +08:00 |
zhangds
|
dd2181293b
|
1) 增加优惠券页面
|
2022-08-26 18:33:00 +08:00 |
wangsongsole
|
ed908b1d97
|
更改公共样式 统一select和datepicker样式
|
2022-08-26 14:16:28 +08:00 |
Apple
|
e36f8c6f3f
|
优化表格组件checkbox样式,订单管理列表宽度调整
|
2022-08-26 11:53:15 +08:00 |
wangsongsole
|
06097d73eb
|
修复 grid 合并丢失数据 禁用兑换码编辑、复制、新增相关表单
|
2022-08-26 09:47:28 +08:00 |
zhangds
|
ae512f3eb2
|
1) 增加优惠券增加
|
2022-08-25 18:06:41 +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 |
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
|
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
|
180bd5953b
|
Merge branch 'clickCopyv1.4' into lazyRouter
|
2022-08-19 15:58:04 +08:00 |
wangsongsole
|
3de1c2fd75
|
修复bug
|
2022-08-19 15:37:00 +08:00 |
wangsongsole
|
0c77acfc2a
|
Merge branch 'clickCopyv1.4' into lazyRouter
|
2022-08-19 15:29:09 +08:00 |
wangsongsole
|
c5a13b5bc8
|
修复 立减金固定时间不能大于生效时间
|
2022-08-19 15:28:53 +08:00 |
wangsongsole
|
52b0549ac5
|
Merge branch 'clickCopyv1.4' into lazyRouter
|
2022-08-19 15:20:38 +08:00 |
wangsongsole
|
2264e57920
|
提交
|
2022-08-19 15:14:06 +08:00 |
wangsongsole
|
b825fa2ed9
|
修复bug
|
2022-08-19 15:05:40 +08:00 |
wangsongsole
|
b487a569cf
|
解决立减金固定时间不能选择
|
2022-08-19 14:46:00 +08:00 |
wangsongsole
|
4483b324c7
|
删除注释
|
2022-08-18 13:58:18 +08:00 |
wangsongsole
|
855218556e
|
提交
|
2022-08-17 21:28:35 +08:00 |
Apple
|
ca7d3dc8d2
|
立减金微信券模板编号默认为空
|
2022-08-17 21:15:57 +08:00 |
Apple
|
2eeec7fe3e
|
优化表格组件,禁用行,点击全选控件不勾选
|
2022-08-17 18:03:45 +08:00 |
wangsongsole
|
34911c5d66
|
修复 面包屑报错
|
2022-08-17 16:11:47 +08:00 |
wangsongsole
|
22f2aeedf9
|
解决报错
|
2022-08-17 15:58:39 +08:00 |
zhangds
|
fa60290ba8
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-16 15:50:24 +08:00 |
zhangds
|
26927cbe6d
|
1) 优化key列表 2) 刷新列表
|
2022-08-16 15:50:15 +08:00 |
zhangds
|
a5dc4e1a6f
|
update
|
2022-08-16 15:18:04 +08:00 |
Apple
|
2c855f9f64
|
解决导航重复渲染bug
|
2022-08-15 18:10:24 +08:00 |
wangsongsole
|
bfb5f30916
|
禁止立减金 使用规则 富文本全屏
|
2022-08-15 16:49:14 +08:00 |
wangsongsole
|
232feed09b
|
修正文件夹错误
|
2022-08-15 15:14:10 +08:00 |
wangsongsole
|
c55dc2affe
|
删除无用代码
|
2022-08-15 14:18:51 +08:00 |
wangsongsole
|
cf6a4b6350
|
修改样式
|
2022-08-15 14:18:17 +08:00 |
wangsongsole
|
925f149a1e
|
修复可用时间段中,选择“有效期内,不规则日期可用”在预览图中未展示可用时间
|
2022-08-15 10:25:41 +08:00 |
wangsongsole
|
a25166197f
|
立减金可用时间 动态样式
|
2022-08-12 17:50:39 +08:00 |
zhangds
|
e729725d52
|
1) 修复营销系统上传查询hash 值
|
2022-08-12 16:00:52 +08:00 |
zhangds
|
fac9dc2937
|
1) 增加file 重新选择文件功能
|
2022-08-11 18:12:36 +08:00 |
wangsongsole
|
54166bb504
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 16:00:06 +08:00 |
wangsongsole
|
de262ad4ae
|
优化keys 列表重置效果
|
2022-08-11 16:00:04 +08:00 |
zhangds
|
ed4b2266e0
|
update
|
2022-08-11 15:55:41 +08:00 |
zhangds
|
470bc6e6ba
|
1) 增加table 操作带bash值
|
2022-08-11 15:51:59 +08:00 |
zhangds
|
afed5b5129
|
1) 修复批量删除带被删除的条件
|
2022-08-11 15:26:43 +08:00 |
zhangds
|
fd178f3b64
|
1) 营销系统增加导出
|
2022-08-11 15:06:16 +08:00 |
wangsongsole
|
06b62673d5
|
修复立减金组件字段兼容
|
2022-08-11 10:39:14 +08:00 |
wangsongsole
|
114c40ae16
|
修复keys查询字段错误
|
2022-08-11 10:19:36 +08:00 |
wangsongsole
|
8f98e59bcb
|
修改动态提示
|
2022-08-10 17:46:53 +08:00 |
wangsongsole
|
8ba912366b
|
修复bug
|
2022-08-10 16:24:39 +08:00 |
wangsongsole
|
abf371b86c
|
key码列表默认填充状态
|
2022-08-10 15:14:33 +08:00 |
wangsongsole
|
8229476356
|
修正 【key码列表管理】页面文字未对齐
|
2022-08-10 15:03:32 +08:00 |
wangsongsole
|
5da50bfb20
|
修复 【key码列表管理】分销商和计划名称查询框,应该为预测性输入框
|
2022-08-10 14:20:06 +08:00 |
wangsongsole
|
3ce6eb0a3d
|
修改 待使用为可使用
|
2022-08-10 12:00:16 +08:00 |
wangsongsole
|
510ee43702
|
修改 立减金组件删除样式
|
2022-08-10 11:34:33 +08:00 |
wangsongsole
|
478505ed98
|
修改立减金组件样式
|
2022-08-10 11:16:40 +08:00 |
wangsongsole
|
2fe21b4b78
|
修改 基本信息中,券模板编号的券字前端写错了
|
2022-08-10 10:41:07 +08:00 |
Apple
|
04c8bf80a1
|
兑换码复制面包屑调整
|
2022-08-09 15:07:02 +08:00 |
Apple
|
6545da20dd
|
处理Ipt组件计算
|
2022-08-09 09:57:44 +08:00 |
zhangds
|
d8f674b7db
|
1) 删除无用文件
|
2022-08-08 17:09:53 +08:00 |
wangsongsole
|
1ebf47ebd7
|
修复 立减金字段内容错误
|
2022-08-04 10:15:36 +08:00 |
zhangds
|
e131dbcda0
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-03 18:28:23 +08:00 |
zhangds
|
5fe01962e6
|
1) 更新兑换代码
|
2022-08-03 18:28:13 +08:00 |
zhangds
|
6bcce4a42a
|
1) 更新
|
2022-08-03 14:06:07 +08:00 |
wangsongsole
|
2b41a4b9cd
|
立减金组件修复
|
2022-08-03 11:22:37 +08:00 |
zhangds
|
e74c909e44
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-02 17:16:11 +08:00 |
zhangds
|
a8fd4dc716
|
1) 增加图片
|
2022-08-02 17:10:38 +08:00 |
wangsongsole
|
d5d3ce3c43
|
对接可用时间字段
|
2022-08-02 16:53:26 +08:00 |
zhangds
|
995c0deef0
|
1) 增加复制key
|
2022-08-01 16:35:51 +08:00 |
zhangds
|
57f6332dbe
|
1) 增加复制计划列表
|
2022-08-01 13:56:14 +08:00 |
zhangds
|
99dde0615f
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-29 18:25:08 +08:00 |
zhangds
|
ee0647d821
|
1) 增加复制key
|
2022-07-29 18:24:59 +08:00 |
zhangds
|
25f60dfecd
|
1) 增加复制计划
|
2022-07-29 18:02:47 +08:00 |
wangsongsole
|
9097e7775c
|
修改sha1字段为hash
|
2022-07-29 17:34:04 +08:00 |
zhangds
|
a04373396b
|
1) 增加批量上传作废和已使用功能
|
2022-07-28 17:37:48 +08:00 |
zhangds
|
39d0c903a0
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-28 16:13:47 +08:00 |
zhangds
|
ceee9c8235
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-28 16:12:18 +08:00 |
wangsongsole
|
33e5a49f9f
|
1、修复 key列表管理条件查询组件 输入框清除报错问题
2、与后端对接 key列表管理条件查询组件 静态字段
3、调试完成key列表展示以及相关操作
4、优化代码
|
2022-07-28 15:44:33 +08:00 |
zhangds
|
5986a7e753
|
1) 删除key
|
2022-07-28 15:28:13 +08:00 |
wangsongsole
|
231fba2694
|
合并冲突
|
2022-07-28 14:50:52 +08:00 |
wangsongsole
|
6f5defa911
|
对接字段
|
2022-07-28 14:50:02 +08:00 |
zhangds
|
47b042d639
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-28 13:46:13 +08:00 |
zhangds
|
7ecec8ffde
|
update
|
2022-07-28 13:45:58 +08:00 |
wangsongsole
|
43adddd11f
|
修改 key列表查询组件
|
2022-07-28 11:27:25 +08:00 |
zhangds
|
46c2c20629
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-28 10:37:03 +08:00 |
wangsongsole
|
7b22810deb
|
修改key查询组件
|
2022-07-28 10:14:34 +08:00 |
zhangds
|
2adac54895
|
update
|
2022-07-28 10:12:00 +08:00 |
wangsongsole
|
d6de2e2731
|
新增 使用规则说明
|
2022-07-27 11:49:29 +08:00 |
wangsongsole
|
0bc09a158f
|
修改立减租价样式
|
2022-07-27 10:21:38 +08:00 |