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 |
|
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
|
c527ff09e7
|
修复 代码书写错误
|
2022-08-19 10:25:12 +08:00 |
|
wangsongsole
|
4bf0af36e4
|
删除注释
|
2022-08-18 16:03:59 +08:00 |
|
wangsongsole
|
93bfb654ab
|
修复 兑换码列表 复制状态错误展示
|
2022-08-18 15:24:34 +08:00 |
|
wangsongsole
|
9c1d31c640
|
修复 复制兑换码时间 不能选择问题
|
2022-08-18 15:23:20 +08:00 |
|
wangsongsole
|
1c197bb685
|
1、修复 兑换码复制状态判断错误
2、修复 兑换码复制 时间不能选座错误
|
2022-08-18 15:17:03 +08:00 |
|
wangsongsole
|
4483b324c7
|
删除注释
|
2022-08-18 13:58:18 +08:00 |
|
wangsongsole
|
57f46ad4ea
|
优化代码
|
2022-08-18 11:01:16 +08:00 |
zhangds
|
ec4c63fa46
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-18 11:00:00 +08:00 |
|
zhangds
|
1fb4c8e050
|
1) 修复营销计划时间不改变文件
|
2022-08-18 10:59:49 +08:00 |
|
wangsongsole
|
a583b23e03
|
优化路由
|
2022-08-18 09:51:52 +08:00 |
Apple
|
d7bc189aaa
|
营销系统V1_4版本锁版，取消版本号
|
2022-08-17 21:46:45 +08:00 |
|
wangsongsole
|
855218556e
|
提交
|
2022-08-17 21:28:35 +08:00 |
|
wangsongsole
|
d4bab7a8ab
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-17 21:26:47 +08:00 |
|
wangsongsole
|
0e7456b049
|
修复时间立减金生效时间报错
|
2022-08-17 21:26:45 +08:00 |
|
Apple
|
ca7d3dc8d2
|
立减金微信券模板编号默认为空
|
2022-08-17 21:15:57 +08:00 |
|
Apple
|
34d546459c
|
营销系统计划为生成中，不允许操作编辑/复制/预览/作废/发送
|
2022-08-17 20:49:05 +08:00 |
|
wangsongsole
|
1d992c42ec
|
删除 错误代码
|
2022-08-17 18:39:23 +08:00 |
|
wangsongsole
|
f630a8c639
|
提交
|
2022-08-17 18:18:57 +08:00 |
|
wangsongsole
|
41719e0a85
|
修复bug
|
2022-08-17 18:18:32 +08:00 |
|
wangsongsole
|
cd0be062da
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-17 18:04:54 +08:00 |
|
wangsongsole
|
ff02de0c98
|
修复 商品列表数据 丢失问题以及优化代码
|
2022-08-17 18:04:52 +08:00 |
|
Apple
|
2eeec7fe3e
|
优化表格组件，禁用行，点击全选控件不勾选
|
2022-08-17 18:03:45 +08:00 |
|
wangsongsole
|
e8d9b6312e
|
修复商品bug
|
2022-08-17 17:45:50 +08:00 |
|
wangsongsole
|
34911c5d66
|
修复 面包屑报错
|
2022-08-17 16:11:47 +08:00 |
|
wangsongsole
|
c8c47c6674
|
删除无用引用
|
2022-08-17 15:59:21 +08:00 |
|
wangsongsole
|
22f2aeedf9
|
解决报错
|
2022-08-17 15:58:39 +08:00 |
|
wangsongsole
|
70228f96fb
|
添加路由懒加载
|
2022-08-17 15:48:25 +08:00 |
|
Apple
|
2dc0c664f1
|
订单状态限制兑换码，状态为0，充值中展示作废按钮
|
2022-08-17 14:23:24 +08:00 |
|
zhangds
|
3405ba0312
|
1） 增加重置后table 为空
|
2022-08-17 09:58:50 +08:00 |
|
zhangds
|
d5aba67616
|
1) 删除无用代码
|
2022-08-16 15:56:43 +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 |
|
wangsongsole
|
930ea9c20f
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-16 15:44:06 +08:00 |
|
wangsongsole
|
52a1450b35
|
修复 立减金生效时间限制范围
|
2022-08-16 15:44:03 +08:00 |
|
zhangds
|
a5dc4e1a6f
|
update
|
2022-08-16 15:18:04 +08:00 |
|
Apple
|
e323ebf7b6
|
订单充值中（即生成订单未向上游投递的状态），可以作废
|
2022-08-16 14:41:17 +08:00 |
|
wangsongsole
|
30bd46c9d5
|
优化代码
|
2022-08-16 13:56:13 +08:00 |
|
wangsongsole
|
e784e7df49
|
修正 兑换码复制，审核驳回的兑换码不应该被复制。
|
2022-08-16 11:26:36 +08:00 |
|
wangsongsole
|
6dd00c149c
|
删除多余代码
|
2022-08-16 11:09:36 +08:00 |
|
wangsongsole
|
7a80493748
|
更改兑换码 立减金 生效时间以营销计划时间为限制 。原：批次时间
|
2022-08-16 11:02:58 +08:00 |
|
zhangds
|
496047276b
|
1) 暂存
|
2022-08-16 10:48:14 +08:00 |
|
zhangds
|
93e9cd5379
|
1) 修复营销计划审核中编辑，时间空白问题
|
2022-08-16 10:41:32 +08:00 |
|
wangsongsole
|
c9860ac6a4
|
新增 key批次状态为生成中时，操作按钮全部置灰，生成状态的key批次放在进行中tab页中展示
|
2022-08-16 09:47:05 +08:00 |
|
Apple
|
2c855f9f64
|
解决导航重复渲染bug
|
2022-08-15 18:10:24 +08:00 |
|
wangsongsole
|
50c676d83e
|
修复【追加key批次】追加key批次，撤销审批，在编辑页面，兑换码批次的商品范围会将之前的商品展示在最新的兑换码批次中
|
2022-08-15 17:25:18 +08:00 |
|
wangsongsole
|
bfb5f30916
|
禁止立减金 使用规则 富文本全屏
|
2022-08-15 16:49:14 +08:00 |
|
wangsongsole
|
be7942ae0b
|
优化代码
|
2022-08-15 15:51:59 +08:00 |
|
zhangds
|
b7f5960fa4
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 15:23:10 +08:00 |
|
zhangds
|
6fb3c6af20
|
1）修复复制计划后，表单验证
|
2022-08-15 15:23:02 +08:00 |
|
wangsongsole
|
727e5d3c9f
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 15:14:12 +08:00 |
|
wangsongsole
|
232feed09b
|
修正文件夹错误
|
2022-08-15 15:14:10 +08:00 |
|
zhangds
|
56f13879aa
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 14:33:12 +08:00 |
|
zhangds
|
a93a67e3be
|
1) 修复时间空白
|
2022-08-15 14:33:05 +08:00 |
|
wangsongsole
|
c55dc2affe
|
删除无用代码
|
2022-08-15 14:18:51 +08:00 |
|
wangsongsole
|
cf6a4b6350
|
修改样式
|
2022-08-15 14:18:17 +08:00 |
|
wangsongsole
|
c84501d5bf
|
x修复 key创建中 置灰更多按钮
|
2022-08-15 14:09:16 +08:00 |
|
zhangds
|
91607146ad
|
删除page
|
2022-08-15 11:56:51 +08:00 |
|
zhangds
|
a86dd06885
|
1) 修改page
|
2022-08-15 11:56:34 +08:00 |
|
zhangds
|
979a862672
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 11:28:14 +08:00 |
|
zhangds
|
42a8e419a8
|
1) 修复立减金复制不能编辑 2）修复列表状态操作
|
2022-08-15 11:28:08 +08:00 |
|
wangsongsole
|
d7831705a9
|
提交
|
2022-08-15 11:08:16 +08:00 |
|
wangsongsole
|
c8e183d658
|
修复 【兑换码-复制】复制已完结兑换码，兑换码生效时间无法修改。
|
2022-08-15 10:43:56 +08:00 |
|
wangsongsole
|
8bb93a7308
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-15 10:25:43 +08:00 |
|
wangsongsole
|
925f149a1e
|
修复可用时间段中，选择“有效期内，不规则日期可用”在预览图中未展示可用时间
|
2022-08-15 10:25:41 +08:00 |
|
Apple
|
bd5c9f5952
|
解决【追加key批次】提交审核时，后端提示“还有进行中的审批单”，创建/编辑成功后不需要请求审批接口
|
2022-08-15 10:25:28 +08:00 |
|
wangsongsole
|
272b9dd921
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-12 18:34:47 +08:00 |
|
wangsongsole
|
c0d4cf3bfb
|
提交
|
2022-08-12 18:34:45 +08:00 |
|
zhangds
|
305d9263be
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-12 18:18:37 +08:00 |
|
zhangds
|
140d6720c2
|
1） 修复导出带hash值 2） 修复订单复制回显数据
|
2022-08-12 18:18:28 +08:00 |
|
wangsongsole
|
1ade133568
|
修正 【订单列表】选择查询日期后，前端的page应该传1
|
2022-08-12 18:01:05 +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 |
|
zhangds
|
e4057c7cfa
|
1） 修改复制接口
|
2022-08-11 17:37:07 +08:00 |
|
zhangds
|
65e45dfa41
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 17:21:44 +08:00 |
|
zhangds
|
efbf16ebe2
|
1) 修改复制请求详情接口
|
2022-08-11 17:21:37 +08:00 |
|
Apple
|
e016b4502a
|
菜单营销系统管理显示
|
2022-08-11 16:38:47 +08:00 |
|
Apple
|
bf34d67690
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 16:34:45 +08:00 |
|
Apple
|
167cd279e9
|
解决登录不进
|
2022-08-11 16:34: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
|
d389d10365
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 15:52:09 +08:00 |
|
zhangds
|
470bc6e6ba
|
1) 增加table 操作带bash值
|
2022-08-11 15:51:59 +08:00 |
|
wangsongsole
|
74ff14c3c1
|
删除无用代码
|
2022-08-11 15:37:53 +08:00 |
|
wangsongsole
|
34ddc85715
|
key批次审核未通过，其下进行中的兑换码不可进行复制。
|
2022-08-11 15:33:00 +08:00 |
|
zhangds
|
afed5b5129
|
1) 修复批量删除带被删除的条件
|
2022-08-11 15:26:43 +08:00 |
|
zhangds
|
a33128fe82
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-11 15:06:25 +08:00 |
|
zhangds
|
fd178f3b64
|
1) 营销系统增加导出
|
2022-08-11 15:06:16 +08:00 |
|
wangsongsole
|
27cb9e8518
|
修正 复制兑换码后，被复制的兑换码数据没有回显。
|
2022-08-11 14:55:57 +08:00 |
|
wangsongsole
|
a56e94825c
|
key批次列表创建中状态的key批次，把更多按钮置灰掉
|
2022-08-11 14:03:49 +08:00 |
|
wangsongsole
|
343a5a9763
|
提交
|
2022-08-11 10:43:04 +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
|
2e50dcdbad
|
合并冲突
|
2022-08-10 17:41:19 +08:00 |
|
zhangds
|
d2e5eed984
|
update
|
2022-08-10 17:37:06 +08:00 |
|
wangsongsole
|
713d07c828
|
提交
|
2022-08-10 17:35:33 +08:00 |
|
zhangds
|
facec5e5b4
|
Merge branch 'clickCopyv1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-10 17:27:25 +08:00 |
|
zhangds
|
cd35c6fa8a
|
1) 增加计划导出功能
|
2022-08-10 17:21:51 +08:00 |
|
wangsongsole
|
0a69eb9ff3
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-10 17:02:42 +08:00 |
|
wangsongsole
|
abf7420f23
|
修复 bug
|
2022-08-10 17:02:40 +08:00 |
|
Apple
|
52727f0047
|
【账号管理】新建账号，在请求角色接口时，长度限制1000,增加页码查询
|
2022-08-10 16:50:55 +08:00 |
|
wangsongsole
|
8ba912366b
|
修复bug
|
2022-08-10 16:24:39 +08:00 |
|
wangsongsole
|
b4a28a252f
|
修复 【key批次列表】创建中、审核中、审核驳回、已作废状态的key批次，不允许批量发送key批次
|
2022-08-10 15:42:28 +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
|
3a9399390b
|
修正 【key批次列表】未勾选，批量发送按钮应该置灰
|
2022-08-10 14:26:26 +08:00 |
|
wangsongsole
|
62bd09d6b8
|
Merge branch 'clickCopyv1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into clickCopyv1.4
|
2022-08-10 14:20:09 +08:00 |
|
wangsongsole
|
5da50bfb20
|
修复 【key码列表管理】分销商和计划名称查询框，应该为预测性输入框
|
2022-08-10 14:20:06 +08:00 |
|
Apple
|
e19e5ac576
|
解决【营销计划-复制】key批次复制后，编辑兑换码，点击新增商品和新建立减金，提示“请添加映射分销商”
|
2022-08-10 14:07:18 +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
|
4315561afd
|
调整兑换码复制名称
|
2022-08-09 15:07:58 +08:00 |
|
Apple
|
04c8bf80a1
|
兑换码复制面包屑调整
|
2022-08-09 15:07:02 +08:00 |
|
zhangds
|
3991829fb0
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-09 14:51:43 +08:00 |
|
zhangds
|
ca839ca6f0
|
1） 修改菜单
|
2022-08-09 14:51:35 +08:00 |
|
wangsongsole
|
bcdd504161
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-09 14:04:07 +08:00 |
|
wangsongsole
|
5c9f9067ba
|
key列表条件查询 优化
|
2022-08-09 14:04:04 +08:00 |
|
Apple
|
2371b8d3eb
|
key批次复制增加copy_key_batch_id，计算复制次数
|
2022-08-09 11:50:51 +08:00 |
|
wangsongsole
|
78cc74e746
|
合并冲突
|
2022-08-09 11:26:28 +08:00 |
|
wangsongsole
|
d1f7ad65c7
|
删除无用代码
|
2022-08-09 11:17:17 +08:00 |
|
wangsongsole
|
4f58d9322c
|
删除 无用文件
|
2022-08-09 11:10:11 +08:00 |
|
wangsongsole
|
5b705ee327
|
修改 add
|
2022-08-09 11:00:55 +08:00 |
|
wangsongsole
|
12126a64b5
|
删除 无用文件
|
2022-08-09 10:59:40 +08:00 |
|
zhangds
|
bc1d38d195
|
Merge branch 'addMenu-v1.4' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-09 09:58:24 +08:00 |
|
zhangds
|
bbf3444e2a
|
1) 删除无用文件
|
2022-08-09 09:58:17 +08:00 |
|
Apple
|
6545da20dd
|
处理Ipt组件计算
|
2022-08-09 09:57:44 +08:00 |
|
wangsongsole
|
0fbe515adf
|
Merge branch 'addMenu-v1.4' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu-v1.4
|
2022-08-08 18:30:16 +08:00 |
|
wangsongsole
|
2842610ebf
|
测试兑换码
|
2022-08-08 18:30:14 +08:00 |