Commit Graph

233 Commits

Author SHA1 Message Date
80d159f344
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-26 14:19:16 +08:00
8670671172
添加了头像 2020-10-26 14:17:46 +08:00
asd
c792837983 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-26 12:01:08 +08:00
asd
10141bb795 HUOBI 2020-10-26 12:00:30 +08:00
4198488214
添加了开始直播 2020-10-26 11:10:53 +08:00
ca9b05cd9b Merge pull request '退出登录之后不能导航' (#79) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/79
2020-10-26 10:54:38 +08:00
fa65e674d4
退出登录之后不能导航 2020-10-26 10:54:10 +08:00
asd
eda8341c0b Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-26 10:45:10 +08:00
asd
91191371e5 gaibug 2020-10-26 10:44:42 +08:00
718caa7457
关于修复跳转 2020-10-26 10:42:35 +08:00
97c98f70ff
删除了首页跳转 2020-10-26 10:38:05 +08:00
9a9f28f176
修正了视频列表页 2020-10-26 10:33:50 +08:00
52d5c30bfc
提交反馈 2020-10-26 10:26:49 +08:00
84ae9da438
订阅者人数 2020-10-26 10:15:36 +08:00
436ab54073
修复了文件错误 2020-10-26 10:09:53 +08:00
c2bd87e809
添加了跳转 2020-10-26 08:59:08 +08:00
b5e81088af
完成 2020-10-25 22:43:53 +08:00
b4d0efd059
添加了跳转 2020-10-25 22:07:39 +08:00
2307b87cd8
删除了面包屑导航 2020-10-25 22:05:42 +08:00
aa0b492cf8
添加了请求权限 2020-10-25 20:56:40 +08:00
eee433837d
修改 2020-10-25 12:24:22 +08:00
7f2d980da6
切换为英文 2020-10-25 12:04:26 +08:00
8dbc19250b
添加了跳转 2020-10-25 11:25:08 +08:00
8e64fc337b
修正了钱包margin 关于我们的问题 2020-10-24 16:07:31 +08:00
9968b71ae4
修改了下拉彩电 2020-10-24 15:24:51 +08:00
asd
83f39bbaae about 顶部栏 2020-10-23 17:34:16 +08:00
asd
71dac35372 login 右边的列表 2020-10-23 09:55:27 +08:00
asd
a7415989ce Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-23 09:01:33 +08:00
asd
a97f2448e7 直播学生列表 2020-10-23 09:00:02 +08:00
f80e47e95e
直播切换 2020-10-22 15:48:02 +08:00
asd
bf3ba7228e 修改了报错 2020-10-22 11:21:04 +08:00
asd
1541b869d0 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-22 11:17:14 +08:00
asd
ed00c1d3f4 修改报错 2020-10-22 11:13:54 +08:00
ff85285fb4
修正完了error 2020-10-22 11:04:04 +08:00
854ce7191c
降级版本 2020-10-22 10:28:49 +08:00
asd
9a16a98f39 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-22 09:37:08 +08:00
asd
ef85649560 登录 2020-10-22 09:36:19 +08:00
asd
f0fde71145 手机号登录 2020-10-22 09:12:24 +08:00
6bad12dcdf
直播显示 2020-10-21 16:22:17 +08:00
aa32a51813
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-21 11:48:37 +08:00
38feb9d2b7
拒绝学生直播 2020-10-21 11:48:28 +08:00
asd
a624f6f353 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-21 11:40:02 +08:00
asd
13de1fdac0 修改密码 2020-10-21 11:39:24 +08:00
679e101608
删除背景抽 2020-10-21 10:11:27 +08:00
d574433020
调整代码结构 2020-10-21 10:10:40 +08:00
02d888e43d
修改了横向 滚动条 2020-10-21 09:57:36 +08:00
90fc51641f
Merge branches 'xbx' and 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-20 17:08:30 +08:00
d6a2569255
添加了加载中 日历完成一般 2020-10-20 17:08:18 +08:00
asd
1f009d09e6 .... 2020-10-20 17:06:20 +08:00
8d93aa04d3
修改了格式 2020-10-20 15:06:06 +08:00
b328b12f70
修改了接口 2020-10-20 14:25:56 +08:00
91fd41f90e
升级了以下 发送验证码 2020-10-20 09:46:38 +08:00
asd
f460fe9f23 pinglun 2020-10-19 17:48:56 +08:00
d20986da78
修改了缩进 2020-10-19 17:28:13 +08:00
13dc309bb9
添加跳转 2020-10-19 17:19:16 +08:00
146bfcaf46
注册完成 2020-10-19 17:17:55 +08:00
dca9a8af2d
订阅者管理 2020-10-19 16:01:08 +08:00
asd
42c6e14e6e Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-19 15:59:53 +08:00
asd
0cc2fb5677 提现+视频管理 2020-10-19 15:59:19 +08:00
8c6ab14103
i18n引入 2020-10-19 15:24:55 +08:00
448a305abe
添加了i18n 2020-10-19 15:06:08 +08:00
ec234fe4f8
修改了提示语 2020-10-19 09:10:38 +08:00
13258c990c
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-19 08:59:37 +08:00
c3e33c70b5
修正了分页 2020-10-19 08:59:04 +08:00
asd
063975a818 万恶的语言哦 2020-10-17 17:31:25 +08:00
ce3104abce
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 19:35:29 +08:00
asd
41009afeec 个人档案修改 2020-10-16 19:12:57 +08:00
2dc82c8000
月日历完成 2020-10-16 16:22:21 +08:00
b9f4d755a0
分页 2020-10-16 14:52:21 +08:00
1a9dd0ba50
日历接口调整 2020-10-16 14:47:35 +08:00
b5cbd71a56
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 14:33:26 +08:00
asd
3f1085f664 订阅者 2020-10-16 14:31:39 +08:00
007cf5a9c7
直播切换 2020-10-16 14:31:32 +08:00
758f85facf
直播学生 2020-10-16 10:47:05 +08:00
eef4917466
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 09:35:44 +08:00
bfcf22b479
直播一部分 2020-10-16 09:34:55 +08:00
ad1c54fdc9
日历修改 2020-10-16 08:59:17 +08:00
asd
9a6eeff200 钱包 获取成功id 2020-10-15 20:12:21 +08:00
7bf5fc86de
添加跳转日历 2020-10-15 19:33:11 +08:00
79a5882601
替换了4个空格缩进 2020-10-15 19:23:34 +08:00
6102fda7de
一部分接口 2020-10-15 19:06:30 +08:00
9c0e6ffd39
发布视频 2020-10-15 16:17:39 +08:00
asd
4824480b5b Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-15 15:45:23 +08:00
asd
19cd11b0dc 钱包 2020-10-15 15:44:50 +08:00
73f0232af1
修改了手机号 2020-10-15 15:43:55 +08:00
b1649cf566
直播修改 2020-10-15 15:34:14 +08:00
6111abafc4
直播 2020-10-15 14:51:34 +08:00
c240c7aba3
添加了put方法 2020-10-15 09:21:00 +08:00
6bf0fbc16f
video样式 2020-10-15 09:14:23 +08:00
7a821adee5
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-14 18:55:57 +08:00
ffe57d9938
上传文件 2020-10-14 18:55:15 +08:00
asd
a341593ba6 fin 2020-10-14 18:52:50 +08:00
asd
edc7242f3f Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-14 16:27:46 +08:00
asd
f9066bcdf1 视频详情 2020-10-14 16:27:24 +08:00
b41672ce8b
出现tokne自动切登录 2020-10-14 16:21:40 +08:00
5832f7a0bc
删除 2020-10-14 15:36:13 +08:00
5fb97c7c78 Merge pull request '添加del方法' (#42) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/42
2020-10-14 15:34:10 +08:00
4b095a853c
添加del方法 2020-10-14 15:33:46 +08:00
asd
240b0e068a Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-14 15:31:24 +08:00
asd
9dbaebfff2 视频列表 2020-10-14 15:30:29 +08:00