lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							84cfb26512
							
						
					 | 
					
						
						
							
							i18n问题解决
						
						
						
						
						
						
					 | 
					
						2021-08-31 09:46:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							07445e42e3
							
						
					 | 
					
						
						
							
							合并Master
						
						
						
						
						
						
					 | 
					
						2021-08-30 18:26:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							201348202a
							
						
					 | 
					
						
						
							
							解决seller报错问题
						
						
						
						
						
						
					 | 
					
						2021-08-30 18:25:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							01d2ecda39
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-30 18:14:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							34967921a5
							
						
					 | 
					
						
						
							
							店铺首页展示字段问题处理,以及描述处理
						
						
						
						
						
						
					 | 
					
						2021-08-30 18:14:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							692f7b6dbf
							
						
					 | 
					
						
						
							
							提交商品发布错误bug
						
						
						
						
						
						
					 | 
					
						2021-08-30 17:20:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							8dc3923a4f
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-08-30 16:21:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5b74e8b3b
							
						
					 | 
					
						
						
							
							修改上星期提交的bug
						
						
						
						
						
						
					 | 
					
						2021-08-30 16:21:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7ee9a6444
							
						
					 | 
					
						
						
							
							双减号问题处理
						
						
						
						
						
						
					 | 
					
						2021-08-30 14:46:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ac39d0e93
							
						
					 | 
					
						
						
							
							合并master修改
						
						
						
						
						
						
					 | 
					
						2021-08-27 18:11:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6d8d87c31
							
						
					 | 
					
						
						
							
							优化店铺端代码,减少报错信息,动态cdn加载,优化速度30%+
						
						
						
						
						
						
					 | 
					
						2021-08-27 18:10:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bed539d16f
							
						
					 | 
					
						
						
							
							优惠金额,优惠券金额管理端展示问题处理
						
						
						
						
						
						
					 | 
					
						2021-08-27 17:29:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							abaefc59a6
							
						
					 | 
					
						
						
							
							领取数量调整描述为已领取数量,明确含义。
						
						
						
						
						
						
						
						购物车无法渲染哪个商品参与了满减活动问题处理 
						
						
					 | 
					
						2021-08-26 11:15:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d60a40688
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-25 14:18:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							589b7fc7c5
							
						
					 | 
					
						
						
							
							售后信息展示,单价展示问题处理
						
						
						
						
						
						
					 | 
					
						2021-08-25 14:18:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							7caa2fd40d
							
						
					 | 
					
						
						
							
							优化店铺段报错问题,后续会配置开发环境以及生产环境动态CDN优化
						
						
						
						
						
						
					 | 
					
						2021-08-20 17:45:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							b59da2c101
							
						
					 | 
					
						
						
							
							合并砍价功能
						
						
						
						
						
						
					 | 
					
						2021-08-19 14:48:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							72ad898a6c
							
						
					 | 
					
						
						
							
							满额活动解决修改Cookie中的字段导致新增活动出现的问题
						
						
						
						
						
						
					 | 
					
						2021-08-17 15:46:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							db919a57f3
							
						
					 | 
					
						
						
							
							修改在已有秒杀商品情况下添加新的秒杀商品 数据保存错误问题
						
						
						
						
						
						
					 | 
					
						2021-08-16 19:54:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							f33efac045
							
						
					 | 
					
						
						
							
							合并分支
						
						
						
						
						
						
					 | 
					
						2021-08-16 11:32:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							334a27a12b
							
						
					 | 
					
						
						
							
							修改楼层装修中商品装修出现的默认不显示bug
						
						
						
						
						
						
					 | 
					
						2021-08-16 11:31:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							08fcbe9acf
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-13 18:03:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							14a8695cc9
							
						
					 | 
					
						
						
							
							删除debugger,证照信息需要上传正反面,修改店铺信息,地址回显,bug修改,代码优化,店铺详情展示优化
						
						
						
						
						
						
					 | 
					
						2021-08-13 18:03:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e4449257e
							
						
					 | 
					
						
						
							
							新增收款流水 店铺展示,修改菜单权限ui样式
						
						
						
						
						
						
					 | 
					
						2021-08-13 14:30:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							826454e164
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-08-13 11:30:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c11e448f1
							
						
					 | 
					
						
						
							
							修改菜单权限, 新增版本更新提示
						
						
						
						
						
						
					 | 
					
						2021-08-13 11:30:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							71ab63e047
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-08-12 01:03:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e27a2fb85
							
						
					 | 
					
						
						
							
							好评率展示问题,申请售后图片变形,清除足迹不刷新列表,结算单筛选条件展示错误,店铺审核按钮调整到详情
						
						
						
						
						
						
					 | 
					
						2021-08-12 01:03:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							02bf570f08
							
						
					 | 
					
						
						
							
							商家端售后排序问题处理
						
						
						
						
						
						
					 | 
					
						2021-08-12 00:09:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							e52ac06fb3
							
						
					 | 
					
						
						
							
							pc支持分销
						
						
						
						
						
						
					 | 
					
						2021-08-11 22:53:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1a741466c
							
						
					 | 
					
						
						
							
							商家端查看秒杀活动列表问题处理
						
						
						
						
						
						
					 | 
					
						2021-08-11 22:29:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 |