| 
						
					 | 
					
						
						
						
						
							
						
						
							ac1e99a54d
							
						
					 | 
					
						
						
							
							Merge pull request '达人申请label宽度' (#329) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/329 
						
						
					 | 
					
						2020-09-03 14:34:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							41a80b2680
							
						
					 | 
					
						
						
							
							达人申请label宽度
						
						
						
						
						
						
					 | 
					
						2020-09-03 14:33:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							85fce676e5
							
						
					 | 
					
						
						
							
							Merge pull request '修复了返回播放' (#328) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/328 
						
						
					 | 
					
						2020-09-03 11:57:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							e7a2a716b4
							
						
					 | 
					
						
						
							
							修复了返回播放
						
						
						
						
						
						
					 | 
					
						2020-09-03 11:57:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7e9791ef18
							
						
					 | 
					
						
						
							
							Merge pull request '修复了返回黑屏' (#327) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/327 
						
						
					 | 
					
						2020-09-03 11:45:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							314508e652
							
						
					 | 
					
						
						
							
							修复了返回黑屏
						
						
						
						
						
						
					 | 
					
						2020-09-03 11:32:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1b387df66e
							
						
					 | 
					
						
						
							
							Merge pull request '添加达人申请' (#326) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/326 
						
						
					 | 
					
						2020-09-03 11:14:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cfda1f7aae
							
						
					 | 
					
						
						
							
							添加达人申请
						
						
						
						
						
						
					 | 
					
						2020-09-03 11:12:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							379100a097
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#325) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/325 
						
						
					 | 
					
						2020-09-03 09:53:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							adc18d80cf
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-09-03 09:50:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2da546f193
							
						
					 | 
					
						
						
							
							Merge pull request '修改自提bug' (#324) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/324 
						
						
					 | 
					
						2020-09-02 15:33:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bc9290e13c
							
						
					 | 
					
						
						
							
							修改自提bug
						
						
						
						
						
						
					 | 
					
						2020-09-02 15:32:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c4f23cc5c4
							
						
					 | 
					
						
						
							
							Merge pull request 'zhy' (#323) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/323 
						
						
					 | 
					
						2020-09-02 08:59:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4911a0c948
							
						
					 | 
					
						
						
							
							调整会员服务样式
						
						
						
						
						
						
					 | 
					
						2020-09-02 08:55:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6302677c65
							
						
					 | 
					
						
						
							
							调整会员服务样式
						
						
						
						
						
						
					 | 
					
						2020-09-02 08:55:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8ec27b1598
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#322) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/322 
						
						
					 | 
					
						2020-09-01 20:31:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							2446f851c7
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-09-01 20:30:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4fa530d2d6
							
						
					 | 
					
						
						
							
							Merge pull request 'fixing bug' (#321) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/321 
						
						
					 | 
					
						2020-09-01 18:08:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0f55428656
							
						
					 | 
					
						
						
							
							fixing bug
						
						
						
						
						
						
					 | 
					
						2020-09-01 18:07:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db55c8d892
							
						
					 | 
					
						
						
							
							Merge pull request '消息物流添加联系骑手' (#320) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/320 
						
						
					 | 
					
						2020-09-01 17:43:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8259883119
							
						
					 | 
					
						
						
							
							消息物流添加联系骑手
						
						
						
						
						
						
					 | 
					
						2020-09-01 17:42:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							20d20e12d1
							
						
					 | 
					
						
						
							
							Merge pull request '添加字体换行' (#319) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/319 
						
						
					 | 
					
						2020-09-01 17:33:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							e54282b839
							
						
					 | 
					
						
						
							
							添加点击调用接口
						
						
						
						
						
						
					 | 
					
						2020-09-01 17:33:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							69c56b4772
							
						
					 | 
					
						
						
							
							添加字体换行
						
						
						
						
						
						
					 | 
					
						2020-09-01 16:53:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							edc1d0c160
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#318) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/318 
						
						
					 | 
					
						2020-09-01 16:08:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							bc4d6bb117
							
						
					 | 
					
						
						
							
							Merge branch 'xbx' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-09-01 16:07:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							5e140e4143
							
						
					 | 
					
						
						
							
							更改了提示
						
						
						
						
						
						
					 | 
					
						2020-09-01 16:07:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8ed1ae0020
							
						
					 | 
					
						
						
							
							Merge pull request '添加了提示' (#317) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/317 
						
						
					 | 
					
						2020-09-01 16:07:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db13a1882d
							
						
					 | 
					
						
						
							
							Merge branch 'master' into xbx
						
						
						
						
						
						
					 | 
					
						2020-09-01 16:07:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							f4ba8edec2
							
						
					 | 
					
						
						
							
							添加了提示
						
						
						
						
						
						
					 | 
					
						2020-09-01 15:55:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8f400e2524
							
						
					 | 
					
						
						
							
							Merge pull request '新增自提显示' (#316) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/316 
						
						
					 | 
					
						2020-09-01 15:02:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							56cdbfbf5d
							
						
					 | 
					
						
						
							
							新增自提显示
						
						
						
						
						
						
					 | 
					
						2020-09-01 15:00:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e608eb2a89
							
						
					 | 
					
						
						
							
							Merge pull request '新增自提' (#315) from zhy into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/315 
						
						
					 | 
					
						2020-09-01 10:47:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							96e16c7af2
							
						
					 | 
					
						
						
							
							新增自提
						
						
						
						
						
						
					 | 
					
						2020-09-01 10:47:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							038eb466a2
							
						
					 | 
					
						
						
							
							新增自提
						
						
						
						
						
						
					 | 
					
						2020-09-01 10:43:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							89cf7b96db
							
						
					 | 
					
						
						
							
							新增自提
						
						
						
						
						
						
					 | 
					
						2020-09-01 10:39:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ee4f43f05
							
						
					 | 
					
						
						
							
							Merge pull request '修改了字体和编剧' (#314) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/314 
						
						
					 | 
					
						2020-09-01 10:35:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							ccca4992ab
							
						
					 | 
					
						
						
							
							修改了字体和编剧
						
						
						
						
						
						
					 | 
					
						2020-09-01 10:34:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							704fb038df
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#313) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/313 
						
						
					 | 
					
						2020-09-01 08:40:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1fad28b7b0
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-09-01 08:39:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							840ba58aa6
							
						
					 | 
					
						
						
							
							Merge pull request '调试完成' (#311) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/311 
						
						
					 | 
					
						2020-08-31 17:04:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							6039328f54
							
						
					 | 
					
						
						
							
							添加了销量
						
						
						
						
						
						
					 | 
					
						2020-08-31 17:04:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0de127d351
							
						
					 | 
					
						
						
							
							Merge pull request 'gdpao' (#312) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/312 
						
						
					 | 
					
						2020-08-31 16:33:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1b4298721
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-31 16:31:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							e98ad66060
							
						
					 | 
					
						
						
							
							调试完成
						
						
						
						
						
						
					 | 
					
						2020-08-31 15:37:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2d8e738164
							
						
					 | 
					
						
						
							
							Merge pull request 'gyh' (#310) from gyh into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/310 
						
						
					 | 
					
						2020-08-31 10:15:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee3ba5b0dc
							
						
					 | 
					
						
						
							
							gdpasomg
						
						
						
						
						
						
					 | 
					
						2020-08-31 09:10:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gdpao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8937a31684
							
						
					 | 
					
						
						
							
							gdpao
						
						
						
						
						
						
					 | 
					
						2020-08-31 09:07:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							993e1bc647
							
						
					 | 
					
						
						
							
							Merge pull request 'xbx' (#309) from xbx into master
						
						
						
						
						
						
						
						Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/309 
						
						
					 | 
					
						2020-08-29 00:14:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							97c9774cc4
							
						
					 | 
					
						
						
							
							添加了 分类的搜索
						
						
						
						
						
						
					 | 
					
						2020-08-28 23:11:12 +08:00 | 
					
					
						
						
							
							
							
						
					 |