| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0ded7c7e31
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-09-29 16:51:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8bf0188105
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-09-27 17:26:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							21ac87c65e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-09-27 16:30:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6575f0f4c0
							
						
					 | 
					
						
						
							
							注册
						
						
						
						
						
						
					 | 
					
						2020-09-27 16:29:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2734e0cf1e
							
						
					 | 
					
						
						
							
							Merge pull request 'zj' (#14) from zj into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/14 
						
						
					 | 
					
						2020-09-27 11:00:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3938d40a8a
							
						
					 | 
					
						
						
							
							登录
						
						
						
						
						
						
					 | 
					
						2020-09-27 10:58:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							92d255683c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-09-27 10:56:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b75843988c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj
						
						
						
						
						
						
					 | 
					
						2020-09-27 10:49:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dfe8618c40
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#13) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/13 
						
						
					 | 
					
						2020-09-27 10:40:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							84e8a037b3
							
						
					 | 
					
						
						
							
							Merge branch 'zhy' of http://git.luyuan.tk/luyuan/beelink into xbx
						
						
						
						
						
						
					 | 
					
						2020-09-27 10:40:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							39cafb7bb6
							
						
					 | 
					
						
						
							
							select定位
						
						
						
						
						
						
					 | 
					
						2020-09-27 10:39:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							c81668f397
							
						
					 | 
					
						
						
							
							rem
						
						
						
						
						
						
					 | 
					
						2020-09-27 10:37:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							de899aebc8
							
						
					 | 
					
						
						
							
							router
						
						
						
						
						
						
					 | 
					
						2020-09-27 08:58:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f13780802
							
						
					 | 
					
						
						
							
							Merge pull request '下导航' (#12) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/12 
						
						
					 | 
					
						2020-09-25 17:31:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6533e7bbf2
							
						
					 | 
					
						
						
							
							下导航
						
						
						
						
						
						
					 | 
					
						2020-09-25 17:30:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							5bf4b36049
							
						
					 | 
					
						
						
							
							修复了滚动条
						
						
						
						
						
						
					 | 
					
						2020-09-25 16:54:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2063de2a9b
							
						
					 | 
					
						
						
							
							Merge pull request '更改大写' (#11) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/11 
						
						
					 | 
					
						2020-09-25 16:35:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							ec13ae4a4e
							
						
					 | 
					
						
						
							
							更改大写
						
						
						
						
						
						
					 | 
					
						2020-09-25 16:35:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5d082ea187
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#10) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/10 
						
						
					 | 
					
						2020-09-25 16:34:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							d8e89c92f9
							
						
					 | 
					
						
						
							
							修复首页
						
						
						
						
						
						
					 | 
					
						2020-09-25 16:34:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							a06e7134dc
							
						
					 | 
					
						
						
							
							Merge branch 'zhy' of http://git.luyuan.tk/luyuan/beelink into xbx
						
						
						
						
						
						
					 | 
					
						2020-09-25 16:28:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							10a0917cdc
							
						
					 | 
					
						
						
							
							修改路由
						
						
						
						
						
						
					 | 
					
						2020-09-25 16:27:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9ee0987df6
							
						
					 | 
					
						
						
							
							我的档案
						
						
						
						
						
						
					 | 
					
						2020-09-25 16:26:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							959f410e9f
							
						
					 | 
					
						
						
							
							Merge pull request '顶部样式完成' (#9) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/9 
						
						
					 | 
					
						2020-09-25 15:46:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							011fa5337c
							
						
					 | 
					
						
						
							
							顶部样式完成
						
						
						
						
						
						
					 | 
					
						2020-09-25 15:46:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							84e6700dfc
							
						
					 | 
					
						
						
							
							登录页
						
						
						
						
						
						
					 | 
					
						2020-09-25 15:23:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5d96982822
							
						
					 | 
					
						
						
							
							Merge pull request 'eradme' (#8) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/8 
						
						
					 | 
					
						2020-09-25 15:16:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							92b79c7176
							
						
					 | 
					
						
						
							
							eradme
						
						
						
						
						
						
					 | 
					
						2020-09-25 15:15:38 +08:00 | 
					
					
						
						
							
							
							
						
					 |