red-deng-deng
|
17a13e7613
|
修复已知bug
|
2021-12-06 12:34:48 +08:00 |
姜棚
|
72acf266a5
|
更新
|
2021-12-03 15:12:11 +08:00 |
|
姜棚
|
39f6f61b24
|
更新
|
2021-12-03 15:03:49 +08:00 |
|
姜棚
|
374525c5ff
|
Update api.js
|
2021-12-03 14:23:53 +08:00 |
|
姜棚
|
13be3da241
|
更新
|
2021-12-03 13:46:02 +08:00 |
|
姜棚
|
d7259fb9ce
|
更新
|
2021-12-02 20:06:55 +08:00 |
|
姜棚
|
ab53b1abfc
|
新增商品账号类型字段
|
2021-12-02 16:28:54 +08:00 |
|
姜棚
|
60912f9a29
|
更新
|
2021-12-02 15:22:56 +08:00 |
|
姜棚
|
9902d58215
|
Update api.js
|
2021-12-02 10:36:26 +08:00 |
|
姜棚
|
71ac543615
|
更新
|
2021-12-02 10:36:10 +08:00 |
|
姜棚
|
8c65532409
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-12-01 14:56:16 +08:00 |
|
姜棚
|
7c3f32a171
|
更新
|
2021-12-01 14:55:34 +08:00 |
|
red-deng-deng
|
4cd69dda07
|
解决console
|
2021-11-30 16:34:07 +08:00 |
|
姜棚
|
930d04fd4c
|
Update api.js
|
2021-11-30 04:38:03 +08:00 |
|
姜棚
|
64b002b780
|
更新
|
2021-11-30 04:28:35 +08:00 |
|
red-deng-deng
|
c2a50747e0
|
解决全局消息提示
|
2021-11-30 03:32:28 +08:00 |
|
red-deng-deng
|
71f90f27e2
|
解决分销商bug
|
2021-11-30 02:28:49 +08:00 |
|
red-deng-deng
|
1f17bc6efa
|
解决全局异常报错
|
2021-11-30 01:51:16 +08:00 |
|
red-deng-deng
|
82f5200bc3
|
解决分销商bug
|
2021-11-30 01:34:40 +08:00 |
|
姜棚
|
e86c8bd322
|
更新
|
2021-11-29 23:01:18 +08:00 |
|
red-deng-deng
|
76c45170fe
|
清除hash
|
2021-11-29 14:47:46 +08:00 |
|
red-deng-deng
|
e178b22753
|
update
|
2021-11-29 14:37:56 +08:00 |
|
red-deng-deng
|
26cfe3e8a6
|
解决token下载文件权限
|
2021-11-29 14:37:25 +08:00 |
|
red-deng-deng
|
3168f64e9c
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-29 14:27:54 +08:00 |
|
red-deng-deng
|
c9827f238b
|
解决token失效
|
2021-11-29 14:27:44 +08:00 |
|
姜棚
|
01839a3e58
|
更新
|
2021-11-29 13:53:30 +08:00 |
|
red-deng-deng
|
dd4a69872d
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
# Conflicts:
# src/App.css
|
2021-11-28 21:13:40 +08:00 |
|
red-deng-deng
|
8a1e770342
|
解决B端bug
|
2021-11-28 21:12:44 +08:00 |
|
姜棚
|
813023b998
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 19:18:31 +08:00 |
|
姜棚
|
350d0fbaad
|
更新
|
2021-11-28 19:18:24 +08:00 |
|
red-deng-deng
|
d9ab474c85
|
更新
|
2021-11-28 19:07:00 +08:00 |
|
姜棚
|
6ea0a1f400
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-28 18:38:16 +08:00 |
|
姜棚
|
7fc8bf59b9
|
更新
|
2021-11-28 18:38:09 +08:00 |
|
red-deng-deng
|
537690bfb4
|
解决token失效退出登录
|
2021-11-28 18:01:15 +08:00 |
|
red-deng-deng
|
ba6c1f3fa6
|
解决token失效
|
2021-11-28 17:52:45 +08:00 |
|
姜棚
|
6674d16bca
|
Update api.js
|
2021-11-28 17:14:39 +08:00 |
|
red-deng-deng
|
d4e717201b
|
订单更为成功
|
2021-11-28 16:12:41 +08:00 |
|
red-deng-deng
|
b673ce07b6
|
解决图片请求头未带token
|
2021-11-28 11:58:47 +08:00 |
|
姜棚
|
870aac783e
|
Update api.js
|
2021-11-28 11:48:18 +08:00 |
|
姜棚
|
159df81ec3
|
更新
|
2021-11-28 11:25:18 +08:00 |
|
姜棚
|
119aa35393
|
Update api.js
|
2021-11-28 10:56:42 +08:00 |
|
姜棚
|
400854731a
|
更新
|
2021-11-27 21:22:28 +08:00 |
|
姜棚
|
e1a7a16452
|
更新
|
2021-11-27 14:23:52 +08:00 |
|
red-deng-deng
|
2d7b898b3b
|
调整退出登录样式
|
2021-11-26 19:53:49 +08:00 |
|
red-deng-deng
|
16cc073eac
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-26 19:43:26 +08:00 |
|
red-deng-deng
|
33101a0b44
|
完成订单日志
|
2021-11-26 19:43:14 +08:00 |
|
姜棚
|
41408b31da
|
更新
|
2021-11-26 17:17:14 +08:00 |
|
red-deng-deng
|
c752a5fdfe
|
update
|
2021-11-25 17:17:10 +08:00 |
|
姜棚
|
eaabbd6771
|
更新
|
2021-11-25 09:49:06 +08:00 |
|
姜棚
|
e52e549344
|
更新
|
2021-11-24 20:04:54 +08:00 |
|
red-deng-deng
|
92cf45585a
|
解决bug
|
2021-11-24 18:59:21 +08:00 |
|
red-deng-deng
|
242e5c1f9d
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 17:08:15 +08:00 |
|
red-deng-deng
|
786e1baffb
|
解决bug
|
2021-11-24 17:08:06 +08:00 |
|
姜棚
|
395676167e
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 16:10:35 +08:00 |
|
姜棚
|
1d9f824652
|
更新兑换页
|
2021-11-24 16:10:28 +08:00 |
|
red-deng-deng
|
f665506e3a
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 15:13:17 +08:00 |
|
red-deng-deng
|
89ecc56608
|
觉得添加
|
2021-11-24 15:13:07 +08:00 |
|
姜棚
|
ef273bbb25
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-24 14:35:25 +08:00 |
|
姜棚
|
47fa8d1012
|
Update api.js
|
2021-11-24 14:35:22 +08:00 |
|
red-deng-deng
|
32b755ef33
|
调整岗位
|
2021-11-24 11:41:06 +08:00 |
|
red-deng-deng
|
bd2205c0d9
|
回滚
|
2021-11-23 20:48:42 +08:00 |
|
姜棚
|
7f470c94c3
|
Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
|
2021-11-23 15:54:55 +08:00 |
|
姜棚
|
4d1032767f
|
更新
|
2021-11-23 15:54:11 +08:00 |
|
red-deng-deng
|
72917491a2
|
完成退出登录
|
2021-11-23 14:48:53 +08:00 |
|
red-deng-deng
|
a45821d52d
|
完成登录失错校验，弹出验证码
|
2021-11-23 11:31:22 +08:00 |
|
red-deng-deng
|
d186856cc9
|
解决角色编辑后端更新路由bug
|
2021-11-23 09:48:39 +08:00 |
|
red-deng-deng
|
6527fbcf93
|
更新
|
2021-11-23 09:37:49 +08:00 |
|
red-deng-deng
|
1ec5082629
|
联调订单改为成功和作废接口
|
2021-11-22 20:47:45 +08:00 |
|
red-deng-deng
|
567f38adc5
|
解决分销商状态
|
2021-11-22 20:18:15 +08:00 |
|
red-deng-deng
|
050be9055c
|
定制化模块
|
2021-11-22 19:52:27 +08:00 |
|
red-deng-deng
|
5209fc5c01
|
新增模板
|
2021-11-22 19:03:16 +08:00 |
|
red-deng-deng
|
bbfdd35fd4
|
菜单接口
|
2021-11-22 17:20:52 +08:00 |
|
姜棚
|
e939e80b76
|
更新
|
2021-11-22 15:49:22 +08:00 |
|
姜棚
|
eab8240c8e
|
更新
|
2021-11-22 15:43:40 +08:00 |
|
red-deng-deng
|
93d0a61518
|
修改重置密码，编辑，改变状态接口
|
2021-11-22 14:14:46 +08:00 |
|
red-deng-deng
|
52dfd82b24
|
菜单维护接口连调
|
2021-11-21 19:01:51 +08:00 |
|
red-deng-deng
|
d7aa0d7e7a
|
解决冲突
|
2021-11-21 18:04:39 +08:00 |
|
red-deng-deng
|
a94ca16778
|
解决冲突
|
2021-11-21 17:53:37 +08:00 |
|
red-deng-deng
|
15cb3772a2
|
完成岗位逻辑处理，接口联动
|
2021-11-21 17:52:14 +08:00 |
|
姜棚
|
8a88b279f0
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-20 19:39:06 +08:00 |
|
姜棚
|
ab5ed091be
|
Update enum.js
|
2021-11-20 19:37:11 +08:00 |
|
姜棚
|
e0ae04a592
|
g更新
|
2021-11-20 19:37:01 +08:00 |
|
red-deng-deng
|
cc6a9c427b
|
岗位接口
|
2021-11-20 19:35:15 +08:00 |
|
red-deng-deng
|
4222528c49
|
分销商编辑/重置密码
|
2021-11-20 16:24:30 +08:00 |
|
red-deng-deng
|
806bb60c5b
|
分销商编辑接口完毕
|
2021-11-20 15:57:14 +08:00 |
|
red-deng-deng
|
2f81eb3944
|
分销商新建接口
|
2021-11-20 12:50:29 +08:00 |
|
red-deng-deng
|
2288ae7b1c
|
完成角色和账号接口
|
2021-11-19 20:57:51 +08:00 |
|
red-deng-deng
|
e389c2399d
|
完成账号列表
|
2021-11-19 19:29:40 +08:00 |
|
red-deng-deng
|
7d0ccea130
|
解决冲突
|
2021-11-19 09:40:47 +08:00 |
|
red-deng-deng
|
b5e164562f
|
更新分销商
|
2021-11-19 09:39:24 +08:00 |
|
北海一刀
|
9eec1708fb
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-19 09:38:09 +08:00 |
|
北海一刀
|
b103a0d214
|
4564654
456465454
|
2021-11-19 09:33:39 +08:00 |
|
red-deng-deng
|
c739d8704f
|
分销商列表接口，异步校验
|
2021-11-18 16:31:42 +08:00 |
|
北海一刀
|
d76f7c8eca
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-18 09:33:23 +08:00 |
|
北海一刀
|
c33af66c3d
|
新增营销计划一堆东西
|
2021-11-18 09:33:13 +08:00 |
|
red-deng-deng
|
fbf5f698e0
|
订单管理更新
|
2021-11-17 20:54:17 +08:00 |
|
red-deng-deng
|
fedd9b2bcf
|
兑换码管理列表接口调试完毕
|
2021-11-17 19:16:31 +08:00 |
|
red-deng-deng
|
5c0a879a62
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
# Conflicts:
# src/assets/api.js
|
2021-11-17 17:15:11 +08:00 |
|
red-deng-deng
|
81d43693aa
|
兑换码管理查询接口
|
2021-11-17 17:13:46 +08:00 |
|
北海一刀
|
76b8a89da1
|
Update api.js
|
2021-11-17 16:03:03 +08:00 |
|
red-deng-deng
|
2f84eaa869
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-17 15:18:47 +08:00 |
|
red-deng-deng
|
de0a2da400
|
update
|
2021-11-17 15:18:35 +08:00 |
|
北海一刀
|
0867742696
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
|
2021-11-17 15:17:35 +08:00 |
|
北海一刀
|
a68f53be2f
|
Update api.js
|
2021-11-17 15:17:28 +08:00 |
|
red-deng-deng
|
9870609868
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
# Conflicts:
# src/components/gird/main.js
|
2021-11-17 14:57:12 +08:00 |
|
red-deng-deng
|
6ccc1544c8
|
解决冲突
|
2021-11-17 14:56:16 +08:00 |
|
北海一刀
|
0de75e5e69
|
Update api.js
|
2021-11-17 14:33:25 +08:00 |
|
北海一刀
|
62f8397c4a
|
Update api.js
|
2021-11-17 14:31:31 +08:00 |
|
red-deng-deng
|
ea59a18c5d
|
更新
|
2021-11-17 14:15:51 +08:00 |
|
red-deng-deng
|
a7b21d4d06
|
Merge branch 'master' of https://gitee.com/red-deng-deng/marketing-system
# Conflicts:
# src/assets/api.js
|
2021-11-17 14:02:30 +08:00 |
|
red-deng-deng
|
ec86479279
|
兑换码管理订单接口
|
2021-11-17 13:49:18 +08:00 |
|
北海一刀
|
464c8aaf11
|
更新api封装结构
|
2021-11-17 13:37:55 +08:00 |
|
北海一刀
|
41ad41d0de
|
更新
|
2021-11-16 20:17:02 +08:00 |
|
red-deng-deng
|
7d7944b371
|
完成兑换码管理AC核对
|
2021-11-15 18:20:36 +08:00 |
|
北海一刀
|
68547258c9
|
456465454545454
|
2021-11-13 14:30:02 +08:00 |
|
red-deng-deng
|
2e35f8f9fa
|
完成订单管理和兑换码管理依据AC
|
2021-11-10 18:01:24 +08:00 |
|
red-deng-deng
|
c535d3cade
|
根据AC进行整改
|
2021-11-08 09:29:04 +08:00 |
|
red-deng-deng
|
338c135cf4
|
样式改版
|
2021-11-05 16:52:02 +08:00 |
|
red-deng-deng
|
eacf1deec5
|
新增角色列表，封装岗位列表
|
2021-11-03 09:27:55 +08:00 |
|
red-deng-deng
|
cab01cf7c4
|
整合导航区域，新增用户
|
2021-11-02 09:32:55 +08:00 |
|
red-deng-deng
|
81fb5cab01
|
封装输入框
|
2021-10-28 09:32:19 +08:00 |
|
red-deng-deng
|
1163c502c6
|
完成后台首页
|
2021-10-26 17:58:29 +08:00 |
|
red-deng-deng
|
f4de81637b
|
概览布局
|
2021-10-26 16:01:18 +08:00 |
|
red-deng-deng
|
e21b37352b
|
完成营销系统概览，项目初建，路由配置
|
2021-10-25 17:45:14 +08:00 |