mabo
							
						 | 
						
							
							
							
							
								
							
								e318fe5be0
								
							
								
							
						 | 
						
							
							
								
								pc首页margin问题
							
							
							
							
							
						 | 
						
							2021-07-02 09:50:25 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								be2280907e
								
							
								
							
						 | 
						
							
							
								
								导出待发货订单
							
							
							
							
							
						 | 
						
							2021-07-02 09:10:53 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								6100f1e39a
								
							
								
							
						 | 
						
							
							
								
								商品参数修改
							
							
							
							
							
						 | 
						
							2021-07-01 17:00:52 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								5368f3c323
								
							
								
							
						 | 
						
							
							
								
								发布商品,选择模板后跳到商品编辑页面
							
							
							
							
							
						 | 
						
							2021-07-01 16:32:41 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								be1a05e566
								
							
								
							
						 | 
						
							
							
								
								Revert "no message"
							
							
							
							
							
							
							
							This reverts commit 0a02195ca6. 
							
						 | 
						
							2021-07-01 16:04:06 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								0a02195ca6
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2021-07-01 16:03:59 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								6887b6c624
								
							
								
							
						 | 
						
							
							
								
								issues上bug修改
							
							
							
							
							
						 | 
						
							2021-07-01 16:02:12 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								14feac43fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-06-30 15:51:18 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								c9e58f3586
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2021-06-30 15:51:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								e8809bbeb8
								
							
								
							
						 | 
						
							
							
								
								镜像脚本更新
							
							
							
							
							
						 | 
						
							2021-06-30 14:54:24 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								5143f2b83f
								
							
								
							
						 | 
						
							
							
								
								添加滑块验证注释
							
							
							
							
							
						 | 
						
							2021-06-29 15:24:16 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								b728e340a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-06-29 14:58:10 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								18bfa0edef
								
							
								
							
						 | 
						
							
							
								
								滑块验证优化
							
							
							
							
							
						 | 
						
							2021-06-29 14:58:07 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								f87306f6de
								
							
								
							
						 | 
						
							
							
								
								合并master
							
							
							
							
							
						 | 
						
							2021-06-29 12:00:05 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								7a080124c6
								
							
								
							
						 | 
						
							
							
								
								新增会员提现功能
							
							
							
							
							
						 | 
						
							2021-06-29 11:59:45 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								346c753670
								
							
								
							
						 | 
						
							
							
								
								代码格式调整
							
							
							
							
							
						 | 
						
							2021-06-29 10:44:25 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								a8aa73760f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ma'
							
							
							
							
							
						 | 
						
							2021-06-29 09:28:36 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								ebaa75ed15
								
							
								
							
						 | 
						
							
							
								
								管理端上架问题,批量设置物流模板
							
							
							
							
							
						 | 
						
							2021-06-29 09:28:21 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								5ea61a160e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ma'
							
							
							
							
							
						 | 
						
							2021-06-28 18:54:09 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								25176c36fb
								
							
								
							
						 | 
						
							
							
								
								发布商品,商品图片拖拽改变位置
							
							
							
							
							
						 | 
						
							2021-06-28 18:53:57 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								78dc8a5e0b
								
							
								
							
						 | 
						
							
							
								
								合并Master
							
							
							
							
							
						 | 
						
							2021-06-28 18:17:19 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								3e54f24ddd
								
							
								
							
						 | 
						
							
							
								
								merge master
							
							
							
							
							
						 | 
						
							2021-06-28 18:16:41 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								1e6e7c123c
								
							
								
							
						 | 
						
							
							
								
								修改添加商品拖拽改变位置
							
							
							
							
							
						 | 
						
							2021-06-28 18:14:00 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								20e4662961
								
							
								
							
						 | 
						
							
							
								
								管理端店铺经纬度改为店铺定位
							
							
							
							
							
						 | 
						
							2021-06-28 17:07:48 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								2f6380da22
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2021-06-28 15:47:42 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								37b873ecce
								
							
								
							
						 | 
						
							
							
								
								修改当首页空数据显示问题
							
							
							
							
							
						 | 
						
							2021-06-28 15:12:50 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								10fc7d4dd0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
							
							
							# Conflicts:
#	manager/src/config/index.js
#	seller/src/config/index.js 
							
						 | 
						
							2021-06-28 11:25:30 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								e14ecef05a
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2021-06-28 11:24:06 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								e1000d324e
								
							
								
							
						 | 
						
							
							
								
								合并分支
							
							
							
							
							
						 | 
						
							2021-06-25 19:15:45 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								3cb3fd81e7
								
							
								
							
						 | 
						
							
							
								
								修改一些看到的bug以及功能上的问题
							
							
							
							
							
						 | 
						
							2021-06-25 19:15:27 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								c673ab2b5e
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2021-06-25 19:05:47 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								b61f5e47df
								
							
								
							
						 | 
						
							
							
								
								添加分类id
							
							
							
							
							
						 | 
						
							2021-06-25 19:03:47 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								1b2f6e221e
								
							
								
							
						 | 
						
							
							
								
								充值功能
							
							
							
							
							
						 | 
						
							2021-06-25 18:47:16 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								830cc3e83c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into ma
							
							
							
							
							
						 | 
						
							2021-06-25 16:03:21 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								be611871bc
								
							
								
							
						 | 
						
							
							
								
								修改发布商品格式
							
							
							
							
							
						 | 
						
							2021-06-25 16:03:10 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								73246e1dc6
								
							
								
							
						 | 
						
							
							
								
								PC端bug修改
							
							
							
							
							
						 | 
						
							2021-06-25 15:28:31 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								0a11a25ccd
								
							
								
							
						 | 
						
							
							
								
								发布商品小修改
							
							
							
							
							
						 | 
						
							2021-06-25 11:37:54 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								bb51771898
								
							
								
							
						 | 
						
							
							
								
								发布商品页面bug修改
							
							
							
							
							
						 | 
						
							2021-06-25 11:29:48 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								532cbc943d
								
							
								
							
						 | 
						
							
							
								
								发布商品回显问题
							
							
							
							
							
						 | 
						
							2021-06-24 18:36:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								d645f4ea6b
								
							
								
							
						 | 
						
							
							
								
								商品参数问题处理,参数回显
							
							
							
							
							
						 | 
						
							2021-06-24 17:46:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								3cb1edee83
								
							
								
							
						 | 
						
							
							
								
								参数相关问题处理
							
							
							
							
							
						 | 
						
							2021-06-24 17:44:43 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								e0a7bb86a6
								
							
								
							
						 | 
						
							
							
								
								模板
							
							
							
							
							
						 | 
						
							2021-06-24 17:13:26 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								84f3eaea10
								
							
								
							
						 | 
						
							
							
								
								商品模板修改
							
							
							
							
							
						 | 
						
							2021-06-24 16:41:04 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								dbd3bb6124
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-06-24 15:56:33 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								39fd76ebdc
								
							
								
							
						 | 
						
							
							
								
								规格项修改
							
							
							
							
							
						 | 
						
							2021-06-24 15:56:20 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								75ca4de9e1
								
							
								
							
						 | 
						
							
							
								
								合并master
							
							
							
							
							
						 | 
						
							2021-06-24 10:35:51 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								4133badc46
								
							
								
							
						 | 
						
							
							
								
								修改后台小程序直播查看问题,新增只有自营店可以赠送积分
							
							
							
							
							
						 | 
						
							2021-06-24 10:32:51 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								f8f205d0e8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-06-23 18:19:47 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								4d7b4eb2b4
								
							
								
							
						 | 
						
							
							
								
								发布商品修改
							
							
							
							
							
						 | 
						
							2021-06-23 18:19:43 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								b7dd7f1c3b
								
							
								
							
						 | 
						
							
							
								
								合并master上面的冲突
							
							
							
							
							
						 | 
						
							2021-06-23 18:13:11 +08:00 |