mabo
							
						 | 
						
							
							
							
							
								
							
								07f41f5cb6
								
							
								
							
						 | 
						
							
							
								
								pc商品列表样式修改,商家注释添加,订单统计,退订单按钮样式
							
							
							
							
							
						 | 
						
							2021-07-16 17:57:24 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								133febe7a7
								
							
								
							
						 | 
						
							
							
								
								代码注释添加
							
							
							
							
							
						 | 
						
							2021-07-15 10:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								0499a9c237
								
							
								
							
						 | 
						
							
							
								
								批量上传、添加注释
							
							
							
							
							
						 | 
						
							2021-07-14 18:00:59 +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
							
						 | 
						
							
							
							
							
								
							
								f5faad982c
								
							
								
							
						 | 
						
							
							
								
								发布商品代码拆分完成,管理端订单设置修改
							
							
							
							
							
						 | 
						
							2021-07-09 15:04:02 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								48c0dcb69b
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2021-07-08 14:36:05 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								0504592f7d
								
							
								
							
						 | 
						
							
							
								
								拆分代码
							
							
							
							
							
						 | 
						
							2021-07-08 09:24:42 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								9ff4197ec4
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2021-07-07 17:45:38 +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
							
						 | 
						
							
							
							
							
								
							
								e5449213c2
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2021-07-07 16:12:55 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								872a5d1982
								
							
								
							
						 | 
						
							
							
								
								左侧菜单选中设置
							
							
							
							
							
						 | 
						
							2021-07-07 16:03:48 +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
							
						 | 
						
							
							
							
							
								
							
								c403fce786
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2021-07-02 18:04:17 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								31349634f6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into ma
							
							
							
							
							
							
							
							# Conflicts:
#	seller/src/views/goods/goods-seller/goodsOperation.vue 
							
						 | 
						
							2021-07-02 17:38:14 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								cc1afed902
								
							
								
							
						 | 
						
							
							
								
								分销提现,滑块验证bug修改
							
							
							
							
							
						 | 
						
							2021-07-02 16:45:52 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								3a76ba2c1f
								
							
								
							
						 | 
						
							
							
								
								发布文章图片不回显,发布商品不选类型可以点下一步
							
							
							
							
							
						 | 
						
							2021-07-02 14:26:01 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								da330b80c8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into ma
							
							
							
							
							
						 | 
						
							2021-07-02 10:33:34 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								1028b8189e
								
							
								
							
						 | 
						
							
							
								
								导出待发货订单
							
							
							
							
							
						 | 
						
							2021-07-02 10:32:15 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								6988ad8bf0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2021-07-02 09:50:28 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								e318fe5be0
								
							
								
							
						 | 
						
							
							
								
								pc首页margin问题
							
							
							
							
							
						 | 
						
							2021-07-02 09:50:25 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								4166a1ca58
								
							
								
							
						 | 
						
							
							
								
								合并master
							
							
							
							
							
						 | 
						
							2021-07-02 09:38:07 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								35ea8adf7d
								
							
								
							
						 | 
						
							
							
								
								解决配送地址选择不回显bug
							
							
							
							
							
						 | 
						
							2021-07-02 09:37:46 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								be2280907e
								
							
								
							
						 | 
						
							
							
								
								导出待发货订单
							
							
							
							
							
						 | 
						
							2021-07-02 09:10:53 +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
							
						 | 
						
							
							
							
							
								
							
								c9e58f3586
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2021-06-30 15:51:14 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								e493f26442
								
							
								
							
						 | 
						
							
							
								
								拆分发布商品代码
							
							
							
							
							
						 | 
						
							2021-06-29 17:53:50 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								f973cadd80
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into ma
							
							
							
							
							
						 | 
						
							2021-06-29 15:29:59 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								5143f2b83f
								
							
								
							
						 | 
						
							
							
								
								添加滑块验证注释
							
							
							
							
							
						 | 
						
							2021-06-29 15:24:16 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								18bfa0edef
								
							
								
							
						 | 
						
							
							
								
								滑块验证优化
							
							
							
							
							
						 | 
						
							2021-06-29 14:58:07 +08:00 | 
						
					
				
					
						
							
							
								 
								mabo
							
						 | 
						
							
							
							
							
								
							
								9fbc61f742
								
							
								
							
						 | 
						
							
							
								
								拆分商品发布代码
							
							
							
							
							
						 | 
						
							2021-06-29 11:50:37 +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 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								e1000d324e
								
							
								
							
						 | 
						
							
							
								
								合并分支
							
							
							
							
							
						 | 
						
							2021-06-25 19:15:45 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								3cb3fd81e7
								
							
								
							
						 | 
						
							
							
								
								修改一些看到的bug以及功能上的问题
							
							
							
							
							
						 | 
						
							2021-06-25 19:15:27 +08:00 |