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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							eeb2e94d52
							
						
					 | 
					
						
						
							
							所有页面res.code替换为res.success
						
						
						
						
						
						
					 | 
					
						2021-05-17 16:04:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3953b9ab5
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
						
						# Conflicts:
#	manager/vue.config.js
#	seller/vue.config.js 
						
						
					 | 
					
						2021-05-17 15:41:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc0cb5a76c
							
						
					 | 
					
						
						
							
							修改部分端口号,修改局域网ip
						
						
						
						
						
						
					 | 
					
						2021-05-17 15:40:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4f2fc1381
							
						
					 | 
					
						
						
							
							店铺入驻bug修改
						
						
						
						
						
						
					 | 
					
						2021-05-17 15:38:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							9df8a753d4
							
						
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2021-05-17 10:34:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd86e1de22
							
						
					 | 
					
						
						
							
							调整页面布局
						
						
						
						
						
						
					 | 
					
						2021-05-17 08:58:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd4af5690e
							
						
					 | 
					
						
						
							
							Merge branch 'dev-ryan' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into dev-ryan
						
						
						
						
						
						
					 | 
					
						2021-05-14 17:51:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							66ac29de48
							
						
					 | 
					
						
						
							
							优化管理平台移动端楼层装修样式以及默认属性
						
						
						
						
						
						
					 | 
					
						2021-05-14 17:48:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2c2734b15
							
						
					 | 
					
						
						
							
							商家端保存商品列表筛选条件
						
						
						
						
						
						
					 | 
					
						2021-05-14 17:28:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2752a731d
							
						
					 | 
					
						
						
							
							添加注释,删除无用代码
						
						
						
						
						
						
					 | 
					
						2021-05-13 18:09:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cb4af0498
							
						
					 | 
					
						
						
							
							配置镜像环境
						
						
						
						
						
						
					 | 
					
						2021-05-13 15:49:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec3e958037
							
						
					 | 
					
						
						
							
							commit message
						
						
						
						
						
						
					 | 
					
						2021-05-13 10:56:04 +08:00 | 
					
					
						
						
							
							
							
						
					 |