mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							cfc5c94f5a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-13 10:38:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6588af790
							
						
					 | 
					
						
						
							
							积分扣减展示问题,pc商品详情图片不展示问题,pc楼层装修提示修改,代码优化
						
						
						
						
						
						
					 | 
					
						2021-08-13 10:38:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b81a70808
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-08-13 09:19:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb50143ec2
							
						
					 | 
					
						
						
							
							新增app版本描述
						
						
						
						
						
						
					 | 
					
						2021-08-13 09:18:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							736c5ecd2c
							
						
					 | 
					
						
						
							
							结算单添加砍价,积分商品金额
						
						
						
						
						
						
					 | 
					
						2021-08-12 18:39:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							e88c75d0b7
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-12 17:42:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							a849d8906a
							
						
					 | 
					
						
						
							
							投诉详情取消投诉规则改变,商品分类2级分类没有图片
						
						
						
						
						
						
					 | 
					
						2021-08-12 17:42:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d2448ebba
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
						
						# Conflicts:
#	seller/src/views/promotion/seckill/seckill.vue 
						
						
					 | 
					
						2021-08-12 17:12:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b0a089e29
							
						
					 | 
					
						
						
							
							选择品牌,品牌绑定时候可以搜索
						
						
						
						
						
						
					 | 
					
						2021-08-12 16:41:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							682bd13b6e
							
						
					 | 
					
						
						
							
							add elasticsearch progress
						
						
						
						
						
						
					 | 
					
						2021-08-12 02:17:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e27a2fb85
							
						
					 | 
					
						
						
							
							好评率展示问题,申请售后图片变形,清除足迹不刷新列表,结算单筛选条件展示错误,店铺审核按钮调整到详情
						
						
						
						
						
						
					 | 
					
						2021-08-12 01:03:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							81ab58e009
							
						
					 | 
					
						
						
							
							店铺入驻bug修改
						
						
						
						
						
						
					 | 
					
						2021-08-11 22:13:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7ce4e72c6
							
						
					 | 
					
						
						
							
							店铺入驻bug修改,订单详情添加修改金额展示
						
						
						
						
						
						
					 | 
					
						2021-08-11 21:18:22 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e1fa0b937
							
						
					 | 
					
						
						
							
							修改秒杀页面展示名
						
						
						
						
						
						
					 | 
					
						2021-08-10 11:53:28 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							c75bd5208b
							
						
					 | 
					
						
						
							
							买家端商品分类,导航加载报错问题,商家端跳转买家端商品地址代码优化,文件上传地址调用位置修改
						
						
						
						
						
						
					 | 
					
						2021-08-06 11:32:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6874acb1b
							
						
					 | 
					
						
						
							
							pc端修改我的优惠券bug,样式,管理端删除添加秒杀活动功能
						
						
						
						
						
						
					 | 
					
						2021-08-05 18:07:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffeef640da
							
						
					 | 
					
						
						
							
							店铺列表,搜索项,店铺状态字段错误
						
						
						
						
						
						
					 | 
					
						2021-08-05 17:35:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f054b796d
							
						
					 | 
					
						
						
							
							积分商品流程完成,billpirce改为flowprice,必填项提示错误
						
						
						
						
						
						
					 | 
					
						2021-08-05 17:10:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							35881e30e0
							
						
					 | 
					
						
						
							
							积分商品,搜索热词为null问题
						
						
						
						
						
						
					 | 
					
						2021-08-05 11:19:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8e55d230a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-04 19:08:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							083576ab3f
							
						
					 | 
					
						
						
							
							更改微信提现状态
						
						
						
						
						
						
					 | 
					
						2021-08-04 19:08:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							0387ac510a
							
						
					 | 
					
						
						
							
							管理端和商家端userInfo字段名变更,管理端会员详情,他的积分字段调整
						
						
						
						
						
						
					 | 
					
						2021-08-04 17:51:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							726ae1f856
							
						
					 | 
					
						
						
							
							1. 第一次进入商品列表,商品分类未展示
						
						
						
						
						
						
						
						2. 链接选择器,店铺开启状态展示错误
3. 从新装修楼层,楼层bug修改
4. 搜索热词为空是返回null,导致报错
5. 首页全部商品分类缓存问题
6. 修改菜单项缓存、添加设置
7. 店铺分类二级分类修改时无父级分类 
						
						
					 | 
					
						2021-08-04 17:07:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							483d8c3aef
							
						
					 | 
					
						
						
							
							链接选择器,店铺开启状态展示错误
						
						
						
						
						
						
					 | 
					
						2021-08-03 18:12:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							db42d19f44
							
						
					 | 
					
						
						
							
							买家端订单详情添加操作,商品选择器,categoryId传参错误
						
						
						
						
						
						
					 | 
					
						2021-08-03 18:08:18 +08:00 | 
					
					
						
						
							
							
							
						
					 |