Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b543ff8278
							
						
					 | 
					
						
						
							
							宽度调整
						
						
						
						
						
						
					 | 
					
						2021-06-08 11:33:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b3d19625f
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-06-07 11:50:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							70f0bafd21
							
						
					 | 
					
						
						
							
							合并ma
						
						
						
						
						
						
					 | 
					
						2021-06-04 17:36:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							40bf9781b1
							
						
					 | 
					
						
						
							
							修改一些发现的问题,新增秒杀活动设置,优惠券动态时间 以及 精准发圈用户和小程序直播页面
						
						
						
						
						
						
					 | 
					
						2021-06-04 17:35:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							43b4c041e4
							
						
					 | 
					
						
						
							
							发布商品可以删除模板
						
						
						
						
						
						
					 | 
					
						2021-06-03 17:37:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							f97282ad44
							
						
					 | 
					
						
						
							
							添加注释
						
						
						
						
						
						
					 | 
					
						2021-06-03 17:32:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							011bcae11a
							
						
					 | 
					
						
						
							
							店铺对账状态默认值问题处理
						
						
						
						
						
						
					 | 
					
						2021-06-03 16:42:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f5d2b41d5
							
						
					 | 
					
						
						
							
							Merge branch 'dev-ryan' into ma
						
						
						
						
						
						
					 | 
					
						2021-06-03 16:17:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							33ec809e73
							
						
					 | 
					
						
						
							
							管理、商家添加登录图片验证
						
						
						
						
						
						
					 | 
					
						2021-06-03 14:35:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							3eee6b35e8
							
						
					 | 
					
						
						
							
							合并ma分支解决冲突
						
						
						
						
						
						
					 | 
					
						2021-06-03 11:51:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							d55d53528e
							
						
					 | 
					
						
						
							
							c
						
						
						
						
						
						
					 | 
					
						2021-06-03 11:47:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							65cb7787a6
							
						
					 | 
					
						
						
							
							Merge branch 'master' into ma
						
						
						
						
						
						
					 | 
					
						2021-06-03 09:16:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d86b5c609b
							
						
					 | 
					
						
						
							
							消息提示中,跳转核对商家账单页面错误问题处理
						
						
						
						
						
						
					 | 
					
						2021-06-02 17:43:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b113e2039
							
						
					 | 
					
						
						
							
							付款笔数字段读取错误处理
						
						
						
						
						
						
					 | 
					
						2021-06-02 10:33:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f5e24638b
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-06-01 08:53:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9aa8336f9
							
						
					 | 
					
						
						
							
							订单展示来源问题
						
						
						
						
						
						
					 | 
					
						2021-06-01 08:53:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							6780654aae
							
						
					 | 
					
						
						
							
							im对接,修改bug
						
						
						
						
						
						
					 | 
					
						2021-05-28 17:25:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							0df88e08e4
							
						
					 | 
					
						
						
							
							table不随屏幕改变尺寸问题
						
						
						
						
						
						
					 | 
					
						2021-05-27 16:37:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							087ffe230d
							
						
					 | 
					
						
						
							
							商品选择器组件修改,菜单栏调整
						
						
						
						
						
						
					 | 
					
						2021-05-27 10:32:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5786e46c3
							
						
					 | 
					
						
						
							
							运费模板配置
						
						
						
						
						
						
					 | 
					
						2021-05-26 10:30:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff85c3f68f
							
						
					 | 
					
						
						
							
							运费模板修改
						
						
						
						
						
						
					 | 
					
						2021-05-25 18:58:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9c6b1d690
							
						
					 | 
					
						
						
							
							Merge branch 'dev-ryan' into ma
						
						
						
						
						
						
					 | 
					
						2021-05-25 18:37:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							978db4e624
							
						
					 | 
					
						
						
							
							配送模板修改
						
						
						
						
						
						
					 | 
					
						2021-05-25 18:37:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							020ddf0588
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-05-25 14:27:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5dbd18bf3
							
						
					 | 
					
						
						
							
							小程序直播部分,暂未写完
						
						
						
						
						
						
					 | 
					
						2021-05-25 14:27:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e668cc6d5
							
						
					 | 
					
						
						
							
							管理端,商品回显修改
						
						
						
						
						
						
					 | 
					
						2021-05-25 14:26:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							882e222c5a
							
						
					 | 
					
						
						
							
							商品选择器回显
						
						
						
						
						
						
					 | 
					
						2021-05-24 18:14:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							44c88468d4
							
						
					 | 
					
						
						
							
							Merge branch 'ma'
						
						
						
						
						
						
						
						# Conflicts:
#	manager/src/config/index.js 
						
						
					 | 
					
						2021-05-21 17:47:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							05d35c3974
							
						
					 | 
					
						
						
							
							一些bug修改
						
						
						
						
						
						
					 | 
					
						2021-05-21 17:46:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e9abe9e1e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-05-21 16:56:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							41093b2032
							
						
					 | 
					
						
						
							
							修改一些bug完善,新增app更新新功能
						
						
						
						
						
						
					 | 
					
						2021-05-21 16:45:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae730cacf3
							
						
					 | 
					
						
						
							
							Merge branch 'dev-ryan' into ma
						
						
						
						
						
						
					 | 
					
						2021-05-21 10:47:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							f31ac92bb9
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
						
						# Conflicts:
#	seller/src/config/index.js 
						
						
					 | 
					
						2021-05-21 10:25:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1b587a50c
							
						
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2021-05-21 10:24:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c0555c815
							
						
					 | 
					
						
						
							
							参数为空校验
						
						
						
						
						
						
					 | 
					
						2021-05-20 19:14:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							f625a7e056
							
						
					 | 
					
						
						
							
							参数为空校验
						
						
						
						
						
						
					 | 
					
						2021-05-20 19:09:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							38dc952a07
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-05-20 11:11:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							92aa9fccaf
							
						
					 | 
					
						
						
							
							修改一些可见的bug,优化运费模板中地址选择问题
						
						
						
						
						
						
					 | 
					
						2021-05-20 11:09:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							63c559c8be
							
						
					 | 
					
						
						
							
							折叠面板展示问题
						
						
						
						
						
						
					 | 
					
						2021-05-20 09:57:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							697e4820a4
							
						
					 | 
					
						
						
							
							去掉商品参数的一些信息
						
						
						
						
						
						
					 | 
					
						2021-05-20 08:29:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							8971996731
							
						
					 | 
					
						
						
							
							chushihua
						
						
						
						
						
						
					 | 
					
						2021-05-19 19:28:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c8d071c97
							
						
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2021-05-19 18:22:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							cca4245316
							
						
					 | 
					
						
						
							
							发布商品,运费模板设置
						
						
						
						
						
						
					 | 
					
						2021-05-19 14:45:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							030adb7ae6
							
						
					 | 
					
						
						
							
							修改bug,商家端添加商品,选择运费模板
						
						
						
						
						
						
					 | 
					
						2021-05-19 14:10:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d0e7b3825
							
						
					 | 
					
						
						
							
							修改bug,更改字体图标
						
						
						
						
						
						
					 | 
					
						2021-05-18 18:03:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3ed622031
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
						
						# Conflicts:
#	seller/src/config/index.js 
						
						
					 | 
					
						2021-05-17 18:13:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							70686e45d2
							
						
					 | 
					
						
						
							
							修改浏览器页签名称,发布商品页面bug
						
						
						
						
						
						
					 | 
					
						2021-05-17 18:13:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c63e44793c
							
						
					 | 
					
						
						
							
							radio全局样式调整
						
						
						
						
						
						
					 | 
					
						2021-05-17 18:07:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d1391e305
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-05-17 17:42:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							da5cc8335f
							
						
					 | 
					
						
						
							
							修改管理端bug
						
						
						
						
						
						
					 | 
					
						2021-05-17 17:38:04 +08:00 | 
					
					
						
						
							
							
							
						
					 |