| 
						
					 | 
					
						
						
						
						
							
						
						
							421112db2e
							
						
					 | 
					
						
						
							
							消息物流跳转
						
						
						
						
						
						
					 | 
					
						2020-08-20 16:18:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							91a655e224
							
						
					 | 
					
						
						
							
							消息物流跳转
						
						
						
						
						
						
					 | 
					
						2020-08-20 16:16:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9eaf84d496
							
						
					 | 
					
						
						
							
							Merge pull request 'fixing bung' (#264) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/264 
						
						
					 | 
					
						2020-08-20 14:47:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dbbd64269f
							
						
					 | 
					
						
						
							
							fixing bung
						
						
						
						
						
						
					 | 
					
						2020-08-20 14:46:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dd3d3c17c4
							
						
					 | 
					
						
						
							
							Merge pull request 'zmr' (#263) from zmr into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/263 
						
						
					 | 
					
						2020-08-20 14:30:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							78169d8cde
							
						
					 | 
					
						
						
							
							解决样式问题
						
						
						
						
						
						
					 | 
					
						2020-08-20 14:24:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f0d1063f0
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
						
						
						
						
						
						
					 | 
					
						2020-08-20 14:23:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							c81ee7e961
							
						
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2020-08-20 14:23:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6864f22576
							
						
					 | 
					
						
						
							
							Merge pull request '首页拼团商品显示不全' (#262) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/262 
						
						
					 | 
					
						2020-08-20 12:05:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a91fa4708b
							
						
					 | 
					
						
						
							
							首页拼团商品显示不全
						
						
						
						
						
						
					 | 
					
						2020-08-20 12:05:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bfffb44fe2
							
						
					 | 
					
						
						
							
							Merge pull request 'zhy' (#261) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/261 
						
						
					 | 
					
						2020-08-20 11:43:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							16c2c1fa71
							
						
					 | 
					
						
						
							
							使用优惠券价格
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:42:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4c8e2ba4b6
							
						
					 | 
					
						
						
							
							使用优惠券价格
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:41:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							96d7ad439a
							
						
					 | 
					
						
						
							
							Merge pull request '优惠券列表显示,使用优惠券价格计算' (#259) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/259 
						
						
					 | 
					
						2020-08-20 11:29:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							390bda7c0e
							
						
					 | 
					
						
						
							
							优惠券列表显示,使用优惠券价格计算
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:28:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0ae19c2ddf
							
						
					 | 
					
						
						
							
							Merge pull request 'touxiang' (#258) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/258 
						
						
					 | 
					
						2020-08-20 11:27:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							26cb84748a
							
						
					 | 
					
						
						
							
							touxiang
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:26:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c6cd88dc48
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#257) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/257 
						
						
					 | 
					
						2020-08-20 11:10:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							a34880e6a6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:09:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							3d840a0546
							
						
					 | 
					
						
						
							
							修复了交易物流
						
						
						
						
						
						
					 | 
					
						2020-08-20 10:54:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							30539ddf64
							
						
					 | 
					
						
						
							
							Merge pull request '新人优惠券显示问题,使用优惠券价格问题' (#256) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/256 
						
						
					 | 
					
						2020-08-20 10:26:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							51823edb12
							
						
					 | 
					
						
						
							
							新人优惠券显示问题,使用优惠券价格问题
						
						
						
						
						
						
					 | 
					
						2020-08-20 10:25:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							e58f571de4
							
						
					 | 
					
						
						
							
							直播添加了下拉刷新
						
						
						
						
						
						
					 | 
					
						2020-08-20 10:16:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c4821f888f
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#255) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/255 
						
						
					 | 
					
						2020-08-19 19:25:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							69760e6377
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-19 19:24:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |