姜棚
|
382dc77706
|
更新
|
2021-12-13 15:04:35 +08:00 |
red-deng-deng
|
65c9b0e7ba
|
取消订单搜索条件：‘待充值’
|
2021-12-13 14:03:28 +08:00 |
|
red-deng-deng
|
46c0efda44
|
取消查询订单状态“待充值：0”的条件
|
2021-12-13 14:02:26 +08:00 |
|
red-deng-deng
|
a4e1c79cc5
|
Merge branch 'dev_1.0.2'
# Conflicts:
# src/components/subnav/main.js
解决导航与内容误差
|
2021-12-13 12:24:32 +08:00 |
|
red-deng-deng
|
3b29061562
|
解决导航与内容显示冲突bug，优化细节
|
2021-12-13 12:17:25 +08:00 |
|
姜棚
|
c066f9bf0c
|
更新枚举体状态进行中
|
2021-12-13 11:52:31 +08:00 |
|
姜棚
|
181d665a41
|
key批次列表审核流程调整
|
2021-12-13 11:51:05 +08:00 |
|
姜棚
|
f7b9175e38
|
更改key列表的状态生效中改为进行中
|
2021-12-13 11:43:32 +08:00 |
|
姜棚
|
2443976579
|
调整key审批流 更改key列表状态
|
2021-12-13 11:42:41 +08:00 |
|
姜棚
|
e48b10542a
|
修改订单字段名为key批次ID
|
2021-12-13 11:31:53 +08:00 |
|
姜棚
|
bcb4fdf215
|
更新营销计划审批流
|
2021-12-13 11:31:08 +08:00 |
|
姜棚
|
c1c91727de
|
更新菜单返回结构child改为children
|
2021-12-13 11:07:16 +08:00 |
|
姜棚
|
6fa3fa3479
|
更新计划任务审批流程
|
2021-12-13 11:03:41 +08:00 |
|
姜棚
|
d5f9efeceb
|
Update main.js
|
2021-12-10 21:25:09 +08:00 |
|
姜棚
|
25da5c728b
|
Update add.js
|
2021-12-10 21:17:07 +08:00 |
|
姜棚
|
322d311fbf
|
更新
|
2021-12-10 19:50:40 +08:00 |
|
姜棚
|
5f09e49a5d
|
Update list.js
|
2021-12-10 19:25:16 +08:00 |
|
姜棚
|
b542d75cf1
|
Update edit.js
|
2021-12-10 18:18:24 +08:00 |
|
red-deng-deng
|
6b4e5edff5
|
独立子账号代码
|
2021-12-10 18:02:28 +08:00 |
|
red-deng-deng
|
2f1361bbc1
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-12-10 18:02:03 +08:00 |
|
red-deng-deng
|
7b16816dc2
|
解决登录children还原child
|
2021-12-10 18:01:53 +08:00 |
|
姜棚
|
b84e1b520a
|
Update goodedit.js
|
2021-12-10 17:14:56 +08:00 |
|
姜棚
|
74b622108a
|
更新
|
2021-12-10 16:36:09 +08:00 |
|
姜棚
|
cc05c64733
|
更新
|
2021-12-10 15:58:10 +08:00 |
|
姜棚
|
5370e110c1
|
营销计划商品范围调整
|
2021-12-10 15:45:26 +08:00 |
|
姜棚
|
806825e38b
|
更新
|
2021-12-10 14:39:41 +08:00 |
|
姜棚
|
073da1c556
|
Update edit.js
|
2021-12-10 14:00:07 +08:00 |
|
姜棚
|
a43e84ab65
|
更新
|
2021-12-10 13:57:12 +08:00 |
|
姜棚
|
9a7b730e4c
|
更新编辑图片上传问题
|
2021-12-10 13:46:15 +08:00 |
|
姜棚
|
416b344c00
|
更新
|
2021-12-10 11:48:41 +08:00 |
|
姜棚
|
fb1a1e3ca9
|
更新库存
|
2021-12-10 10:02:17 +08:00 |
|
姜棚
|
f7008bdb01
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-12-10 09:48:51 +08:00 |
|
姜棚
|
28d31e28ec
|
更新
|
2021-12-10 09:48:45 +08:00 |
|
red-deng-deng
|
cc4135866d
|
调整订单操作样式
|
2021-12-09 19:22:58 +08:00 |
|
red-deng-deng
|
4ee71c5b09
|
商品范围列表后端提示
|
2021-12-09 19:14:17 +08:00 |
|
姜棚
|
71bc0eed61
|
更新
|
2021-12-09 18:29:48 +08:00 |
|
姜棚
|
98c71ab171
|
更新
|
2021-12-09 18:17:38 +08:00 |
|
姜棚
|
a64351e4b6
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-12-09 18:10:01 +08:00 |
|
姜棚
|
ada2b92623
|
更新
|
2021-12-09 18:09:54 +08:00 |
|
red-deng-deng
|
486fdbec33
|
子账号管理新增/编辑/列表/状态/重置密码处理
|
2021-12-09 17:18:53 +08:00 |
|
姜棚
|
4e4b9def52
|
Update edit.js
|
2021-12-09 15:55:40 +08:00 |
|
姜棚
|
b3f96b8b38
|
更新
|
2021-12-09 15:29:03 +08:00 |
|
姜棚
|
73156a3ae4
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-12-09 14:44:22 +08:00 |
|
姜棚
|
94151d634c
|
更新
|
2021-12-09 14:44:15 +08:00 |
|
red-deng-deng
|
1a1096863b
|
子账号管理新增编辑实现
|
2021-12-09 09:17:47 +08:00 |
|
red-deng-deng
|
a82df04fe6
|
update
|
2021-12-08 19:27:35 +08:00 |
|
red-deng-deng
|
83cafd4d51
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-12-08 19:27:24 +08:00 |
|
red-deng-deng
|
0582462984
|
调整登录字段逻辑处理
|
2021-12-08 19:27:05 +08:00 |
|
姜棚
|
d8e390347d
|
枚举移动位置
|
2021-12-08 18:03:31 +08:00 |
|
姜棚
|
285b8d042d
|
Update edit.js
|
2021-12-08 17:31:10 +08:00 |