| 
						
					 | 
					
						
						
						
						
							
						
						
							080f0c6d86
							
						
					 | 
					
						
						
							
							Merge pull request 'zhy' (#254) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/254 
						
						
					 | 
					
						2020-08-19 18:04:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4e842b127c
							
						
					 | 
					
						
						
							
							fixing bug coupon
						
						
						
						
						
						
					 | 
					
						2020-08-19 18:04:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							627cfc4aa0
							
						
					 | 
					
						
						
							
							优惠券加分页
						
						
						
						
						
						
					 | 
					
						2020-08-19 17:55:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e94eb864f
							
						
					 | 
					
						
						
							
							Merge pull request '调整首页全部拼团样式' (#253) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/253 
						
						
					 | 
					
						2020-08-19 17:28:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							64597b26fa
							
						
					 | 
					
						
						
							
							调整首页全部拼团样式
						
						
						
						
						
						
					 | 
					
						2020-08-19 17:27:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							05b334fdcb
							
						
					 | 
					
						
						
							
							Merge pull request '广告位跳转' (#252) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/252 
						
						
					 | 
					
						2020-08-19 16:59:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dc636e30b7
							
						
					 | 
					
						
						
							
							广告位跳转
						
						
						
						
						
						
					 | 
					
						2020-08-19 16:59:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f9950c4a14
							
						
					 | 
					
						
						
							
							Merge pull request '联系客服拨号,新人优惠券跳转' (#251) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/251 
						
						
					 | 
					
						2020-08-19 15:36:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5dff8c8d96
							
						
					 | 
					
						
						
							
							联系客服拨号,新人优惠券跳转
						
						
						
						
						
						
					 | 
					
						2020-08-19 15:36:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							35da48a87b
							
						
					 | 
					
						
						
							
							Merge pull request '调整个人中心首页,添加物流无信息提示' (#250) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/250 
						
						
					 | 
					
						2020-08-19 15:20:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5dd4023f97
							
						
					 | 
					
						
						
							
							调整个人中心首页,添加物流无信息提示
						
						
						
						
						
						
					 | 
					
						2020-08-19 15:19:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							10957c96d6
							
						
					 | 
					
						
						
							
							Merge pull request 'zhy' (#249) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/249 
						
						
					 | 
					
						2020-08-19 11:22:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							86d765d6ba
							
						
					 | 
					
						
						
							
							order number 8.19
						
						
						
						
						
						
					 | 
					
						2020-08-19 11:21:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bea615253c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy
						
						
						
						
						
						
					 | 
					
						2020-08-19 08:31:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							48f50dbc89
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpaomg' (#248) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/248 
						
						
					 | 
					
						2020-08-18 21:11:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							891f1b4194
							
						
					 | 
					
						
						
							
							gdpaomg
						
						
						
						
						
						
					 | 
					
						2020-08-18 21:11:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb16e774b8
							
						
					 | 
					
						
						
							
							Merge pull request 'zmr' (#247) from zmr into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/247 
						
						
					 | 
					
						2020-08-18 21:10:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							97c95c2024
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
						
						
						
						
						
						
					 | 
					
						2020-08-18 21:03:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							9d8d54cf02
							
						
					 | 
					
						
						
							
							修改活动背景高度
						
						
						
						
						
						
					 | 
					
						2020-08-18 21:03:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							417ec2106e
							
						
					 | 
					
						
						
							
							Merge pull request 'fixing bug' (#246) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/246 
						
						
					 | 
					
						2020-08-18 18:06:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2b1b1f1395
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy
						
						
						
						
						
						
					 | 
					
						2020-08-18 18:05:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							18dd96dec7
							
						
					 | 
					
						
						
							
							fixing bug
						
						
						
						
						
						
					 | 
					
						2020-08-18 18:05:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6dd010fd42
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao;' (#245) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/245 
						
						
					 | 
					
						2020-08-18 17:44:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							41cda556ce
							
						
					 | 
					
						
						
							
							gdpao;
						
						
						
						
						
						
					 | 
					
						2020-08-18 17:43:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6b4bfee380
							
						
					 | 
					
						
						
							
							Merge pull request 'upgrade version 8.18' (#244) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/244 
						
						
					 | 
					
						2020-08-18 17:43:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cb0a6fafa3
							
						
					 | 
					
						
						
							
							upgrade version 8.18
						
						
						
						
						
						
					 | 
					
						2020-08-18 17:42:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fd1801de3d
							
						
					 | 
					
						
						
							
							Merge pull request '背景颜色' (#243) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/243 
						
						
					 | 
					
						2020-08-18 17:06:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							418068102c
							
						
					 | 
					
						
						
							
							背景颜色
						
						
						
						
						
						
					 | 
					
						2020-08-18 17:05:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							72fa854e78
							
						
					 | 
					
						
						
							
							Merge pull request '...' (#242) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/242 
						
						
					 | 
					
						2020-08-18 15:51:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2a382aa0b4
							
						
					 | 
					
						
						
							
							...
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:51:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bb651df8a0
							
						
					 | 
					
						
						
							
							Merge pull request '替换域名' (#241) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/241 
						
						
					 | 
					
						2020-08-18 15:31:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							9c388e898c
							
						
					 | 
					
						
						
							
							替换域名
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:29:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							473b96f552
							
						
					 | 
					
						
						
							
							Merge pull request 'fixing bug' (#240) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/240 
						
						
					 | 
					
						2020-08-18 15:28:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1a2c40955b
							
						
					 | 
					
						
						
							
							fixing bug
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:28:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5291d70c6c
							
						
					 | 
					
						
						
							
							Merge pull request 'paixu' (#239) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/239 
						
						
					 | 
					
						2020-08-18 15:26:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							f98cdd7937
							
						
					 | 
					
						
						
							
							paixu
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:26:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60913ab612
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpaoup' (#238) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/238 
						
						
					 | 
					
						2020-08-18 15:24:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee04a8cb08
							
						
					 | 
					
						
						
							
							gdpaoup
						
						
						
						
						
						
					 | 
					
						2020-08-18 15:24:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |