paulGao
							
						 | 
						
							
							
							
							
								
							
								2111020f62
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl
							
							
							
							
							
						 | 
						
							2022-05-27 18:27:20 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								160658cfb6
								
							
								
							
						 | 
						
							
							
								
								批发商品部分
							
							
							
							
							
						 | 
						
							2022-05-27 18:20:42 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								8a7f9b2487
								
							
								
							
						 | 
						
							
							
								
								批量商品价格展示
							
							
							
							
							
						 | 
						
							2022-05-27 18:16:12 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								85061ed2f8
								
							
								
							
						 | 
						
							
							
								
								增加批发商品的标识
							
							
							
							
							
						 | 
						
							2022-05-27 18:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								3405cf68bb
								
							
								
							
						 | 
						
							
							
								
								优化生成价格区间
							
							
							
							
							
						 | 
						
							2022-05-27 16:28:26 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								ebacb58049
								
							
								
							
						 | 
						
							
							
								
								商品搜索优化
							
							
							
							
							
						 | 
						
							2022-05-27 16:07:54 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								8873f575db
								
							
								
							
						 | 
						
							
							
								
								商品搜索和列表显示增加销售模式
							
							
							
							
							
						 | 
						
							2022-05-27 15:49:27 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								994ef217ac
								
							
								
							
						 | 
						
							
							
								
								add wholesale of sale model
							
							
							
							
							
						 | 
						
							2022-05-27 15:23:10 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								1bda042bc9
								
							
								
							
						 | 
						
							
							
								
								add wholesale of sale model
							
							
							
							
							
						 | 
						
							2022-05-27 15:22:36 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								e97dbe1c90
								
							
								
							
						 | 
						
							
							
								
								批量价格显示的样式
							
							
							
							
							
						 | 
						
							2022-05-27 10:28:37 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								f19071542a
								
							
								
							
						 | 
						
							
							
								
								添加vuex cdn
							
							
							
							
							
						 | 
						
							2022-05-24 14:21:10 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								50836e0aa3
								
							
								
							
						 | 
						
							
							
								
								删除已发现的冗余内容
							
							
							
							
							
						 | 
						
							2022-05-23 14:17:36 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								1b4c05f70b
								
							
								
							
						 | 
						
							
							
								
								修改高德地图key更新此commit 之前请务必确认一下创建的高德key日期。修改部分方法名称
							
							
							
							
							
						 | 
						
							2022-05-20 16:40:09 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								32dffe96ed
								
							
								
							
						 | 
						
							
							
								
								修改axios为19.2链接
							
							
							
							
							
						 | 
						
							2022-05-20 15:42:23 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								e2df32d906
								
							
								
							
						 | 
						
							
							
								
								补充提交
							
							
							
							
							
						 | 
						
							2022-05-20 15:11:26 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								9eab3b261e
								
							
								
							
						 | 
						
							
							
								
								合并seller
							
							
							
							
							
						 | 
						
							2022-05-20 14:42:43 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								1e40e2d557
								
							
								
							
						 | 
						
							
							
								
								修改axios版本
							
							
							
							
							
						 | 
						
							2022-05-20 14:42:11 +08:00 | 
						
					
				
					
						
							
							
								 
								OceansDeep
							
						 | 
						
							
							
							
								
								
							
							
								
							
								256ada983b
								
									
								
							
								
							
						 | 
						
							
							
								
								!16 优化商品sku编辑,不在清空数据。commit v1
							
							
							
							
							
							
							
							Merge pull request !16 from OceansDeep/dev-gl 
							
						 | 
						
							2022-05-19 09:32:57 +00:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								cd0c90ace8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl
							
							
							
							
							
						 | 
						
							2022-05-19 17:30:32 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								913b96af5a
								
							
								
							
						 | 
						
							
							
								
								优化商品sku编辑,不在清空数据。commit v1
							
							
							
							
							
						 | 
						
							2022-05-19 17:22:22 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								a3f5212bbc
								
							
								
							
						 | 
						
							
							
								
								删除被墙的cdn 启用pickmall cdn加载资源
							
							
							
							
							
						 | 
						
							2022-05-19 15:51:32 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								9d7a06e867
								
							
								
							
						 | 
						
							
							
								
								优化管理端代办事项
							
							
							
							
							
						 | 
						
							2022-05-19 09:13:16 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								48f3c38fbd
								
							
								
							
						 | 
						
							
							
								
								修改获取logo接口地址
							
							
							
							
							
						 | 
						
							2022-05-18 21:53:32 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								706bab7eff
								
							
								
							
						 | 
						
							
							
								
								修改buyer端发现的问题
							
							
							
							
							
						 | 
						
							2022-05-17 17:27:19 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								b6fa3175c6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2022-05-17 09:19:58 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								3cd57a6915
								
							
								
							
						 | 
						
							
							
								
								隐私协议菜单,店铺详情店铺详情非空判断,自定义logo
							
							
							
							
							
						 | 
						
							2022-05-17 09:19:36 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								d433ff02cb
								
							
								
							
						 | 
						
							
							
								
								首页历史统计新增 历史记录对比
							
							
							
							
							
						 | 
						
							2022-05-13 14:17:33 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								68d2c25ff5
								
							
								
							
						 | 
						
							
							
								
								合并提交
							
							
							
							
							
						 | 
						
							2022-05-12 15:46:55 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								9ccf51dd5c
								
							
								
							
						 | 
						
							
							
								
								优化商品发布规格丢失问题 新增修改删除规格值不丢失
							
							
							
							
							
						 | 
						
							2022-05-12 15:36:59 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								727d240715
								
							
								
							
						 | 
						
							
							
								
								git stashMerge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
							
							
							
							
							
						 | 
						
							2022-05-12 10:44:17 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								1f4448ba08
								
							
								
							
						 | 
						
							
							
								
								增加打印发货单功能,隐藏配送信息,删除腾讯云智能客服
							
							
							
							
							
						 | 
						
							2022-05-12 10:33:02 +08:00 | 
						
					
				
					
						
							
							
								 
								OceansDeep
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6064c168bf
								
									
								
							
								
							
						 | 
						
							
							
								
								!15 修复秒杀已售数量不正确问题
							
							
							
							
							
							
							
							Merge pull request !15 from OceansDeep/dev-gl 
							
						 | 
						
							2022-05-12 01:10:44 +00:00 | 
						
					
				
					
						
							
							
								 
								fengtianyangyang
							
						 | 
						
							
							
							
							
								
							
								479470832d
								
							
								
							
						 | 
						
							
							
								
								结算单修改
							
							
							
							
							
						 | 
						
							2022-05-11 19:18:04 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								71fa00c267
								
							
								
							
						 | 
						
							
							
								
								修复秒杀已售数量不正确问题
							
							
							
							
							
						 | 
						
							2022-05-11 16:11:59 +08:00 | 
						
					
				
					
						
							
							
								 
								OceansDeep
							
						 | 
						
							
							
							
								
								
							
							
								
							
								c1331e8ccf
								
									
								
							
								
							
						 | 
						
							
							
								
								!14 add build.sh
							
							
							
							
							
							
							
							Merge pull request !14 from OceansDeep/dev-gl 
							
						 | 
						
							2022-05-10 07:58:11 +00:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								8a2ec77c84
								
							
								
							
						 | 
						
							
							
								
								add build.sh
							
							
							
							
							
						 | 
						
							2022-05-10 15:57:30 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								b197cda548
								
							
								
							
						 | 
						
							
							
								
								合并分支
							
							
							
							
							
						 | 
						
							2022-05-09 18:38:48 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								c83eddd62e
								
							
								
							
						 | 
						
							
							
								
								优化订单统计
							
							
							
							
							
						 | 
						
							2022-05-09 18:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								OceansDeep
							
						 | 
						
							
							
							
								
								
							
							
								
							
								46168a037d
								
									
								
							
								
							
						 | 
						
							
							
								
								!13 修复秒杀活动页已售数量问题
							
							
							
							
							
							
							
							Merge pull request !13 from OceansDeep/dev-gl 
							
						 | 
						
							2022-05-09 07:11:47 +00:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								cbb2365ae8
								
							
								
							
						 | 
						
							
							
								
								修复秒杀活动页已售数量问题
							
							
							
							
							
						 | 
						
							2022-05-09 14:32:00 +08:00 | 
						
					
				
					
						
							
							
								 
								OceansDeep
							
						 | 
						
							
							
							
								
								
							
							
								
							
								ec3093246a
								
									
								
							
								
							
						 | 
						
							
							
								
								!12 修复bug
							
							
							
							
							
							
							
							Merge pull request !12 from OceansDeep/dev-gl 
							
						 | 
						
							2022-05-05 01:32:18 +00:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								670ba74044
								
							
								
							
						 | 
						
							
							
								
								修复bug
							
							
							
							
							
						 | 
						
							2022-05-05 09:30:42 +08:00 | 
						
					
				
					
						
							
							
								 
								学习很差啦
							
						 | 
						
							
							
							
								
								
							
							
								
							
								84e0803558
								
									
								
							
								
							
						 | 
						
							
							
								
								!9 修复查看满额活动详细后点击返回键找不到路由返回白屏问题
							
							
							
							
							
							
							
							Merge pull request !9 from Assure/master 感谢Assure发现的返回白屏问题 此处接受并提交 
							
						 | 
						
							2022-04-28 08:19:02 +00:00 | 
						
					
				
					
						
							
							
								 
								ran
							
						 | 
						
							
							
							
							
								
							
								1691f8244f
								
							
								
							
						 | 
						
							
							
								
								修改账户昵称过长问题以及viper 在pr上提的Bug
							
							
							
							
							
						 | 
						
							2022-04-28 16:13:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								24f4a36082
								
							
								
							
						 | 
						
							
							
								
								流水信息退款单中展示更多细节
							
							
							
							
							
						 | 
						
							2022-04-26 11:14:57 +08:00 | 
						
					
				
					
						
							
							
								 
								胡程
							
						 | 
						
							
							
							
							
								
							
								7cf7123dd2
								
							
								
							
						 | 
						
							
							
								
								fix:修复查看满额活动详细后点击返回键找不到路由返回白屏问题
							
							
							
							
							
						 | 
						
							2022-04-26 10:05:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								37064141c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-lmr'
							
							
							
							
							
							
							
							# Conflicts:
#	manager/src/views/page/article-manage/hotWords.vue 
							
						 | 
						
							2022-04-25 19:00:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								5bd66b9ec6
								
							
								
							
						 | 
						
							
							
								
								还原接口api
							
							
							
							
							
						 | 
						
							2022-04-25 18:16:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								9e34b44165
								
							
								
							
						 | 
						
							
							
								
								热词功能补充提交
							
							
							
							
							
						 | 
						
							2022-04-25 18:09:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								8d9a64d84b
								
							
								
							
						 | 
						
							
							
								
								热词功能完善
							
							
							
							
							
						 | 
						
							2022-04-25 18:08:29 +08:00 |