| 
						
					 | 
					
						
						
						
						
							
						
						
							711eeadc28
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#237) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/237 
						
						
					 | 
					
						2020-08-18 15:11:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							8286dbfa58
							
						
					 | 
					
						
						
							
							替换url
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:10:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							cb95d1ead1
							
						
					 | 
					
						
						
							
							链接登录退出
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:08:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f577de11f1
							
						
					 | 
					
						
						
							
							Merge pull request '写死首页拼团推荐的头像' (#236) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/236 
						
						
					 | 
					
						2020-08-18 12:12:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							689aecc572
							
						
					 | 
					
						
						
							
							写死首页拼团推荐的头像
						
						
						
						
						
						
					 | 
					
						2020-08-18 12:12:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8ba87795b3
							
						
					 | 
					
						
						
							
							Merge pull request 'zmr' (#235) from zmr into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/235 
						
						
					 | 
					
						2020-08-18 12:04:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							e51675d2e7
							
						
					 | 
					
						
						
							
							修改活动样式
						
						
						
						
						
						
					 | 
					
						2020-08-18 12:02:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							43e09e977d
							
						
					 | 
					
						
						
							
							修复
						
						
						
						
						
						
					 | 
					
						2020-08-18 11:40:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							91927fdc57
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
						
						
						
						
						
						
					 | 
					
						2020-08-18 11:35:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f83aeec8e
							
						
					 | 
					
						
						
							
							修改活动样式
						
						
						
						
						
						
					 | 
					
						2020-08-18 11:28:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d5202c02cc
							
						
					 | 
					
						
						
							
							Merge pull request 'fixing bug' (#234) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/234 
						
						
					 | 
					
						2020-08-18 11:15:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							631e8ae3e6
							
						
					 | 
					
						
						
							
							fixing bug
						
						
						
						
						
						
					 | 
					
						2020-08-18 11:14:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2b740c207
							
						
					 | 
					
						
						
							
							修改活动列表页样式
						
						
						
						
						
						
					 | 
					
						2020-08-18 11:06:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7191b29b44
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#233) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/233 
						
						
					 | 
					
						2020-08-18 11:03:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							50c790c7fc
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-18 11:02:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec8831152e
							
						
					 | 
					
						
						
							
							Merge pull request 'fixing bug' (#232) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/232 
						
						
					 | 
					
						2020-08-18 11:02:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f5c2d1fc9
							
						
					 | 
					
						
						
							
							fixing bug
						
						
						
						
						
						
					 | 
					
						2020-08-18 11:01:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							9f17c5478c
							
						
					 | 
					
						
						
							
							提交
						
						
						
						
						
						
					 | 
					
						2020-08-18 10:43:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							41ea8122e6
							
						
					 | 
					
						
						
							
							Merge pull request '首页拼团推荐样式' (#231) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/231 
						
						
					 | 
					
						2020-08-18 10:39:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							06ee3b9038
							
						
					 | 
					
						
						
							
							首页拼团推荐样式
						
						
						
						
						
						
					 | 
					
						2020-08-18 10:38:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5b763fdb82
							
						
					 | 
					
						
						
							
							Merge pull request '秒杀时间背景色' (#230) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/230 
						
						
					 | 
					
						2020-08-18 10:20:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							31689af773
							
						
					 | 
					
						
						
							
							秒杀时间背景色
						
						
						
						
						
						
					 | 
					
						2020-08-18 10:20:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							caaea4de62
							
						
					 | 
					
						
						
							
							Merge pull request 'store css 8.18' (#229) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/229 
						
						
					 | 
					
						2020-08-18 10:06:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cada935c17
							
						
					 | 
					
						
						
							
							store css 8.18
						
						
						
						
						
						
					 | 
					
						2020-08-18 10:06:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e9a6dcc5b
							
						
					 | 
					
						
						
							
							Merge pull request 'fixing bug 8.18' (#228) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/228 
						
						
					 | 
					
						2020-08-18 08:53:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a702558eac
							
						
					 | 
					
						
						
							
							fixing bug 8.18
						
						
						
						
						
						
					 | 
					
						2020-08-18 08:52:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2a180ba05f
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao2' (#227) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/227 
						
						
					 | 
					
						2020-08-17 20:32:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a5e4b89b2
							
						
					 | 
					
						
						
							
							gdpao2
						
						
						
						
						
						
					 | 
					
						2020-08-17 20:32:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fd31d14881
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpaon' (#226) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/226 
						
						
					 | 
					
						2020-08-17 19:34:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							aae9f78a91
							
						
					 | 
					
						
						
							
							gdpaon
						
						
						
						
						
						
					 | 
					
						2020-08-17 19:33:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							a39aa6e059
							
						
					 | 
					
						
						
							
							文字定位
						
						
						
						
						
						
					 | 
					
						2020-08-17 18:13:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e6f7ebf1b
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#225) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/225 
						
						
					 | 
					
						2020-08-17 18:09:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							35838e3a9e
							
						
					 | 
					
						
						
							
							添加了划线价
						
						
						
						
						
						
					 | 
					
						2020-08-17 18:09:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							d0d034cd7f
							
						
					 | 
					
						
						
							
							直播暂无消息
						
						
						
						
						
						
					 | 
					
						2020-08-17 17:49:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							d8a92db5c2
							
						
					 | 
					
						
						
							
							直播关注
						
						
						
						
						
						
					 | 
					
						2020-08-17 17:30:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							67a8316666
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#224) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/224 
						
						
					 | 
					
						2020-08-17 17:24:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							51d8f6a762
							
						
					 | 
					
						
						
							
							推荐权益
						
						
						
						
						
						
					 | 
					
						2020-08-17 17:23:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f77b4ebc02
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#223) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/223 
						
						
					 | 
					
						2020-08-17 16:58:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1a705e0f8
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-17 16:57:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c14b4338e9
							
						
					 | 
					
						
						
							
							Merge pull request '修复 694' (#222) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/222 
						
						
					 | 
					
						2020-08-17 16:34:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							ec3420a026
							
						
					 | 
					
						
						
							
							替换
						
						
						
						
						
						
					 | 
					
						2020-08-17 16:33:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							aeb62f16ef
							
						
					 | 
					
						
						
							
							修复 694
						
						
						
						
						
						
					 | 
					
						2020-08-17 16:01:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b7c9ec2354
							
						
					 | 
					
						
						
							
							Merge pull request '修复 707' (#221) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/221 
						
						
					 | 
					
						2020-08-17 15:28:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							9160a98de7
							
						
					 | 
					
						
						
							
							修复 707
						
						
						
						
						
						
					 | 
					
						2020-08-17 15:27:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a5962d96df
							
						
					 | 
					
						
						
							
							Merge pull request '新增 701' (#220) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/220 
						
						
					 | 
					
						2020-08-17 15:15:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							e7932d26ce
							
						
					 | 
					
						
						
							
							新增 701
						
						
						
						
						
						
					 | 
					
						2020-08-17 15:14:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8b98de3d8b
							
						
					 | 
					
						
						
							
							Merge pull request 'fix 696' (#219) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/219 
						
						
					 | 
					
						2020-08-17 14:58:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							c33ccebd25
							
						
					 | 
					
						
						
							
							fix 696
						
						
						
						
						
						
					 | 
					
						2020-08-17 14:57:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1af3d1a003
							
						
					 | 
					
						
						
							
							Merge pull request '退款' (#218) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/218 
						
						
					 | 
					
						2020-08-17 12:11:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							fb297a74ce
							
						
					 | 
					
						
						
							
							退款
						
						
						
						
						
						
					 | 
					
						2020-08-17 12:11:38 +08:00 | 
					
					
						
						
							
							
							
						
					 |