Commit Graph

752 Commits

Author SHA1 Message Date
01a95d13d6 Merge pull request '修改了横向 滚动条' (#61) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/61
2020-10-21 10:05:03 +08:00
02d888e43d
修改了横向 滚动条 2020-10-21 09:57:36 +08:00
8c1927dab7 Merge pull request 'xbx' (#60) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/60
2020-10-20 17:09:34 +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
144c753968 Merge pull request 'zj' (#59) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/59
2020-10-20 17:08:07 +08:00
asd
af01675c10 Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-20 17:07:00 +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
528a53a7b0 Merge pull request 'pinglun' (#58) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/58
2020-10-19 17:49:31 +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
asd
d2b4a94db6 Merge pull request 'zj' (#57) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/57
2020-10-19 16:02:13 +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
083bacb653 Merge pull request 'xbx' (#56) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/56
2020-10-19 15:34:37 +08:00
8c6ab14103
i18n引入 2020-10-19 15:24:55 +08:00
448a305abe
添加了i18n 2020-10-19 15:06:08 +08:00
f18aa0c43d
升级了依赖 2020-10-19 14:57:56 +08:00
c02aeec934 Merge pull request '修改了提示语' (#55) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/55
2020-10-19 09:12:42 +08:00
ec234fe4f8
修改了提示语 2020-10-19 09:10:38 +08:00
1debb888c2 Merge pull request 'xbx' (#54) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/54
2020-10-19 09:00:23 +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
01ca0f10c8 Merge pull request '万恶的语言哦' (#53) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/53
2020-10-17 17:32:59 +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
0f3c81499d Merge pull request '个人档案修改' (#52) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/52
2020-10-16 19:14:15 +08:00
asd
41009afeec 个人档案修改 2020-10-16 19:12:57 +08:00
2dc82c8000
月日历完成 2020-10-16 16:22:21 +08:00
9db63a6a1d Merge pull request 'xbx' (#51) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/51
2020-10-16 14:53:54 +08:00
8f3eb66639
Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 14:53:37 +08:00
b9f4d755a0
分页 2020-10-16 14:52:21 +08:00
1a9dd0ba50
日历接口调整 2020-10-16 14:47:35 +08:00
asd
6df114aece Merge pull request 'zj' (#50) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/50
2020-10-16 14:33:39 +08:00
b5cbd71a56
Merge branch 'zj' of http://git.luyuan.tk/luyuan/beelink into xbx 2020-10-16 14:33:26 +08:00
7808cac24d Merge pull request 'xbx' (#49) from xbx into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/49
2020-10-16 14:33:13 +08:00
asd
27e4a2570e Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj 2020-10-16 14:32:15 +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
asd
f7d4f86541 Merge pull request 'zj' (#48) from zj into master
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/48
2020-10-16 09:36:28 +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