| 
						
					 | 
					
						
						
						
						
							
						
						
							eb321e2561
							
						
					 | 
					
						
						
							
							Merge pull request '直播切换' (#67) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/67 
						
						
					 | 
					
						2020-10-22 15:48:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							f80e47e95e
							
						
					 | 
					
						
						
							
							直播切换
						
						
						
						
						
						
					 | 
					
						2020-10-22 15:48:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf3ba7228e
							
						
					 | 
					
						
						
							
							修改了报错
						
						
						
						
						
						
					 | 
					
						2020-10-22 11:21:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1541b869d0
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-10-22 11:17:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ed00c1d3f4
							
						
					 | 
					
						
						
							
							修改报错
						
						
						
						
						
						
					 | 
					
						2020-10-22 11:13:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7209fd4033
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#66) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/66 
						
						
					 | 
					
						2020-10-22 11:13:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							ff85285fb4
							
						
					 | 
					
						
						
							
							修正完了error
						
						
						
						
						
						
					 | 
					
						2020-10-22 11:04:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							854ce7191c
							
						
					 | 
					
						
						
							
							降级版本
						
						
						
						
						
						
					 | 
					
						2020-10-22 10:28:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a16a98f39
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-10-22 09:37:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef85649560
							
						
					 | 
					
						
						
							
							登录
						
						
						
						
						
						
					 | 
					
						2020-10-22 09:36:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4c46c4e4d5
							
						
					 | 
					
						
						
							
							Merge pull request '直播显示' (#65) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/65 
						
						
					 | 
					
						2020-10-22 09:35:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f0fde71145
							
						
					 | 
					
						
						
							
							手机号登录
						
						
						
						
						
						
					 | 
					
						2020-10-22 09:12:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							6bad12dcdf
							
						
					 | 
					
						
						
							
							直播显示
						
						
						
						
						
						
					 | 
					
						2020-10-21 16:22:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							20e9a56e03
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#64) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/64 
						
						
					 | 
					
						2020-10-21 11:49:28 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a350e70f1
							
						
					 | 
					
						
						
							
							Merge pull request 'zj' (#62) from zj into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/62 
						
						
					 | 
					
						2020-10-21 11:43:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a624f6f353
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-10-21 11:40:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							af01675c10
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-10-20 17:07:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							42c6e14e6e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-10-19 15:59:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |