lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							f63c21b17a
							
						
					 | 
					
						
						
							
							订单详情不加载问题
						
						
						
						
						
						
					 | 
					
						2021-07-29 15:49:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b27278e6e
							
						
					 | 
					
						
						
							
							订单详情 不触发加载问题
						
						
						
						
						
						
					 | 
					
						2021-07-29 15:48:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd0cd14f77
							
						
					 | 
					
						
						
							
							代码注释添加
						
						
						
						
						
						
					 | 
					
						2021-07-28 17:07:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							94a9404b39
							
						
					 | 
					
						
						
							
							结算单添加积分,砍价价格字段
						
						
						
						
						
						
					 | 
					
						2021-07-28 10:56:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							2385bbd912
							
						
					 | 
					
						
						
							
							积分展示问题
						
						
						
						
						
						
					 | 
					
						2021-07-28 09:24:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							327d911f80
							
						
					 | 
					
						
						
							
							买家图片地址问题
						
						
						
						
						
						
					 | 
					
						2021-07-28 09:02:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							83f0f01233
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-07-27 18:13:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							877ccc059e
							
						
					 | 
					
						
						
							
							楼层装修接口多次调用,发票管理状态错误,售后详情打开多个会为空
						
						
						
						
						
						
					 | 
					
						2021-07-27 18:13:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							9313d5a886
							
						
					 | 
					
						
						
							
							新增商品楼层装修模块
						
						
						
						
						
						
					 | 
					
						2021-07-27 18:13:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fb6986a18
							
						
					 | 
					
						
						
							
							菜单管理保存时删除无用字段
						
						
						
						
						
						
					 | 
					
						2021-07-27 16:13:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb4a5e4fdc
							
						
					 | 
					
						
						
							
							管理端注释添加完成
						
						
						
						
						
						
					 | 
					
						2021-07-27 15:59:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							59e1aedbf3
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-07-26 18:12:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							87980277bf
							
						
					 | 
					
						
						
							
							添加注释,删除无用代码,bug修改
						
						
						
						
						
						
					 | 
					
						2021-07-26 18:12:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							30fbe6ca83
							
						
					 | 
					
						
						
							
							no message
						
						
						
						
						
						
					 | 
					
						2021-07-26 16:03:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							31d28627f1
							
						
					 | 
					
						
						
							
							热词功能完善
						
						
						
						
						
						
					 | 
					
						2021-07-26 16:02:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							df9ea021b3
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-07-26 14:47:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							a198fc0161
							
						
					 | 
					
						
						
							
							添加注释,测试功能,选择部门组件报错,会员详情积分字段展示错误,售后原因添加标识判断是新增还是编辑
						
						
						
						
						
						
					 | 
					
						2021-07-26 14:47:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							64bfe1cdc2
							
						
					 | 
					
						
						
							
							!5 提现审核功能
						
						
						
						
						
						
						
						Merge pull request !5 from pipi 
						
						
					 | 
					
						2021-07-26 06:15:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a716fa531
							
						
					 | 
					
						
						
							
							提现申请审核
						
						
						
						
						
						
					 | 
					
						2021-07-24 17:38:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							05b4f67bd3
							
						
					 | 
					
						
						
							
							修复提现记录不展示
						
						
						
						
						
						
					 | 
					
						2021-07-24 11:46:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							9130485631
							
						
					 | 
					
						
						
							
							添加注释,修改分销设置提交方式,左侧菜单无法选中问题
						
						
						
						
						
						
					 | 
					
						2021-07-23 18:05:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae329419a6
							
						
					 | 
					
						
						
							
							页签切换,一级菜单也要选中,报错信息提示多个问题
						
						
						
						
						
						
					 | 
					
						2021-07-23 11:46:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							66462b9085
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-07-22 18:05:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							80d070bb67
							
						
					 | 
					
						
						
							
							管理端售后,添加跳转链接
						
						
						
						
						
						
					 | 
					
						2021-07-22 18:05:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							916dd1a398
							
						
					 | 
					
						
						
							
							合并Master
						
						
						
						
						
						
					 | 
					
						2021-07-22 18:03:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							502c77fb6e
							
						
					 | 
					
						
						
							
							优化角色权限样式
						
						
						
						
						
						
					 | 
					
						2021-07-22 18:02:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f8946f372
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-07-22 14:25:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							abc58298a3
							
						
					 | 
					
						
						
							
							logo替换为本地文件,商品搜索项折叠,售后展示平台退款订单
						
						
						
						
						
						
					 | 
					
						2021-07-22 14:25:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							4809c3839b
							
						
					 | 
					
						
						
							
							修改售后单部分样式以及逻辑
						
						
						
						
						
						
					 | 
					
						2021-07-22 14:23:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fbcdafa9b
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-07-22 09:10:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2180ecaf7
							
						
					 | 
					
						
						
							
							更改退货列表间距
						
						
						
						
						
						
					 | 
					
						2021-07-22 09:10:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							6351bdb633
							
						
					 | 
					
						
						
							
							买家优惠券页面调整,订单导出添加参数,订单详情样式调整
						
						
						
						
						
						
					 | 
					
						2021-07-22 09:01:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							75bff1edc4
							
						
					 | 
					
						
						
							
							会员中心添加首页按钮,pclogo改为阿里云地址,编辑折扣券没有传折扣值,
						
						
						
						
						
						
					 | 
					
						2021-07-21 15:27:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f512caa81d
							
						
					 | 
					
						
						
							
							添加自定义分词管理
						
						
						
						
						
						
					 | 
					
						2021-07-21 08:00:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3178eb7d0
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-07-20 18:03:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							562679b366
							
						
					 | 
					
						
						
							
							新增楼层装修砍价的编辑
						
						
						
						
						
						
					 | 
					
						2021-07-20 18:02:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							eee0258061
							
						
					 | 
					
						
						
							
							物流公司切换禁用无效问题,pc退货添加物流信息回填,保存发票回显错误
						
						
						
						
						
						
					 | 
					
						2021-07-20 18:00:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a248d89d5
							
						
					 | 
					
						
						
							
							物流公司switch切换无效,代码注释添加
						
						
						
						
						
						
					 | 
					
						2021-07-20 14:06:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							5062cad2b0
							
						
					 | 
					
						
						
							
							商家端添加注释,删除无用代码,优化样式
						
						
						
						
						
						
					 | 
					
						2021-07-19 18:03:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							07f41f5cb6
							
						
					 | 
					
						
						
							
							pc商品列表样式修改,商家注释添加,订单统计,退订单按钮样式
						
						
						
						
						
						
					 | 
					
						2021-07-16 17:57:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							133febe7a7
							
						
					 | 
					
						
						
							
							代码注释添加
						
						
						
						
						
						
					 | 
					
						2021-07-15 10:19:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							e74c6d9eda
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-07-14 18:01:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							0499a9c237
							
						
					 | 
					
						
						
							
							批量上传、添加注释
						
						
						
						
						
						
					 | 
					
						2021-07-14 18:00:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							fbb24fd07f
							
						
					 | 
					
						
						
							
							修复积分字段展示问题
						
						
						
						
						
						
					 | 
					
						2021-07-13 18:55:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b62cba3b9
							
						
					 | 
					
						
						
							
							修改积分类型字段
						
						
						
						
						
						
					 | 
					
						2021-07-13 18:46:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							0fd4645514
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
						
						# Conflicts:
#	seller/src/config/index.js 
						
						
					 | 
					
						2021-07-13 18:16:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e277a8e6d
							
						
					 | 
					
						
						
							
							前端首页下拉样式,头部样式,seller端批量上传
						
						
						
						
						
						
					 | 
					
						2021-07-13 18:15:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca8d518fae
							
						
					 | 
					
						
						
							
							修改物流请求
						
						
						
						
						
						
					 | 
					
						2021-07-12 18:37:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e3c101a1e
							
						
					 | 
					
						
						
							
							合并方法
						
						
						
						
						
						
					 | 
					
						2021-07-12 18:19:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6417cf197
							
						
					 | 
					
						
						
							
							修改商家端物流这块请求方法
						
						
						
						
						
						
					 | 
					
						2021-07-12 18:18:49 +08:00 | 
					
					
						
						
							
							
							
						
					 |