| 
						
					 | 
					
						
						
						
						
							
						
						
							0bc6be9b9f
							
						
					 | 
					
						
						
							
							Merge pull request 'z8.3' (#100) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/100 
						
						
					 | 
					
						2020-08-03 14:39:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							af768bff80
							
						
					 | 
					
						
						
							
							z8.3
						
						
						
						
						
						
					 | 
					
						2020-08-03 14:34:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							8727ae913d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-08-03 10:35:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							bd996de410
							
						
					 | 
					
						
						
							
							goeasy
						
						
						
						
						
						
					 | 
					
						2020-08-03 09:05:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c16a85e18
							
						
					 | 
					
						
						
							
							Merge pull request '8.1' (#95) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/95 
						
						
					 | 
					
						2020-08-01 17:18:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ef16728f9
							
						
					 | 
					
						
						
							
							8.1
						
						
						
						
						
						
					 | 
					
						2020-08-01 17:17:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							680fa48e85
							
						
					 | 
					
						
						
							
							Merge pull request 'comment 8.1' (#94) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/94 
						
						
					 | 
					
						2020-08-01 16:37:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							854976c8f0
							
						
					 | 
					
						
						
							
							comment 8.1
						
						
						
						
						
						
					 | 
					
						2020-08-01 16:36:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							223dd51db7
							
						
					 | 
					
						
						
							
							Merge pull request 'update' (#93) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/93 
						
						
					 | 
					
						2020-08-01 11:20:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b31193750
							
						
					 | 
					
						
						
							
							update
						
						
						
						
						
						
					 | 
					
						2020-08-01 11:16:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							48722ef768
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy
						
						
						
						
						
						
					 | 
					
						2020-07-31 21:49:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ff7c6b358d
							
						
					 | 
					
						
						
							
							order comment 7.31
						
						
						
						
						
						
					 | 
					
						2020-07-31 21:47:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f30c4f4922
							
						
					 | 
					
						
						
							
							gdpaoup
						
						
						
						
						
						
					 | 
					
						2020-07-31 10:07:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea10c99cd1
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-07-31 09:59:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							2ec14481fd
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-31 09:40:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							b9b8384011
							
						
					 | 
					
						
						
							
							修正错误
						
						
						
						
						
						
					 | 
					
						2020-07-31 09:40:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							d817d0c28b
							
						
					 | 
					
						
						
							
							gyh change
						
						
						
						
						
						
					 | 
					
						2020-07-31 08:45:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6d00107944
							
						
					 | 
					
						
						
							
							adv 7.30
						
						
						
						
						
						
					 | 
					
						2020-07-30 20:33:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							120e062fcd
							
						
					 | 
					
						
						
							
							send wash 7.29
						
						
						
						
						
						
					 | 
					
						2020-07-29 19:01:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							ee08038a64
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-28 20:49:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							41f4050768
							
						
					 | 
					
						
						
							
							直播
						
						
						
						
						
						
					 | 
					
						2020-07-28 20:47:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b12a3c1722
							
						
					 | 
					
						
						
							
							send 7.28
						
						
						
						
						
						
					 | 
					
						2020-07-28 20:47:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							4004f3715b
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-27 18:02:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6eabd3a575
							
						
					 | 
					
						
						
							
							loadmore 7.27
						
						
						
						
						
						
					 | 
					
						2020-07-27 17:59:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							2ea9b89acc
							
						
					 | 
					
						
						
							
							直播
						
						
						
						
						
						
					 | 
					
						2020-07-27 17:32:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							b2d284f666
							
						
					 | 
					
						
						
							
							直播列表
						
						
						
						
						
						
					 | 
					
						2020-07-27 14:35:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c931e87209
							
						
					 | 
					
						
						
							
							order 7.25
						
						
						
						
						
						
					 | 
					
						2020-07-25 15:17:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5abb3f2496
							
						
					 | 
					
						
						
							
							comment 7.24
						
						
						
						
						
						
					 | 
					
						2020-07-24 20:35:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dd71a0f32a
							
						
					 | 
					
						
						
							
							comment 7.2
						
						
						
						
						
						
					 | 
					
						2020-07-24 19:48:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							59362ebc7c
							
						
					 | 
					
						
						
							
							loadmore 7.23
						
						
						
						
						
						
					 | 
					
						2020-07-23 20:58:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be9f2ec1c7
							
						
					 | 
					
						
						
							
							order 7.23
						
						
						
						
						
						
					 | 
					
						2020-07-23 14:56:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							818d388f31
							
						
					 | 
					
						
						
							
							order 7.22
						
						
						
						
						
						
					 | 
					
						2020-07-22 18:51:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							03d10b1749
							
						
					 | 
					
						
						
							
							Merge branch 'master' into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-21 21:03:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c89099f686
							
						
					 | 
					
						
						
							
							order
						
						
						
						
						
						
					 | 
					
						2020-07-21 21:02:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							78769b8583
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-20 17:30:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							864f43e200
							
						
					 | 
					
						
						
							
							Merge pull request 'update coupon height' (#73) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/73 
						
						
					 | 
					
						2020-07-20 17:29:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							86686ef1a6
							
						
					 | 
					
						
						
							
							update coupon height
						
						
						
						
						
						
					 | 
					
						2020-07-20 17:28:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e6ddb3c5df
							
						
					 | 
					
						
						
							
							Merge pull request 'v' (#72) from zmr into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/72 
						
						
					 | 
					
						2020-07-20 17:22:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a6e1241238
							
						
					 | 
					
						
						
							
							group order
						
						
						
						
						
						
					 | 
					
						2020-07-20 17:17:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a62b100fb
							
						
					 | 
					
						
						
							
							v
						
						
						
						
						
						
					 | 
					
						2020-07-20 17:14:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							ef7c81201b
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-20 08:45:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							4c70db7575
							
						
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2020-07-20 08:43:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							687387861f
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
						
						
						
						
						
						
					 | 
					
						2020-07-18 19:53:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							30b99968db
							
						
					 | 
					
						
						
							
							tian jia guan zhu
						
						
						
						
						
						
					 | 
					
						2020-07-18 19:52:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5c9bdcd0f3
							
						
					 | 
					
						
						
							
							完善问题
						
						
						
						
						
						
					 | 
					
						2020-07-18 17:43:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							edd71ab1a4
							
						
					 | 
					
						
						
							
							添加冒泡事件
						
						
						
						
						
						
					 | 
					
						2020-07-18 16:01:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							e34c74c303
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
						
						
						
						
						
						
					 | 
					
						2020-07-18 14:06:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							c90b2c3912
							
						
					 | 
					
						
						
							
							v
						
						
						
						
						
						
					 | 
					
						2020-07-18 14:05:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7b9479d56c
							
						
					 | 
					
						
						
							
							coupon
						
						
						
						
						
						
					 | 
					
						2020-07-17 17:34:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5a4e302899
							
						
					 | 
					
						
						
							
							Merge pull request 'zmr' (#66) from zmr into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/66 
						
						
					 | 
					
						2020-07-17 08:42:58 +08:00 | 
					
					
						
						
							
							
							
						
					 |