wangsongsole
|
a03f3feb7e
|
💊 fix: 云效bug
|
2023-06-26 15:11:43 +08:00 |
wangsongsole
|
40cc0153b7
|
💪 optimize: 调整红包组件最大最小值
|
2023-06-25 15:26:16 +08:00 |
wangsongsole
|
970368b1a0
|
💪 optimize: 优化代码
|
2023-06-16 14:54:21 +08:00 |
wangsongsole
|
43710e04c2
|
🎨 style: 优化样式
|
2023-06-15 17:13:00 +08:00 |
zhangds
|
54735790a8
|
feat: 增加批量作废接口查询
|
2023-06-15 09:44:08 +08:00 |
wangsongsole
|
bcc684ce11
|
🗑️ deprecateCode: 删除红包模板多余代码
|
2023-06-13 10:25:20 +08:00 |
wangsongsole
|
13860d40e3
|
♻️ refactor: 红包祝福语改为32位
|
2023-06-13 09:11:22 +08:00 |
wangsongsole
|
e3fe3d1380
|
🚑️ hotfix: 修复红包富文本组件数据渲染问题
|
2023-06-09 11:56:36 +08:00 |
wangsongsole
|
96581eed80
|
💊 fix: 修复字段丢失
|
2023-06-08 09:06:04 +08:00 |
wangsongsole
|
83b737e3db
|
🚸 usability: uuid随机生成为无规则
|
2023-06-02 16:57:34 +08:00 |
wangsongsole
|
ec5de7fbd9
|
⚰️ removeCode: 优化代码
|
2023-06-02 14:19:18 +08:00 |
wangsongsole
|
f99a6e3032
|
🎨 style: 调整红包样式优化戴安
|
2023-06-02 10:54:00 +08:00 |
wangsongsole
|
62e4fb17b3
|
🎨 style: 优化样式
|
2023-06-02 10:39:21 +08:00 |
wangsongsole
|
a40c510591
|
🎨 style: 修改红包样式
|
2023-06-01 18:29:08 +08:00 |
wangsongsole
|
aeb8dce8ee
|
✨ feat: 红包组件新增祝福语字段
|
2023-06-01 18:06:24 +08:00 |
wangsongsole
|
374d21f462
|
🚸 usability: 优化红包组件样式
|
2023-06-01 15:13:21 +08:00 |
wangsongsole
|
7b0e2f2fb8
|
✏️ typos: 表格 立减金平台批次号->平台批次号
|
2023-06-01 13:42:39 +08:00 |
wangsongsole
|
f3124da762
|
🚸 usability: 商品范围列表 红包类型字段更正为(随机红包/固额红包)
|
2023-06-01 11:47:29 +08:00 |
wangsongsole
|
427b319678
|
✨ feat: 提交营销计划红包代码
|
2023-06-01 11:12:50 +08:00 |
wangsongsole
|
e76be05a7b
|
🎈 per: 整合兑换码-红包代码。并修复红包组件bug
|
2023-05-31 14:06:38 +08:00 |
wangsongsole
|
e1515d5bcd
|
♻️ refactor: 重构红包模块代码结构
|
2023-05-31 10:18:48 +08:00 |
wangsongsole
|
569eb3b11d
|
✨ feat: 完成红包组件编写,并编写部分兑换码新增、编辑、复制代码逻辑
|
2023-05-30 15:35:34 +08:00 |
wangsongsole
|
01a752f796
|
🐛 fix: 修复bug
|
2023-05-29 14:48:49 +08:00 |
wangsongsole
|
cf06f7a593
|
🚸 usability: 优化立减金、红包组件样式
|
2023-05-25 14:52:51 +08:00 |
wangsongsole
|
0879f03d1e
|
💩 improvedCode: 改进代码
|
2023-05-25 11:25:22 +08:00 |
wangsongsole
|
998e70a753
|
🐛 fix: 修复红包组件数据初始化bug
|
2023-05-25 11:10:43 +08:00 |
wangsongsole
|
f09d2983cc
|
🎨 style: 调整代码结构
|
2023-05-25 11:07:02 +08:00 |
wangsongsole
|
09d86694ae
|
💩 improved code: 改进红包组件代码
|
2023-05-25 11:05:43 +08:00 |
wangsongsole
|
8475495997
|
✏️ typos: 修改立减金文案
|
2023-05-25 11:04:16 +08:00 |
wangsongsole
|
91ee8a6295
|
🚚 comment: 移动文件
|
2023-05-24 18:08:03 +08:00 |
wangsongsole
|
25ca68600f
|
✨ feat: 新增红包组件
|
2023-05-24 17:07:34 +08:00 |
wangsongsole
|
6e09d0e0c1
|
✏️ typos: 修复文案bug
|
2023-05-24 16:30:14 +08:00 |
wangsongsole
|
9c9a76dbb0
|
🎨 style: 优化优惠券样式
|
2023-05-24 11:08:19 +08:00 |
wangsongsole
|
b6b5a96b17
|
🐞 fix(修复立减金 卡种校验问题):
|
2023-04-25 14:22:25 +08:00 |
wangsongsole
|
e0ba6a5850
|
🐞 fix: 修复报错
|
2023-04-21 09:24:05 +08:00 |
wangsongsole
|
67dfc82c29
|
🦄 refactor:http 状态统一封装 兼容网关,解决报错
|
2023-04-21 09:12:05 +08:00 |
wangsongsole
|
ca50107928
|
🐞 fix: 修复bug
1、修复订单列表核销选项动态渲染问题
2、修复keys列表计划名称和key批次动态关联问题
|
2023-03-28 12:01:28 +08:00 |
wangsongsole
|
2014e172af
|
🌈 style(所有模块): 优化代码
|
2023-03-02 10:30:13 +08:00 |
Apple
|
3c553632f1
|
Merge branch 'master' into feature_orderlist
* master: (26 commits)
style:立减金组件 满减金额6位限制改成7位
style:优化代码
fix:修复bug
feat:新增keys列表 新增key批次筛选
fix: 营销计划生成key白名单文件上传无地址
fix: 修复时间
feat:优化包体积大小,删除无效引用
feat:下载增加导出加载效果
feat:订单下载导出列表提交测试
优化打包体积
优化打包体积
feat:增加订单下载任务状态
修改api地址
feat:导出订单成功后挑战订单下载列表
1) 修复兑换码管理,编辑生效时间应该在归属计划时间内
style:删除调试
feat:新增订单下载列表删除,下载,查询接口联调
fix: 修复keys文件上传同一文件无法上传
fix:keys查询 限制100 业务开放
style:调整导出订单列表【删除】按钮禁用样式
...
# Conflicts:
# src/pages/order/list/list.js
|
2023-02-15 10:34:21 +08:00 |
wangsongsole
|
74c5100b18
|
style:立减金组件 满减金额6位限制改成7位
|
2023-02-08 10:30:02 +08:00 |
wangsongsole
|
0bc5689133
|
fix:修复bug
|
2023-02-07 14:17:15 +08:00 |
wangsongsole
|
58eee21137
|
feat:新增keys列表 新增key批次筛选
|
2023-02-07 14:10:41 +08:00 |
Apple
|
3a478b61ce
|
style:删除调试
|
2023-01-04 11:26:13 +08:00 |
Apple
|
20932d07dd
|
fix: 修复keys文件上传同一文件无法上传
|
2023-01-04 09:40:09 +08:00 |
zhangds
|
b03f7795a6
|
fix: 修复keys文件上传同一文件无法上传
|
2023-01-03 15:52:20 +08:00 |
Apple
|
372094bf3e
|
fix:keys查询 限制100 业务开放
|
2023-01-03 15:49:36 +08:00 |
Apple
|
f264ac900f
|
fix:keys查询 限制100 业务开放
|
2023-01-03 10:56:04 +08:00 |
Apple
|
9614778235
|
fix:优化filterBar组件联动
|
2022-12-27 17:59:25 +08:00 |
Apple
|
4c6765925b
|
fix:优化filterBar组件,点击document关闭状态菜单悬浮框
|
2022-12-27 17:03:47 +08:00 |
Apple
|
e9e0905e14
|
fix:优化filterSelect组件,默认不勾选,展示‘请选择’
|
2022-12-13 13:58:08 +08:00 |
Apple
|
52cca11125
|
feat:优化下拉选择过滤查询
|
2022-12-02 17:41:54 +08:00 |
zhangds
|
b9263aa93d
|
fix: 修复卡密时间选择
|
2022-11-23 03:33:23 +08:00 |
zhangds
|
6f6031aab6
|
fix: 删除本地存储时间datetime 改用knockGold_effectDate
|
2022-11-23 02:27:45 +08:00 |
Apple
|
eb26eecfeb
|
fix:[卡密有效期]-》【卡密有效期至】
|
2022-11-22 10:52:17 +08:00 |
zhangds
|
5f8794d741
|
1)合并maset
|
2022-11-21 10:19:08 +08:00 |
zhangds
|
c8d746e4e4
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-11-17 14:52:19 +08:00 |
zhangds
|
5d1a3e765a
|
fix: 修复优惠券管理时间问题
|
2022-11-17 14:52:04 +08:00 |
Wind-58
|
45c423a7e1
|
fix:修复【立减金商品】预警通知人中,前端未展示后端返回的预警人姓名
|
2022-11-16 14:49:24 +08:00 |
zhangds
|
e617078c63
|
fix: 修复时间
|
2022-11-11 10:50:09 +08:00 |
zhangds
|
eca3d58c60
|
fix: 修复兑换码、优惠券时间问题
|
2022-11-09 17:56:30 +08:00 |
zhangds
|
a0d33c3275
|
fix: 修复营销计划复制不现实商品编号
|
2022-11-07 15:25:24 +08:00 |
zhangds
|
bfb43d57ae
|
fix: 删除无用控制台输出
|
2022-11-03 15:22:43 +08:00 |
zhangds
|
bc0d1a3403
|
fix: 修改卡密有效期文字
|
2022-11-02 14:10:34 +08:00 |
zhangds
|
5f411474b5
|
fix: 增加兑换码时间的禁用
|
2022-11-02 13:53:08 +08:00 |
zhangds
|
b06cf8f31b
|
fix: 优化时间不能选择当天的时间
|
2022-11-02 13:48:02 +08:00 |
zhangds
|
02f9c97b28
|
fix: 增加计划卡密兑换
|
2022-11-01 18:25:19 +08:00 |
zhangds
|
f842d644d2
|
fix: 增加优惠券兑换时间
|
2022-11-01 17:23:59 +08:00 |
zhangds
|
2ea28a13e7
|
fix: 优化优惠券防抖功能
|
2022-11-01 10:57:26 +08:00 |
zhangds
|
8d00f01e46
|
fix: 增加优惠券按钮防抖
|
2022-10-31 17:00:55 +08:00 |
zhangds
|
07ce002932
|
fix: 修复优惠券复制删除 id的过程
|
2022-10-28 16:43:20 +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
|
a21555f0d4
|
fix: 区分复制和编辑
|
2022-10-26 16:48:04 +08:00 |
zhangds
|
ad7b1e5201
|
fix: 修复编辑不能编辑
|
2022-10-26 16:39:59 +08:00 |
zhangds
|
6ef022a3f5
|
fix: 修复优惠券新建商品选择
|
2022-10-26 14:16:47 +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
|
04b2869e53
|
fix: 修复默认商品权重
|
2022-10-26 10:48:32 +08:00 |
zhangds
|
f67fc9017b
|
fix: key批次增加新增商品类型
|
2022-10-24 17:52:31 +08:00 |
zhangds
|
89dbb1c3e8
|
fix: 增加优惠券不能选择卡密
|
2022-10-24 16:27:24 +08:00 |
zhangds
|
26fbd2d452
|
fix: 营销计划增加商品类型
|
2022-10-24 15:58:07 +08:00 |
zhangds
|
f9f2b095a0
|
fix: 删除无用代码
|
2022-10-24 11:47:28 +08:00 |
zhangds
|
dd6110e4d6
|
fix: 新建商品增加已经选择的不能选择
|
2022-10-24 11:23:06 +08:00 |
zhangds
|
c89faffc0b
|
增加商品权重值
|
2022-10-24 10:58:16 +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 |
zhangds
|
f8f61f5ba9
|
fix: 增加新建商品编辑
|
2022-10-21 18:19:08 +08:00 |
zhangds
|
dc40ac8587
|
fix: 新建商品新增完成
|
2022-10-21 17:09:25 +08:00 |
zhangds
|
28b15a22b4
|
fix: 优化swriper
|
2022-10-21 16:48:16 +08:00 |
zhangds
|
850b34545a
|
fix: 增加数据格式
|
2022-10-21 16:11:15 +08:00 |
zhangds
|
e093e7d9ac
|
fix: 增加图片上传接口
|
2022-10-21 15:46:38 +08:00 |
zhangds
|
f05c9e5d77
|
fix: 修复商品
|
2022-10-20 18:33:50 +08:00 |
zhangds
|
967d0b2d8e
|
fix: 修复优惠券归属key不请求接口
|
2022-10-19 15:53:03 +08:00 |
Apple
|
056c247e68
|
style(ipt组件):修改ipt组件禁用样式
|
2022-10-19 14:37:08 +08:00 |
zhangds
|
a11f09a30d
|
fix: 优惠券增加不勾选不展示
|
2022-10-19 11:28:00 +08:00 |
zhangds
|
b4eaba643f
|
fix: 修复立减金按钮loading
|
2022-10-19 11:04:46 +08:00 |
zhangds
|
ce1e9142e7
|
fix: 修复时间如果打包判断错误
|
2022-10-18 18:22:06 +08:00 |
zhangds
|
af6944e53a
|
fix: 修复计划如果是创建中可以修改映射商品
|
2022-10-18 15:30:06 +08:00 |
wangsongsole
|
92a2813fd0
|
style:删除无用代码和文件
|
2022-10-18 10:33:43 +08:00 |
zhangds
|
a5305cec9c
|
fix: 修复营销系统立减金编辑loading没消失
|
2022-10-17 15:31:47 +08:00 |
zhangds
|
71047d6415
|
fix: 优化立减金加载速度
|
2022-10-14 14:08:42 +08:00 |
zhangds
|
99916f222f
|
fix: 修复table格式错误
|
2022-10-14 13:46:40 +08:00 |
zhangds
|
80bc7f709f
|
fix: 修复商品范围时间错误 优化立减金数据回显示问题
|
2022-10-13 16:16:59 +08:00 |
zhangds
|
6438534e17
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into couponV2.0
|
2022-10-12 15:59:56 +08:00 |
zhangds
|
473d715097
|
fix: 如果是复制,映射商品可编辑
|
2022-10-12 15:59:48 +08:00 |
wangsongsole
|
e3c81251f9
|
fix:
1、修复兑换码复制 商品不能编辑问题
2、修复新增兑换码没有默认剩余数量、已使用数量问题
3、注释无用代码 待删除
|
2022-10-12 15:45:59 +08:00 |
zhangds
|
6b0440837c
|
fix: 修复复制营销计划时间无法编辑
|
2022-10-12 14:42:40 +08:00 |
zhangds
|
24fc6a1349
|
fix: 修复git合并错误问题
|
2022-10-12 14:28:52 +08:00 |
wangsongsole
|
482ccfb007
|
style:删除log
|
2022-10-11 16:17:27 +08:00 |
zhangds
|
cc0b86c123
|
fix: 优惠券复制改名字
|
2022-10-11 15:24:38 +08:00 |
zhangds
|
31783fe647
|
fix: 修复优惠券勾选无法提交
|
2022-10-11 15:10:46 +08:00 |
zhangds
|
a002bd2ab8
|
fix: 修复兑换码管理统一使用计划的商品组件
|
2022-10-11 14:36:35 +08:00 |
zhangds
|
0236ca61e8
|
fix: 修复无数据table提示问题
|
2022-10-11 12:30:19 +08:00 |
zhangds
|
36cd7338c1
|
fix: 修复编辑商品无商品类型
|
2022-10-11 12:23:39 +08:00 |
zhangds
|
ee05ff8e1f
|
fix: 修复复制时间按计划来
|
2022-10-11 12:00:52 +08:00 |
zhangds
|
0db88833c3
|
fix: 有数据审核失败编辑规则不能编辑
|
2022-10-11 11:45:07 +08:00 |
zhangds
|
f19c700a76
|
fix: 修复兑换码优惠券校验
|
2022-10-11 11:10:01 +08:00 |
zhangds
|
5bac1b55f6
|
fix: 修复优惠券范围title 修复兑换码复制无数据问题
|
2022-10-11 10:50:28 +08:00 |
zhangds
|
1471f4a8d2
|
fix: 修复优惠券进行中、暂停中、未开始状态生效开始时间不能修改
|
2022-10-10 20:21:20 +08:00 |
zhangds
|
e419a5dce9
|
fix: 修复复制优惠券立减金不能修改数据
|
2022-10-10 20:03:24 +08:00 |
zhangds
|
12cb381b44
|
fix: 修复兑换码商品范围展示
|
2022-10-10 18:17:02 +08:00 |
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 |
zhangds
|
8025aef880
|
fix: 修复兑换码key批次编辑
|
2022-10-10 15:57:55 +08:00 |
Apple
|
b3a9895c51
|
fix(编辑器模块):立减金兑换说明标题删减名称显示
|
2022-10-10 09:57:46 +08:00 |
zhangds
|
d015c4ae1b
|
fix: 修复优惠券key批次接口
|
2022-10-09 18:32:08 +08:00 |
zhangds
|
28843c43b5
|
fix: 修复key批次进行中编辑重复数据问题
|
2022-10-09 15:14:41 +08:00 |
zhangds
|
4140dd010d
|
fix: 修复优惠券减保留2位小数
|
2022-10-08 15:19:19 +08:00 |
zhangds
|
abf29e5759
|
fix: 修复优惠券时间不能修改
|
2022-09-30 18:08:44 +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
|
8a6709a1ff
|
fix: 修复计划编辑时间无法修改
|
2022-09-29 16:37:53 +08:00 |
zhangds
|
2dba919238
|
fix: 修复key下载模版为https模式
|
2022-09-29 16:19:20 +08:00 |
zhangds
|
41d07e3771
|
fix: 兑换码无法显示select
|
2022-09-29 15:18:27 +08:00 |
zhangds
|
623cf6b926
|
key 批次审核
|
2022-09-28 16:32:10 +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
|
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 |
wangsongsole
|
4a09c9a5bb
|
修复 模板编号输入框无响应bug
|
2022-07-27 10:13:25 +08:00 |
wangsongsole
|
c331d95c92
|
配合后端确认 模板编号字段
|
2022-07-27 10:08:47 +08:00 |
wangsongsole
|
2716dbb51e
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-26 16:41:22 +08:00 |
wangsongsole
|
7517a3ca07
|
立减金组件 回显样式控制
|
2022-07-26 16:41:19 +08:00 |
zhangds
|
13128ae664
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-26 16:12:06 +08:00 |
zhangds
|
b6c05cb183
|
1) 增加批量上传查询
|
2022-07-26 16:11:57 +08:00 |
wangsongsole
|
13e7aaa317
|
优化代码
|
2022-07-26 15:53:19 +08:00 |
wangsongsole
|
ce023b0eac
|
1、立减金组件新增 可用时间段 规则字段
2、新增模板编号字段
|
2022-07-26 15:26:12 +08:00 |
wangsongsole
|
6779556cfa
|
新增属性
|
2022-07-25 17:44:14 +08:00 |
wangsongsole
|
aa397e655b
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-25 17:34:54 +08:00 |
wangsongsole
|
ac7222e983
|
修改keys查询组件
|
2022-07-25 17:34:52 +08:00 |
zhangds
|
232c9d7cf5
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-07-25 15:36:34 +08:00 |
zhangds
|
a2a9374d81
|
1) 增加批量上传 弹窗
|
2022-07-25 15:36:22 +08:00 |