Commit Graph

791 Commits

Author SHA1 Message Date
c790a34cbe
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-10 11:36:52 +08:00
asd
9bd5ceb10f ujok 2020-10-10 11:33:21 +08:00
32361d6629
我的档案查看完成 2020-10-10 10:57:00 +08:00
a67333be23
修改了api集中化 搞定了vuex 2020-10-10 10:19:38 +08:00
asd
b63fa6d363 Merge pull request 'zj' (#27) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/27
2020-10-10 09:04:31 +08:00
asd
598b1f8112 直播列表 2020-10-10 09:01:16 +08:00
8bf7b662d5
接口请求 2020-10-10 08:59:54 +08:00
0f29972dee Merge pull request '首页登录完成' (#26) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/26
2020-10-09 16:04:38 +08:00
fb6a526aee
首页登录完成 2020-10-09 16:04:20 +08:00
asd
1dcb0d9dc6 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-09 14:34:41 +08:00
0a06e29fca Merge pull request 'xbx' (#25) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/25
2020-10-09 14:31:43 +08:00
e9a37efe02
登录接口 2020-10-09 14:31:10 +08:00
2a1e290d12
添加了引入图片 2020-10-09 11:33:49 +08:00
5ae8c29fa9 Merge pull request 'xbx' (#24) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/24
2020-10-09 10:53:37 +08:00
b58d0638c4
添加了类型声明文件 2020-10-09 10:53:07 +08:00
9237c995b5
添加了类型文件 2020-10-09 10:49:24 +08:00
975821021d
更换了deep 2020-10-09 10:36:04 +08:00
asd
8cf0e4af7f Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-09 09:47:00 +08:00
8be648a3f6 Merge pull request 'xbx' (#23) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/23
2020-10-09 09:45:53 +08:00
645001f128
调用了接口 2020-10-09 09:45:13 +08:00
asd
b41c5f694a hansu的 2020-10-09 09:44:56 +08:00
1d0b8f2043
解决了所有警告 2020-10-05 16:47:36 +08:00
a817bc2891
替换了deep 2020-10-05 16:37:13 +08:00
88efe4d53a
升级了一下版本 2020-10-05 16:33:58 +08:00
ba3ded3be1
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-05 16:31:16 +08:00
75ab941063
添加了部分路由 2020-10-05 16:31:06 +08:00
68c9dfbb9e Merge pull request '直播资格' (#22) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/22
2020-09-30 11:35:06 +08:00
cd86143d43 直播资格 2020-09-30 11:34:27 +08:00
f4af1db7a5
添加导航 2020-09-29 18:58:51 +08:00
9c1f5b965b Merge pull request '对话框' (#21) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/21
2020-09-29 17:46:40 +08:00
fc101307e3 对话框 2020-09-29 17:45:45 +08:00
asd
8573cfd1c0 Merge pull request 'zj' (#20) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/20
2020-09-29 16:59:44 +08:00
asd
0ded7c7e31 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-09-29 16:51:56 +08:00
asd
db2eec98a0 我的钱包 关于 列表 2020-09-29 16:51:42 +08:00
d41b32e7b0 Merge pull request 'xbx' (#19) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/19
2020-09-29 16:00:44 +08:00
6626ab779a
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-09-29 15:59:45 +08:00
6b1eb02e9b
视频详情 2020-09-29 15:56:33 +08:00
0432653cd3
一部分 2020-09-29 09:26:52 +08:00
27c2dbe86f Merge pull request '完善表单样式' (#18) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/18
2020-09-28 16:44:04 +08:00
5e2a70b1ad 完善表单样式 2020-09-28 16:42:50 +08:00
3d6b421860
视频详情 2020-09-28 14:22:58 +08:00
asd
2df67c06c7 Merge pull request 'zj' (#17) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/17
2020-09-27 17:27:44 +08:00
asd
8bf0188105 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-09-27 17:26:10 +08:00
asd
51705dd628 登录注册+重置一半 2020-09-27 17:24:10 +08:00
adf713964e Merge pull request '发布直播 上传视频页面' (#16) from zhy into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/16
2020-09-27 17:07:35 +08:00
6259449b89 处理冲突 2020-09-27 17:07:13 +08:00
35ed45d7f5 发布直播 上传视频页面 2020-09-27 17:04:00 +08:00
asd
ed218ad70d Merge pull request 'zj' (#15) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/15
2020-09-27 16:30:50 +08:00
asd
21ac87c65e Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-09-27 16:30:11 +08:00
asd
6575f0f4c0 注册 2020-09-27 16:29:53 +08:00