wangsongsole
|
634b7ad29e
|
修改key列表文件
|
2022-07-28 11:15:06 +08:00 |
|
wangsongsole
|
2da88498aa
|
配key列表路由
|
2022-07-28 11:02:19 +08:00 |
|
wangsongsole
|
f6da7c08cf
|
修改key列表文件名称
|
2022-07-28 10:52:23 +08:00 |
|
wangsongsole
|
c72c357f61
|
新增keylist
|
2022-07-28 10:47:07 +08:00 |
|
wangsongsole
|
e66daf8b65
|
恢复代码
|
2022-07-28 10:46:57 +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 |
|
wangsongsole
|
62941ada28
|
1、新增keys条件查询组件静态数据
2、营销计划key列表新增批量发送按钮
|
2022-07-25 15:01:31 +08:00 |
|
wangsongsole
|
9e12956b15
|
修改立减金组件样式
|
2022-07-25 14:26:55 +08:00 |
|
wangsongsole
|
3664455790
|
合并
|
2022-07-25 14:18:05 +08:00 |
|
zhangds
|
24579f8604
|
1) 增加 keys 批量上传
|
2022-07-25 14:08:56 +08:00 |
|
wangsongsole
|
d6cdd5a87f
|
修改key列表组件样式
|
2022-07-25 14:05:58 +08:00 |
|
wangsongsole
|
d82d49fcf5
|
新增 key列表查询组件
|
2022-07-25 11:57:38 +08:00 |
|
wangsongsole
|
d6d8178538
|
修复商品logo上传报错
|
2022-07-20 11:08:26 +08:00 |
|
wangsongsole
|
69aaec89e3
|
切换到测试环境
|
2022-07-20 10:08:53 +08:00 |
|
wangsongsole
|
dc2344cd4a
|
测试商品
|
2022-07-20 09:59:07 +08:00 |
|
wangsongsole
|
d4dc80c683
|
api回归
|
2022-07-19 16:01:36 +08:00 |
|
wangsongsole
|
9a4291c43f
|
单个api切换正式环境
|
2022-07-19 14:07:20 +08:00 |
|
wangsongsole
|
2ae91d724d
|
修复商品报错
|
2022-07-19 09:58:28 +08:00 |
|
wangsongsole
|
4cfe9ea44f
|
商品图片修改id
|
2022-07-18 10:21:44 +08:00 |
|
wangsongsole
|
fa2af2981e
|
测试商品图片
|
2022-07-18 10:11:37 +08:00 |
|
wangsongsole
|
470f85e40d
|
修复商品图片编辑不能删除
|
2022-07-15 11:49:19 +08:00 |
Apple
|
c81a0e4683
|
调整登录获取验证码样式
|
2022-07-15 11:24:45 +08:00 |
|
wangsongsole
|
6724462545
|
修复商品不能删除问题
|
2022-07-15 11:00:27 +08:00 |
|
wangsongsole
|
73ad399267
|
优化预警百分比
|
2022-07-13 06:19:24 +08:00 |
|
wangsongsole
|
c99c10a60b
|
提交
|
2022-07-13 06:05:47 +08:00 |
|
wangsongsole
|
53cfdd2905
|
验证预警百分比
|
2022-07-13 05:52:55 +08:00 |
|
wangsongsole
|
85fee8080a
|
修复bug
|
2022-07-13 05:48:53 +08:00 |
|
Apple
|
118eb64510
|
立减金后台V1_3_0锁定版本
|
2022-07-13 05:27:21 +08:00 |
|
wangsongsole
|
80712660b5
|
根据权限禁用新增立减金按钮
|
2022-07-12 22:26:32 +08:00 |
|
Apple
|
f4beb25607
|
Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
|
2022-07-12 22:22:14 +08:00 |
|
Apple
|
b84a491aec
|
处理立减金添加者权限
|
2022-07-12 22:22:05 +08:00 |
|
wangsongsole
|
bbf0f8829a
|
删除多余数据
|
2022-07-12 21:45:36 +08:00 |
|
Apple
|
14dafd4d67
|
调整模板中心预览页面样式
|
2022-07-12 15:11:00 +08:00 |
|
wangsongsole
|
123557e255
|
1、根据需求优化批次商品名称显示长短
2、根据需求限制面额保留两位小数
|
2022-07-12 11:14:16 +08:00 |
|
Apple
|
307178d1ce
|
镜像环境
|
2022-07-12 10:48:20 +08:00 |
|
wangsongsole
|
1c99827e94
|
修复bug
|
2022-07-05 13:42:10 +08:00 |
|
zhangds
|
44bc51bc96
|
Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
|
2022-06-30 15:23:00 +08:00 |
|
wangsongsole
|
fc038e74da
|
商品图片Key修改为唯一
|
2022-06-30 14:39:55 +08:00 |
|
wangsongsole
|
155b18d3ae
|
修复 【营销计划-后台】兑换码编辑页面，商品范围列表没有展示立减金商品id
|
2022-06-29 16:38:56 +08:00 |
|
zhangds
|
6a8dfec703
|
Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
|
2022-06-24 18:27:15 +08:00 |
|
zhangds
|
7b0a4e9e3b
|
update
|
2022-06-24 18:27:09 +08:00 |
|
wangsongsole
|
f1f7e8b22d
|
修复 商品回显编辑报错问题
|
2022-06-24 17:10:24 +08:00 |
|
zhangds
|
8b19c1e484
|
Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
|
2022-06-24 16:10:36 +08:00 |
|
wangsongsole
|
b6256fd0c7
|
合并代码
|
2022-06-24 16:09:37 +08:00 |
|
zhangds
|
e0779faaa9
|
1) 修复对话图片上传
|
2022-06-24 16:09:12 +08:00 |
|
zhangds
|
5d76ccdf7a
|
1） 增加图片name
|
2022-06-24 16:00:31 +08:00 |
|
zhangds
|
bea8c996ff
|
Merge branch 'addMenu' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
|
2022-06-24 15:51:32 +08:00 |
|
wangsongsole
|
a086ca2180
|
修改营销计划 商品新增
|
2022-06-24 15:49:17 +08:00 |
|
wangsongsole
|
ab0c153fc6
|
修改兑换码管理
|
2022-06-24 15:46:10 +08:00 |
|
zhangds
|
752f5ef5d3
|
1) 修复新增图片默认图片
|
2022-06-24 15:43:38 +08:00 |
|
wangsongsole
|
81236ab66b
|
修改兑换码
|
2022-06-24 14:33:09 +08:00 |
|
wangsongsole
|
afdb690a45
|
提交
|
2022-06-23 17:21:29 +08:00 |
|
wangsongsole
|
5fdfea77ef
|
提交
|
2022-06-23 17:20:13 +08:00 |
|
wangsongsole
|
23f0e6a022
|
提交
|
2022-06-23 14:21:18 +08:00 |
|
Apple
|
24a0d71580
|
订单模块筛选状态order_type更改type
|
2022-06-21 14:06:49 +08:00 |
|
Apple
|
bb3cd38685
|
处理营销系统立减金【订单列表】筛选立减金和商品状态前端数据请求
|
2022-06-21 10:11:54 +08:00 |
|
Apple
|
f53a2482f7
|
订单管理【已过期】显示详情
|
2022-06-20 16:34:05 +08:00 |
|
wangsongsole
|
535bfc83bb
|
兑换码管理 当没有分销商时 可以修改时间 但不能进行其他操作
|
2022-06-20 11:45:48 +08:00 |
|
wangsongsole
|
659f5f225e
|
修复 修改兑换码批次的生效时间，如果立减金的有效期大于了修改后的时间，立减金的生效时间也要跟着修改
|
2022-06-20 10:35:12 +08:00 |
|
wangsongsole
|
c4c491e752
|
创建中不允许编辑
|
2022-06-20 09:52:35 +08:00 |
|
wangsongsole
|
dbbb13e2da
|
新增 兑换码驳回编辑
|
2022-06-19 20:24:27 +08:00 |
|
wangsongsole
|
cc5efc4f4d
|
提交
|
2022-06-19 14:26:50 +08:00 |
|
wangsongsole
|
3ebd1cc7e0
|
修复bug
|
2022-06-19 13:53:46 +08:00 |
|
wangsongsole
|
ef5b7558a6
|
解决bug
|
2022-06-19 13:36:25 +08:00 |
|
wangsongsole
|
98b65fc49f
|
Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
|
2022-06-19 12:22:24 +08:00 |
|
wangsongsole
|
e36438b6d5
|
修正 【营销计划】新增立减金商品，可用时间段在生效时间段内，提交后，前端还是会提示“有效期不允许大于生效时间段”
|
2022-06-19 12:22:21 +08:00 |
|
Apple
|
54b14bba78
|
【key批次】兑换码统计中，去掉已完结数
|
2022-06-19 11:04:16 +08:00 |
|
Apple
|
f4799298b6
|
解决【key批次】新增key批次提交后返回到key批次列表，列表左上方未展示计划名称
|
2022-06-17 17:49:41 +08:00 |
|
Apple
|
9c55a9da0f
|
解决【key批次】新增key批次，路由会跳到兑换码管理上
|
2022-06-17 16:08:46 +08:00 |
|
wangsongsole
|
b5ac3c6d75
|
添加注释
|
2022-06-17 15:48:11 +08:00 |
|
wangsongsole
|
677191c586
|
兑换码 商品列表反选
|
2022-06-17 15:44:08 +08:00 |
|
wangsongsole
|
37e415a9d9
|
修复
|
2022-06-17 15:19:38 +08:00 |
|
wangsongsole
|
1bc75b1870
|
Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
|
2022-06-17 14:20:08 +08:00 |
|
wangsongsole
|
0be43d1a94
|
修复
|
2022-06-17 14:20:07 +08:00 |
|
Apple
|
f73e7384f1
|
营销计划列表增加【更新时间】
key批次列表增加【更新时间】
|
2022-06-17 13:58:17 +08:00 |
|
Apple
|
52d74f5c4f
|
订单列表筛选输入框调整样式，增加平台批次号搜索
订单列表增加归属key批次字端。
|
2022-06-17 13:44:23 +08:00 |
|
wangsongsole
|
1f44a225f4
|
修复 bug
|
2022-06-17 12:01:27 +08:00 |
|
wangsongsole
|
9648b012ab
|
Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
|
2022-06-17 11:58:23 +08:00 |
|
wangsongsole
|
4119501a49
|
修复bug
|
2022-06-17 11:58:20 +08:00 |
|
Apple
|
b4f5e888ba
|
key批次列表【使用key总数】改【消耗key总数】
key批次列表 悬停或点击【消耗key总数】字段数值（蓝色），展示 统计的兑换码 【作废数】【已使用数】【已完结数】【已失效数】
|
2022-06-17 11:23:08 +08:00 |
|
wangsongsole
|
a9ff8e1171
|
修改 新增立减金商品提交后进入编辑页面，修改领取时间段再次提交并进入编辑页面，之前修改的领取时间未生效
|
2022-06-17 11:02:10 +08:00 |
|
wangsongsole
|
bba7af35b9
|
修复 联动
|
2022-06-17 10:56:01 +08:00 |
|
wangsongsole
|
01d9f2c263
|
修复 新建、编辑立减金，可用时间段不允许输入0天
|
2022-06-17 09:50:09 +08:00 |