mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							81ab58e009
							
						
					 | 
					
						
						
							
							店铺入驻bug修改
						
						
						
						
						
						
					 | 
					
						2021-08-11 22:13:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							a42a7515dc
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-11 21:41:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							2dabff65ed
							
						
					 | 
					
						
						
							
							店铺入驻没有回显问题
						
						
						
						
						
						
					 | 
					
						2021-08-11 21:41:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							71d8fbd5fe
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-11 21:32:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							7763abd591
							
						
					 | 
					
						
						
							
							拼团活动相关校验
						
						
						
						
						
						
					 | 
					
						2021-08-11 21:32:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							6bbba6bd35
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-11 21:18:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7ce4e72c6
							
						
					 | 
					
						
						
							
							店铺入驻bug修改,订单详情添加修改金额展示
						
						
						
						
						
						
					 | 
					
						2021-08-11 21:18:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e365c27b5
							
						
					 | 
					
						
						
							
							新增充值取消状态
						
						
						
						
						
						
					 | 
					
						2021-08-11 19:28:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							4557b1d5c1
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-11 18:48:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9163e4247
							
						
					 | 
					
						
						
							
							管理、商家,添加删除秒杀商品接口,管理端切换账号菜单权限不生效问题,代码优化
						
						
						
						
						
						
					 | 
					
						2021-08-11 18:47:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							328bceec2c
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-08-11 18:12:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							82bb5577b2
							
						
					 | 
					
						
						
							
							修改统计错误信息
						
						
						
						
						
						
					 | 
					
						2021-08-11 18:12:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e505a8a4e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-11 14:56:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc80242896
							
						
					 | 
					
						
						
							
							pc端添加2个轮播代码,楼层装修跟pc端样式不一致,楼层装修无法添加的bug修改
						
						
						
						
						
						
					 | 
					
						2021-08-11 14:56:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							e521e723d5
							
						
					 | 
					
						
						
							
							修改移动端楼层装修bug
						
						
						
						
						
						
					 | 
					
						2021-08-11 11:57:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							9213aed8e0
							
						
					 | 
					
						
						
							
							修改部分移动端楼层装修bug
						
						
						
						
						
						
					 | 
					
						2021-08-11 10:19:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							d104baf426
							
						
					 | 
					
						
						
							
							管理端,装修页面添加两种新轮播
						
						
						
						
						
						
					 | 
					
						2021-08-10 18:01:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							b89fb8b2ba
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-10 17:39:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb8ea94850
							
						
					 | 
					
						
						
							
							pc收藏店铺字段变更,添加修改秒杀页面
						
						
						
						
						
						
					 | 
					
						2021-08-10 17:39:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							783c6df0a4
							
						
					 | 
					
						
						
							
							修改统计上店铺不加载bug 修改统计图antV加载数据不齐全bug
						
						
						
						
						
						
					 | 
					
						2021-08-10 16:50:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							06a6b77d2e
							
						
					 | 
					
						
						
							
							pull最新代码 修改店铺简介的富文本框
						
						
						
						
						
						
					 | 
					
						2021-08-10 16:30:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							924de43227
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/pages/payment/thirdPay.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:11:21 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							0597531c72
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/pages/forgetPassword.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:11:11 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							07e75f71cc
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/pages/couponCenter.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:11:04 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9d42755ef
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/components/nav/cateNav.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:10:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e45c45688
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/components/indexDecorate/modelList/seckill.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:09:05 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							75fd42e152
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/components/indexDecorate/modelList/recommend.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:08:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							97bc68ad26
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/components/indexDecorate/modelList/notEnough.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:08:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							05a25bd80f
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/components/indexDecorate/modelList/newGoodsSort.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:08:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffde03bc21
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:08:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d42bce536
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/components/indexDecorate/modelList/carousel.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:08:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf2eb82728
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/components/indexDecorate/modelFormItem.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:07:02 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							a62530d7b8
							
						
					 | 
					
						
						
							
							删除文件 buyer/src/components/indexDecorate/modelForm.vue
						
						
						
						
						
						
					 | 
					
						2021-08-10 08:06:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e1fa0b937
							
						
					 | 
					
						
						
							
							修改秒杀页面展示名
						
						
						
						
						
						
					 | 
					
						2021-08-10 11:53:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							604a918fd1
							
						
					 | 
					
						
						
							
							商家端代码优化
						
						
						
						
						
						
					 | 
					
						2021-08-10 10:17:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f02b45600
							
						
					 | 
					
						
						
							
							管理端代码优化
						
						
						
						
						
						
					 | 
					
						2021-08-10 09:59:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebb048f1a7
							
						
					 | 
					
						
						
							
							修改付款日志订单创建时间
						
						
						
						
						
						
					 | 
					
						2021-08-09 11:57:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							c58d70524d
							
						
					 | 
					
						
						
							
							更改seller上面之前配置出错的问题
						
						
						
						
						
						
					 | 
					
						2021-08-09 11:11:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							86fed0db41
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-06 19:19:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cbca93d3d
							
						
					 | 
					
						
						
							
							积分字段修改
						
						
						
						
						
						
					 | 
					
						2021-08-06 19:18:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1f846a633
							
						
					 | 
					
						
						
							
							修改虚拟订单不能时间筛选问题
						
						
						
						
						
						
					 | 
					
						2021-08-06 17:34:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a43087ae0
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-08-06 17:17:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							f281f8e65a
							
						
					 | 
					
						
						
							
							修改售后原因bug
						
						
						
						
						
						
					 | 
					
						2021-08-06 17:17:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d26bf08b2
							
						
					 | 
					
						
						
							
							修改提示信息
						
						
						
						
						
						
					 | 
					
						2021-08-06 16:13:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							146854b098
							
						
					 | 
					
						
						
							
							导出订单默认导出一万条,优化代码
						
						
						
						
						
						
					 | 
					
						2021-08-06 16:12:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cfbfdf67c
							
						
					 | 
					
						
						
							
							修改上传图片大小限制,最大1M
						
						
						
						
						
						
					 | 
					
						2021-08-06 15:35:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							00a64c4d2a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-06 14:12:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba7e711a88
							
						
					 | 
					
						
						
							
							删除无用字段
						
						
						
						
						
						
					 | 
					
						2021-08-06 14:12:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							10dcf4473c
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-08-06 11:59:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c217b85e9
							
						
					 | 
					
						
						
							
							优化菜单设置权限功能,懒人版一件选中权限
						
						
						
						
						
						
					 | 
					
						2021-08-06 11:58:53 +08:00 | 
					
					
						
						
							
							
							
						
					 |