| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							7c839816d4
							
						
					 | 
					
						
						
							
							删除了平台达人的购物袋
						
						
						
						
						
						
					 | 
					
						2020-08-28 15:48:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							1305931e3b
							
						
					 | 
					
						
						
							
							通知和提示
						
						
						
						
						
						
					 | 
					
						2020-08-28 14:51:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							4e02daa854
							
						
					 | 
					
						
						
							
							t添加了提示和直播
						
						
						
						
						
						
					 | 
					
						2020-08-27 09:52:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3fe8f15aad
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#68) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/68 
						
						
					 | 
					
						2020-08-20 15:34:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							84c02f90f7
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-20 15:34:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fc4c187702
							
						
					 | 
					
						
						
							
							Merge branch 'master' into xbx
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:06:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							84240fedb8
							
						
					 | 
					
						
						
							
							关闭按钮
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:05:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							32d23e4bb0
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-19 19:26:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							380bd7dc9c
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#65) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/65 
						
						
					 | 
					
						2020-08-18 15:59:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b35222853d
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:58:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							79990e56d2
							
						
					 | 
					
						
						
							
							域名
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:31:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							22bc2a4b89
							
						
					 | 
					
						
						
							
							Merge pull request '替换域名' (#61) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/61 
						
						
					 | 
					
						2020-08-18 15:20:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							7090635886
							
						
					 | 
					
						
						
							
							替换域名
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:19:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1cc6fc56d1
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#58) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/58 
						
						
					 | 
					
						2020-08-15 19:11:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ff58e1a31
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-15 19:09:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							1cc3f289fe
							
						
					 | 
					
						
						
							
							添加了梦层
						
						
						
						
						
						
					 | 
					
						2020-08-15 15:58:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							67edac985e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
						
						
						
						
						
						
					 | 
					
						2020-08-14 14:51:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							74b10f4620
							
						
					 | 
					
						
						
							
							直播人数
						
						
						
						
						
						
					 | 
					
						2020-08-14 14:38:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							12d095dc05
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpaoup' (#52) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/52 
						
						
					 | 
					
						2020-08-14 12:18:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9c714d4e3
							
						
					 | 
					
						
						
							
							gdpaoup
						
						
						
						
						
						
					 | 
					
						2020-08-14 12:17:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							bfa4ed6edb
							
						
					 | 
					
						
						
							
							修正了
						
						
						
						
						
						
					 | 
					
						2020-08-14 11:07:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0e33599174
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#50) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/50 
						
						
					 | 
					
						2020-08-14 09:41:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							7755f54f07
							
						
					 | 
					
						
						
							
							返回
						
						
						
						
						
						
					 | 
					
						2020-08-14 09:40:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							0b5892cfbd
							
						
					 | 
					
						
						
							
							返回提示
						
						
						
						
						
						
					 | 
					
						2020-08-14 09:35:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ff4c3982ba
							
						
					 | 
					
						
						
							
							Merge pull request '图片上传' (#49) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/49 
						
						
					 | 
					
						2020-08-14 08:49:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							36080fd730
							
						
					 | 
					
						
						
							
							图片上传
						
						
						
						
						
						
					 | 
					
						2020-08-14 08:48:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							150c3337e4
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-14 08:26:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							0b0ac462a7
							
						
					 | 
					
						
						
							
							直播人数
						
						
						
						
						
						
					 | 
					
						2020-08-13 16:24:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							209cb7d9fb
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#44) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/44 
						
						
					 | 
					
						2020-08-13 11:37:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							e4f917a9cf
							
						
					 | 
					
						
						
							
							关闭直播页面
						
						
						
						
						
						
					 | 
					
						2020-08-13 11:36:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							06092fb183
							
						
					 | 
					
						
						
							
							直播热度与按钮修改
						
						
						
						
						
						
					 | 
					
						2020-08-13 11:32:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							252e4b7deb
							
						
					 | 
					
						
						
							
							Merge pull request 'update adout upload adout tencentCOS' (#43) from cmx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/43 
						
						
					 | 
					
						2020-08-12 15:18:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							9baac8ef63
							
						
					 | 
					
						
						
							
							update adout upload adout tencentCOS
						
						
						
						
						
						
					 | 
					
						2020-08-12 15:17:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							b1e5b24319
							
						
					 | 
					
						
						
							
							更换图片
						
						
						
						
						
						
					 | 
					
						2020-08-12 11:31:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							26c2e044dc
							
						
					 | 
					
						
						
							
							fixed bug
						
						
						
						
						
						
					 | 
					
						2020-08-11 20:37:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cf5577cb0
							
						
					 | 
					
						
						
							
							fixed bug adout publish shop
						
						
						
						
						
						
					 | 
					
						2020-08-11 09:41:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							9fac4e8a2e
							
						
					 | 
					
						
						
							
							fixed bug adout shop
						
						
						
						
						
						
					 | 
					
						2020-08-10 20:24:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							e223fd5ff9
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into cmx
						
						
						
						
						
						
					 | 
					
						2020-08-10 19:06:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d7c6625416
							
						
					 | 
					
						
						
							
							Merge pull request 'GDPAO' (#36) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/36 
						
						
					 | 
					
						2020-08-10 19:04:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a8f2f815d
							
						
					 | 
					
						
						
							
							GDPAO
						
						
						
						
						
						
					 | 
					
						2020-08-10 19:03:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							e946b98abf
							
						
					 | 
					
						
						
							
							防止多次点击
						
						
						
						
						
						
					 | 
					
						2020-08-10 17:31:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							2759972de6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into cmx
						
						
						
						
						
						
					 | 
					
						2020-08-10 16:55:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							2ab2d1c38e
							
						
					 | 
					
						
						
							
							fixed bug
						
						
						
						
						
						
					 | 
					
						2020-08-10 15:55:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d8840edb30
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#33) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/33 
						
						
					 | 
					
						2020-08-10 14:48:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d98624753
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-10 14:47:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							de2b7fe26d
							
						
					 | 
					
						
						
							
							uopdate about conflict
						
						
						
						
						
						
					 | 
					
						2020-08-10 10:24:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0e780d05b
							
						
					 | 
					
						
						
							
							update adout color of tag
						
						
						
						
						
						
					 | 
					
						2020-08-10 10:01:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cmxdd
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b5fa511bf
							
						
					 | 
					
						
						
							
							update adout tag color
						
						
						
						
						
						
					 | 
					
						2020-08-10 09:56:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							55695f164b
							
						
					 | 
					
						
						
							
							meiyan
						
						
						
						
						
						
					 | 
					
						2020-08-09 18:36:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							0279128637
							
						
					 | 
					
						
						
							
							解决了不出现的问题
						
						
						
						
						
						
					 | 
					
						2020-08-08 18:34:43 +08:00 | 
					
					
						
						
							
							
							
						
					 |