mabo
							
						 | 
						
							
							
							
							
								
							
								f7167912e7
								
							
								
							
						 | 
						
							
							
								
								商品sku只展示一个问题
							
							
							
							
							
						 | 
						
							2021-06-30 17:41:24 +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 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								d8b9d81f70
								
							
								
							
						 | 
						
							
							
								
								合并master
							
							
							
							
							
						 | 
						
							2021-06-30 14:29:03 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								4340b1a5b7
								
							
								
							
						 | 
						
							
							
								
								优化商品分类,隐藏没用的楼层装修弹窗的样式
							
							
							
							
							
						 | 
						
							2021-06-30 14:28:50 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								950b8a097c
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2021-06-30 09:45:36 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								72ed363ac3
								
							
								
							
						 | 
						
							
							
								
								商品评价,点击查看报错问题
							
							
							
							
							
						 | 
						
							2021-06-29 18:13:58 +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
							
						 | 
						
							
							
							
							
								
							
								0575503687
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ma'
							
							
							
							
							
						 | 
						
							2021-06-29 10:44:40 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								346c753670
								
							
								
							
						 | 
						
							
							
								
								代码格式调整
							
							
							
							
							
						 | 
						
							2021-06-29 10:44:25 +08:00 | 
						
					
				
					
						
							
							
								 
								lifenlong
							
						 | 
						
							
							
							
							
								
							
								46a93c5524
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-06-29 10:10:11 +08:00 | 
						
					
				
					
						
							
							
								 
								lifenlong
							
						 | 
						
							
							
							
							
								
							
								b3d9040c02
								
							
								
							
						 | 
						
							
							
								
								修改虚拟订单列表按照订单状态筛选
							
							
							
							
							
						 | 
						
							2021-06-29 10:09:58 +08:00 | 
						
					
				
					
						
							
							
								 
								lifenlong
							
						 | 
						
							
							
							
							
								
							
								9b83d20b85
								
							
								
							
						 | 
						
							
							
								
								修改虚拟订单字段
							
							
							
							
							
						 | 
						
							2021-06-29 10:06:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								8245b0a38d
								
							
								
							
						 | 
						
							
							
								
								虚拟订单查询参数初始化问题处理
							
							
							
							
							
						 | 
						
							2021-06-29 10:03:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								59a580ccac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-06-29 09:42:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								6b0ba4e5ee
								
							
								
							
						 | 
						
							
							
								
								页面展示属性问题
							
							
							
							
							
						 | 
						
							2021-06-29 09:42:21 +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 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								78dc8a5e0b
								
							
								
							
						 | 
						
							
							
								
								合并Master
							
							
							
							
							
						 | 
						
							2021-06-28 18:17:19 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								3e54f24ddd
								
							
								
							
						 | 
						
							
							
								
								merge master
							
							
							
							
							
						 | 
						
							2021-06-28 18:16:41 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								cb14b13c19
								
							
								
							
						 | 
						
							
							
								
								管理端,添加店铺,选择会员失败问题
							
							
							
							
							
						 | 
						
							2021-06-28 18:14:53 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								1e6e7c123c
								
							
								
							
						 | 
						
							
							
								
								修改添加商品拖拽改变位置
							
							
							
							
							
						 | 
						
							2021-06-28 18:14:00 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								edcaa2421b
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2021-06-28 17:12:18 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								20e4662961
								
							
								
							
						 | 
						
							
							
								
								管理端店铺经纬度改为店铺定位
							
							
							
							
							
						 | 
						
							2021-06-28 17:07:48 +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 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								c3bd727694
								
							
								
							
						 | 
						
							
							
								
								店铺入驻bug修改
							
							
							
							
							
						 | 
						
							2021-06-28 11:23:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								510cf963a2
								
							
								
							
						 | 
						
							
							
								
								对没有支付方式的充值进行一下过滤
							
							
							
							
							
						 | 
						
							2021-06-28 10:15:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								081d251594
								
							
								
							
						 | 
						
							
							
								
								充值方式字段描述
							
							
							
							
							
						 | 
						
							2021-06-28 10:07:46 +08:00 | 
						
					
				
					
						
							
							
								 
								pikachu
							
						 | 
						
							
							
							
							
								
							
								f436d17735
								
							
								
							
						 | 
						
							
							
								
								修改资金管理接口
							
							
							
							
							
						 | 
						
							2021-06-26 16:49:44 +08:00 | 
						
					
				
					
						
							
							
								 
								pikachu
							
						 | 
						
							
							
							
							
								
							
								3c83cc9f50
								
							
								
							
						 | 
						
							
							
								
								合并分支
							
							
							
							
							
						 | 
						
							2021-06-26 11:15:23 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								e1000d324e
								
							
								
							
						 | 
						
							
							
								
								合并分支
							
							
							
							
							
						 | 
						
							2021-06-25 19:15:45 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								3cb3fd81e7
								
							
								
							
						 | 
						
							
							
								
								修改一些看到的bug以及功能上的问题
							
							
							
							
							
						 | 
						
							2021-06-25 19:15:27 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								73246e1dc6
								
							
								
							
						 | 
						
							
							
								
								PC端bug修改
							
							
							
							
							
						 | 
						
							2021-06-25 15:28:31 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								7b2054206a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into ma
							
							
							
							
							
						 | 
						
							2021-06-24 15:56:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								e65d84f95f
								
							
								
							
						 | 
						
							
							
								
								管理端订单来源字段处理
							
							
							
							
							
						 | 
						
							2021-06-24 11:54:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								a337972f7a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-06-24 10:41:00 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								4133badc46
								
							
								
							
						 | 
						
							
							
								
								修改后台小程序直播查看问题,新增只有自营店可以赠送积分
							
							
							
							
							
						 | 
						
							2021-06-24 10:32:51 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								b7dd7f1c3b
								
							
								
							
						 | 
						
							
							
								
								合并master上面的冲突
							
							
							
							
							
						 | 
						
							2021-06-23 18:13:11 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								2391f71d9a
								
							
								
							
						 | 
						
							
							
								
								修改部分页面ui以及bug
							
							
							
							
							
						 | 
						
							2021-06-23 18:08:22 +08:00 | 
						
					
				
					
						
							
							
								 
								lifenlong
							
						 | 
						
							
							
							
							
								
							
								6bc0591418
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-06-23 17:40:44 +08:00 | 
						
					
				
					
						
							
							
								 
								lifenlong
							
						 | 
						
							
							
							
							
								
							
								6d94b6fbdc
								
							
								
							
						 | 
						
							
							
								
								秒杀活动,状态展示
							
							
							
							
							
						 | 
						
							2021-06-23 17:40:34 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								ff3f4dd8c0
								
							
								
							
						 | 
						
							
							
								
								腾讯云智服标识设置
							
							
							
							
							
						 | 
						
							2021-06-23 17:32:08 +08:00 |