lemon橪
							
						 | 
						
							
							
							
							
								
							
								00e229e7f4
								
							
								
							
						 | 
						
							
							
								
								新增退款失败错误提示
							
							
							
							
							
						 | 
						
							2022-07-13 18:12:30 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								eeadfc1db9
								
							
								
							
						 | 
						
							
							
								
								新增移动端公告横纵向设置,我的足迹以及秒杀活动展示优化
							
							
							
							
							
						 | 
						
							2022-07-13 09:37:59 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								f3ef286aa7
								
							
								
							
						 | 
						
							
							
								
								修改分销订单显示问题
							
							
							
							
							
						 | 
						
							2022-07-08 14:48:23 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								a3fe3a3743
								
							
								
							
						 | 
						
							
							
								
								修改隐私协议的判断
							
							
							
							
							
						 | 
						
							2022-07-07 18:25:27 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								86fa39d7af
								
							
								
							
						 | 
						
							
							
								
								合并master
							
							
							
							
							
						 | 
						
							2022-07-06 17:33:08 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								a785718715
								
							
								
							
						 | 
						
							
							
								
								修改回收站不能修改用户信息问题
							
							
							
							
							
						 | 
						
							2022-07-06 17:31:12 +08:00 | 
						
					
				
					
						
							
							
								 
								OceansDeep
							
						 | 
						
							
							
							
								
								
							
							
								
							
								d4eb17e573
								
									
								
							
								
							
						 | 
						
							
							
								
								!24 优化逻辑
							
							
							
							
							
							
							
							Merge pull request !24 from OceansDeep/dev-gl 
							
						 | 
						
							2022-07-06 08:43:21 +00:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								994b700892
								
							
								
							
						 | 
						
							
							
								
								优化逻辑
							
							
							
							
							
						 | 
						
							2022-07-06 16:18:09 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								c1830df1a2
								
							
								
							
						 | 
						
							
							
								
								修改优化
							
							
							
							
							
						 | 
						
							2022-07-05 18:24:14 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								c7b739e546
								
							
								
							
						 | 
						
							
							
								
								更换editor,可支持拖拽式上传
							
							
							
							
							
						 | 
						
							2022-07-05 18:04:04 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								8d6fa2f19f
								
							
								
							
						 | 
						
							
							
								
								去掉隐私协议中的排序,分类
							
							
							
							
							
						 | 
						
							2022-06-30 10:25:38 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								0a5563e5e2
								
							
								
							
						 | 
						
							
							
								
								优化管理端促销相关文本,操作条件
							
							
							
							
							
						 | 
						
							2022-06-22 10:55:17 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								f4b7068cd6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl
							
							
							
							
							
						 | 
						
							2022-06-22 10:20:06 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								2cb6f04465
								
							
								
							
						 | 
						
							
							
								
								更改统计图关键字
							
							
							
							
							
						 | 
						
							2022-06-21 16:57:32 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								cd81a6afb1
								
							
								
							
						 | 
						
							
							
								
								合并master
							
							
							
							
							
						 | 
						
							2022-06-17 18:50:54 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								f930d73a6a
								
							
								
							
						 | 
						
							
							
								
								商品选择器显示零售商品批发商品
							
							
							
							
							
						 | 
						
							2022-06-17 18:50:30 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								23bae9efd5
								
							
								
							
						 | 
						
							
							
								
								优化k8s部署提交
							
							
							
							
							
						 | 
						
							2022-06-16 14:08:46 +08:00 | 
						
					
				
					
						
							
							
								 
								OceansDeep
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2880c21a26
								
									
								
							
								
							
						 | 
						
							
							
								
								!21 优化代码
							
							
							
							
							
							
							
							Merge pull request !21 from OceansDeep/dev-gl 
							
						 | 
						
							2022-06-16 01:24:18 +00:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								274ac3f155
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl
							
							
							
							
							
						 | 
						
							2022-06-16 09:21:29 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								c85d488de4
								
							
								
							
						 | 
						
							
							
								
								优化代码
							
							
							
							
							
						 | 
						
							2022-06-16 09:21:14 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								9a3d202524
								
							
								
							
						 | 
						
							
							
								
								优化统计图显示
							
							
							
							
							
						 | 
						
							2022-06-15 18:48:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								2dcfacd431
								
							
								
							
						 | 
						
							
							
								
								适配minio
							
							
							
							
							
						 | 
						
							2022-06-07 09:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Chopper
							
						 | 
						
							
							
							
							
								
							
								d2c2da25b4
								
							
								
							
						 | 
						
							
							
								
								消费积分设置问题
							
							
							
							
							
						 | 
						
							2022-06-02 09:29:19 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								e5f9f81ef7
								
							
								
							
						 | 
						
							
							
								
								解决冲突
							
							
							
							
							
						 | 
						
							2022-06-01 10:26:41 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								0c0c903529
								
							
								
							
						 | 
						
							
							
								
								修改商家logo没有更换的问题
							
							
							
							
							
						 | 
						
							2022-06-01 10:13:53 +08:00 | 
						
					
				
					
						
							
							
								 
								OceansDeep
							
						 | 
						
							
							
							
								
								
							
							
								
							
								115fa87ff2
								
									
								
							
								
							
						 | 
						
							
							
								
								!19 管理端商品详情增加批发商品信息展示
							
							
							
							
							
							
							
							Merge pull request !19 from OceansDeep/dev-gl 
							
						 | 
						
							2022-06-01 01:15:27 +00:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								bb40364aed
								
							
								
							
						 | 
						
							
							
								
								管理端商品详情增加批发商品信息展示
							
							
							
							
							
						 | 
						
							2022-06-01 09:04:36 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								0e921de6c3
								
							
								
							
						 | 
						
							
							
								
								合并master
							
							
							
							
							
						 | 
						
							2022-05-31 11:17:29 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								58eeed4bbd
								
							
								
							
						 | 
						
							
							
								
								解决商品分类控件-添加一个品种后重复添加问题
							
							
							
							
							
						 | 
						
							2022-05-31 11:17:05 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								21289f5a92
								
							
								
							
						 | 
						
							
							
								
								修改logo缓存
							
							
							
							
							
						 | 
						
							2022-05-31 11:04:40 +08:00 | 
						
					
				
					
						
							
							
								 
								mhhhh
							
						 | 
						
							
							
							
							
								
							
								0aec486291
								
							
								
							
						 | 
						
							
							
								
								修改logo接口缓存
							
							
							
							
							
						 | 
						
							2022-05-31 09:51:43 +08:00 | 
						
					
				
					
						
							
							
								 
								paulGao
							
						 | 
						
							
							
							
							
								
							
								ebacb58049
								
							
								
							
						 | 
						
							
							
								
								商品搜索优化
							
							
							
							
							
						 | 
						
							2022-05-27 16:07:54 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								1b4c05f70b
								
							
								
							
						 | 
						
							
							
								
								修改高德地图key更新此commit 之前请务必确认一下创建的高德key日期。修改部分方法名称
							
							
							
							
							
						 | 
						
							2022-05-20 16:40:09 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								fengtianyangyang
							
						 | 
						
							
							
							
							
								
							
								479470832d
								
							
								
							
						 | 
						
							
							
								
								结算单修改
							
							
							
							
							
						 | 
						
							2022-05-11 19:18:04 +08:00 | 
						
					
				
					
						
							
							
								 
								lemon橪
							
						 | 
						
							
							
							
							
								
							
								c83eddd62e
								
							
								
							
						 | 
						
							
							
								
								优化订单统计
							
							
							
							
							
						 | 
						
							2022-05-09 18:37:53 +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 |