pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fed294388
							
						
					 | 
					
						
						
							
							Merge branch 'lanmao'
						
						
						
						
						
						
					 | 
					
						2021-05-20 19:20:04 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b190a443be
							
						
					 | 
					
						
						
							
							修改参数中是否必填和索引选中问题
						
						
						
						
						
						
					 | 
					
						2021-05-20 09:45:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e52e7f157
							
						
					 | 
					
						
						
							
							修改参数展示
						
						
						
						
						
						
					 | 
					
						2021-05-20 09:23:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							530fd30cc2
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-05-20 09:17:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							d927eaadf7
							
						
					 | 
					
						
						
							
							去掉参数参数类型
						
						
						
						
						
						
					 | 
					
						2021-05-20 08:30:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							697e4820a4
							
						
					 | 
					
						
						
							
							去掉商品参数的一些信息
						
						
						
						
						
						
					 | 
					
						2021-05-20 08:29:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ce380e5da
							
						
					 | 
					
						
						
							
							店铺详情查看,如果还未设置结算周期无法展示问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-19 20:22:28 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							e359e674cf
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2021-05-19 09:51:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							95d0d4032f
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-05-18 18:03:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d0e7b3825
							
						
					 | 
					
						
						
							
							修改bug,更改字体图标
						
						
						
						
						
						
					 | 
					
						2021-05-18 18:03:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							3efefc4c02
							
						
					 | 
					
						
						
							
							解决发送短信的问题
						
						
						
						
						
						
					 | 
					
						2021-05-18 18:02:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							76697f6a92
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-05-18 14:18:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							d32ea4f1ce
							
						
					 | 
					
						
						
							
							增加商品索引初始化功能
						
						
						
						
						
						
					 | 
					
						2021-05-18 14:18:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							9dfc3a1eba
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into dev-ryan
						
						
						
						
						
						
					 | 
					
						2021-05-18 14:02:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							239ce64e9c
							
						
					 | 
					
						
						
							
							短信签名图片上传样式优化
						
						
						
						
						
						
					 | 
					
						2021-05-18 09:28:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a7422b107
							
						
					 | 
					
						
						
							
							修改管理端上传地址错误
						
						
						
						
						
						
					 | 
					
						2021-05-17 18:18:24 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							c457f6abc9
							
						
					 | 
					
						
						
							
							属性复用问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-17 18:08:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							c63e44793c
							
						
					 | 
					
						
						
							
							radio全局样式调整
						
						
						
						
						
						
					 | 
					
						2021-05-17 18:07:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0eaff276b
							
						
					 | 
					
						
						
							
							店铺自营状态问题处理
						
						
						
						
						
						
					 | 
					
						2021-05-17 17:43:45 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							25690e86e7
							
						
					 | 
					
						
						
							
							header购物车样式调整
						
						
						
						
						
						
					 | 
					
						2021-05-17 11:34:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							182a77f0cb
							
						
					 | 
					
						
						
							
							登录失效,购物车商品数不变问题
						
						
						
						
						
						
					 | 
					
						2021-05-17 11:00:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							9df8a753d4
							
						
					 | 
					
						
						
							
							bug修改
						
						
						
						
						
						
					 | 
					
						2021-05-17 10:34:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd86e1de22
							
						
					 | 
					
						
						
							
							调整页面布局
						
						
						
						
						
						
					 | 
					
						2021-05-17 08:58:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b37178cfe
							
						
					 | 
					
						
						
							
							修改名称
						
						
						
						
						
						
					 | 
					
						2021-05-14 18:06:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d8d16e6fa
							
						
					 | 
					
						
						
							
							名称大小写
						
						
						
						
						
						
					 | 
					
						2021-05-14 18:06:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							6bb2c4e4e8
							
						
					 | 
					
						
						
							
							修改地址
						
						
						
						
						
						
					 | 
					
						2021-05-14 17:56:19 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6b45926f9
							
						
					 | 
					
						
						
							
							添加注释
						
						
						
						
						
						
					 | 
					
						2021-05-14 12:01:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								chopper711
							
						 
					 | 
					
						
						
						
						
							
						
						
							be2be21488
							
						
					 | 
					
						
						
							
							add LICENSE.
						
						
						
						
						
						
					 | 
					
						2021-05-14 11:03:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mabo
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2752a731d
							
						
					 | 
					
						
						
							
							添加注释,删除无用代码
						
						
						
						
						
						
					 | 
					
						2021-05-13 18:09:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							967e673647
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-05-13 16:33:15 +08:00 | 
					
					
						
						
							
							
							
						
					 |