mabo
							
						 | 
						
							
							
							
							
								
							
								07f41f5cb6
								
							
								
							
						 | 
						
							
							
								
								pc商品列表样式修改,商家注释添加,订单统计,退订单按钮样式
							
							
							
							
							
						 | 
						
							2021-07-16 17:57:24 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								0e277a8e6d
								
							
								
							
						 | 
						
							
							
								
								前端首页下拉样式,头部样式,seller端批量上传
							
							
							
							
							
						 | 
						
							2021-07-13 18:15:32 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								4c0aec2f42
								
							
								
							
						 | 
						
							
							
								
								文章分类,订单列表,商品分类,收款记录等页面bug修改
							
							
							
							
							
						 | 
						
							2021-07-09 17:58:31 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								7331fcbb17
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ma'
							
							
							
							
							
						 | 
						
							2021-07-09 15:21:28 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								48c0dcb69b
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2021-07-08 14:36:05 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								c835616ad2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into ma
							
							
							
							
							
							
							
							# Conflicts:
#	buyer/src/components/goodsDetail/ShowGoodsDetail.vue
#	buyer/src/config/index.js
#	seller/src/views/goods/goods-seller/goodsOperation.vue 
							
						 | 
						
							2021-07-07 16:14:23 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								1246810c01
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2021-07-07 15:34:38 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								fc393ecd64
								
							
								
							
						 | 
						
							
							
								
								部分bug修改
							
							
							
							
							
						 | 
						
							2021-07-05 17:53:23 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								9b9295ea94
								
							
								
							
						 | 
						
							
							
								
								拆分发布商品代码
							
							
							
							
							
						 | 
						
							2021-07-05 16:08:12 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								cc1afed902
								
							
								
							
						 | 
						
							
							
								
								分销提现,滑块验证bug修改
							
							
							
							
							
						 | 
						
							2021-07-02 16:45:52 +08:00 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								6887b6c624
								
							
								
							
						 | 
						
							
							
								
								issues上bug修改
							
							
							
							
							
						 | 
						
							2021-07-01 16:02:12 +08:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								950b8a097c
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2021-06-30 09:45:36 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								5143f2b83f
								
							
								
							
						 | 
						
							
							
								
								添加滑块验证注释
							
							
							
							
							
						 | 
						
							2021-06-29 15:24:16 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								18bfa0edef
								
							
								
							
						 | 
						
							
							
								
								滑块验证优化
							
							
							
							
							
						 | 
						
							2021-06-29 14:58:07 +08:00 | 
						
					
				
					
						
							
							
								 
								pikachu
							
						 | 
						
							
							
							
							
								
							
								338994fb45
								
							
								
							
						 | 
						
							
							
								
								对接会员消息
							
							
							
							
							
						 | 
						
							2021-06-29 08:30:39 +08:00 | 
						
					
				
					
						
							
							
								 
								pikachu
							
						 | 
						
							
							
							
							
								
							
								995b0d65fb
								
							
								
							
						 | 
						
							
							
								
								对接会员消息
							
							
							
							
							
						 | 
						
							2021-06-29 08:25:02 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								edcaa2421b
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2021-06-28 17:12:18 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								20e4662961
								
							
								
							
						 | 
						
							
							
								
								管理端店铺经纬度改为店铺定位
							
							
							
							
							
						 | 
						
							2021-06-28 17:07:48 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								2f6380da22
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2021-06-28 15:47:42 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								b748f467aa
								
							
								
							
						 | 
						
							
							
								
								修改api地址
							
							
							
							
							
						 | 
						
							2021-06-28 11:26:30 +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
							
						 | 
						
							
							
							
							
								
							
								f0914960a4
								
							
								
							
						 | 
						
							
							
								
								update buyer/src/components/header/Header.vue.
							
							
							
							
							
						 | 
						
							2021-06-26 03:23:26 +00: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
							
						 | 
						
							
							
							
							
								
							
								c71da0b437
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ma'
							
							
							
							
							
						 | 
						
							2021-06-25 18:47:48 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								1b2f6e221e
								
							
								
							
						 | 
						
							
							
								
								充值功能
							
							
							
							
							
						 | 
						
							2021-06-25 18:47:16 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								974cc504d9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ma' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into ma
							
							
							
							
							
						 | 
						
							2021-06-25 18:31:58 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								31c585bcaf
								
							
								
							
						 | 
						
							
							
								
								添加余额支付
							
							
							
							
							
						 | 
						
							2021-06-25 18:31:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								0adbde45b9
								
							
								
							
						 | 
						
							
							
								
								充值功能支付跳转
							
							
							
							
							
						 | 
						
							2021-06-25 18:30:30 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								4160ebe004
								
							
								
							
						 | 
						
							
							
								
								虚拟商品售后,商品详情参数
							
							
							
							
							
						 | 
						
							2021-06-25 17:36:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								b48acb9691
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ma' of gitee.com:beijing_hongye_huicheng/lilishop-ui into ma
							
							
							
							
							
						 | 
						
							2021-06-25 17:31:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								75d4fda92d
								
							
								
							
						 | 
						
							
							
								
								增加pc余额支付功能。增加倒计时
							
							
							
							
							
						 | 
						
							2021-06-25 17:31:12 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								b3863568d6
								
							
								
							
						 | 
						
							
							
								
								虚拟商品下单
							
							
							
							
							
						 | 
						
							2021-06-25 16:24:38 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								73246e1dc6
								
							
								
							
						 | 
						
							
							
								
								PC端bug修改
							
							
							
							
							
						 | 
						
							2021-06-25 15:28:31 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								9ef1761c63
								
							
								
							
						 | 
						
							
							
								
								虚拟商品不展示重量
							
							
							
							
							
						 | 
						
							2021-06-24 17:45:00 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								39fd76ebdc
								
							
								
							
						 | 
						
							
							
								
								规格项修改
							
							
							
							
							
						 | 
						
							2021-06-24 15:56:20 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								f8f205d0e8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-06-23 18:19:47 +08:00 |