| 
						
					 | 
					
						
						
						
						
							
						
						
							dd71a0f32a
							
						
					 | 
					
						
						
							
							comment 7.2
						
						
						
						
						
						
					 | 
					
						2020-07-24 19:48:57 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							063da7bef3
							
						
					 | 
					
						
						
							
							商家部分
						
						
						
						
						
						
					 | 
					
						2020-07-21 21:01:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							78769b8583
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-20 17:30:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a6e1241238
							
						
					 | 
					
						
						
							
							group order
						
						
						
						
						
						
					 | 
					
						2020-07-20 17:17:41 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							113144b716
							
						
					 | 
					
						
						
							
							添加了获取直播列表的接口
						
						
						
						
						
						
					 | 
					
						2020-07-18 16:10:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							58dc04fc4d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-18 11:44:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							82d387a000
							
						
					 | 
					
						
						
							
							商品搜索
						
						
						
						
						
						
					 | 
					
						2020-07-18 11:44:05 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b250d05adf
							
						
					 | 
					
						
						
							
							7.16
						
						
						
						
						
						
					 | 
					
						2020-07-16 17:39:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							d66aab7beb
							
						
					 | 
					
						
						
							
							vuex
						
						
						
						
						
						
					 | 
					
						2020-07-16 08:43:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							b04b2ffd16
							
						
					 | 
					
						
						
							
							vuex
						
						
						
						
						
						
					 | 
					
						2020-07-15 16:52:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							46da0894b4
							
						
					 | 
					
						
						
							
							vuex
						
						
						
						
						
						
					 | 
					
						2020-07-15 16:46:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cc9fb2b48b
							
						
					 | 
					
						
						
							
							7.15
						
						
						
						
						
						
					 | 
					
						2020-07-15 16:21:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							f662e813a7
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
						
						
						
						
						
						
					 | 
					
						2020-07-15 16:04:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							69a4517bb5
							
						
					 | 
					
						
						
							
							null
						
						
						
						
						
						
					 | 
					
						2020-07-15 16:04:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ab7d33643
							
						
					 | 
					
						
						
							
							7.14
						
						
						
						
						
						
					 | 
					
						2020-07-14 17:43:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b83b375945
							
						
					 | 
					
						
						
							
							retrieve file
						
						
						
						
						
						
					 | 
					
						2020-07-14 10:13:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							700ae94f79
							
						
					 | 
					
						
						
							
							order
						
						
						
						
						
						
					 | 
					
						2020-07-14 09:15:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e4b4eef18
							
						
					 | 
					
						
						
							
							v
						
						
						
						
						
						
					 | 
					
						2020-07-13 08:39:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							2479d587cd
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
						
						
						
						
						
						
					 | 
					
						2020-07-11 15:42:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7cff88b5d6
							
						
					 | 
					
						
						
							
							order
						
						
						
						
						
						
					 | 
					
						2020-07-10 17:38:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a5b83f31a8
							
						
					 | 
					
						
						
							
							upload file
						
						
						
						
						
						
					 | 
					
						2020-07-10 09:03:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							699b94e472
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr
						
						
						
						
						
						
					 | 
					
						2020-07-09 16:35:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zmr900709
							
						 
					 | 
					
						
						
						
						
							
						
						
							10bbccc2bd
							
						
					 | 
					
						
						
							
							v
						
						
						
						
						
						
					 | 
					
						2020-07-09 16:35:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9ffdfa652a
							
						
					 | 
					
						
						
							
							api
						
						
						
						
						
						
					 | 
					
						2020-07-08 18:14:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5ede514a02
							
						
					 | 
					
						
						
							
							api
						
						
						
						
						
						
					 | 
					
						2020-07-07 17:47:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							a127f08375
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-07 14:46:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							2910af7bd7
							
						
					 | 
					
						
						
							
							商品详情
						
						
						
						
						
						
					 | 
					
						2020-07-07 14:45:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8dc45b57fd
							
						
					 | 
					
						
						
							
							api
						
						
						
						
						
						
					 | 
					
						2020-07-06 17:32:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8060a433b3
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy
						
						
						
						
						
						
					 | 
					
						2020-07-06 09:20:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							40f03de79f
							
						
					 | 
					
						
						
							
							商家首页
						
						
						
						
						
						
					 | 
					
						2020-07-06 09:10:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f27d08c224
							
						
					 | 
					
						
						
							
							api
						
						
						
						
						
						
					 | 
					
						2020-07-03 17:44:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							19b1dad0a8
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
						
						
						
						
						
						
					 | 
					
						2020-07-03 09:10:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8e7da400ac
							
						
					 | 
					
						
						
							
							api
						
						
						
						
						
						
					 | 
					
						2020-07-03 09:08:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
							
								
									
								
							
						
						
						
							
						
						
							5a99dfc2c9
							
						
					 | 
					
						
						
							
							商城首页接口
						
						
						
						
						
						
					 | 
					
						2020-07-02 15:39:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dc72f79ee8
							
						
					 | 
					
						
						
							
							api
						
						
						
						
						
						
					 | 
					
						2020-07-01 17:32:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dc69746320
							
						
					 | 
					
						
						
							
							api
						
						
						
						
						
						
					 | 
					
						2020-06-30 18:06:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dce6d3a1b8
							
						
					 | 
					
						
						
							
							update api
						
						
						
						
						
						
					 | 
					
						2020-06-29 17:24:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							905022e6e4
							
						
					 | 
					
						
						
							
							update api
						
						
						
						
						
						
					 | 
					
						2020-06-29 08:47:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							28e80b49ff
							
						
					 | 
					
						
						
							
							6.24
						
						
						
						
						
						
					 | 
					
						2020-06-24 16:39:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8c993da2cd
							
						
					 | 
					
						
						
							
							address api
						
						
						
						
						
						
					 | 
					
						2020-06-23 17:21:01 +08:00 | 
					
					
						
						
							
							
							
						
					 |