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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d9a64d84b
							
						
					 | 
					
						
						
							
							热词功能完善
						
						
						
						
						
						
					 | 
					
						2022-04-25 18:08:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b14cd633e
							
						
					 | 
					
						
						
							
							热词部分代码
						
						
						
						
						
						
					 | 
					
						2022-04-25 09:18:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							118aaaf6fb
							
						
					 | 
					
						
						
							
							!8 修复结算页中有无效商品店铺显示问题。优化购物车页。管理端增加搜索热词全删除
						
						
						
						
						
						
						
						Merge pull request !8 from OceansDeep/dev-gl 
						
						
					 | 
					
						2022-04-22 08:50:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0635dd38a2
							
						
					 | 
					
						
						
							
							修复结算页中有无效商品店铺显示问题。优化购物车页。管理端增加搜索热词全删除
						
						
						
						
						
						
					 | 
					
						2022-04-22 16:48:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d648bbad7
							
						
					 | 
					
						
						
							
							结算单页面修改
						
						
						
						
						
						
					 | 
					
						2022-04-22 09:04:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OceansDeep
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5dfcc2482c
							
						
					 | 
					
						
						
							
							!7 优化楼层装修,修复结算页显示失效商品问题
						
						
						
						
						
						
						
						Merge pull request !7 from OceansDeep/dev-gl 
						
						
					 | 
					
						2022-04-21 08:27:40 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4168c9a2b
							
						
					 | 
					
						
						
							
							优惠移动端楼层装修
						
						
						
						
						
						
					 | 
					
						2022-04-21 14:57:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							c09e25974f
							
						
					 | 
					
						
						
							
							结算单修改
						
						
						
						
						
						
					 | 
					
						2022-04-18 19:10:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							744567e8de
							
						
					 | 
					
						
						
							
							优化楼层装修
						
						
						
						
						
						
					 | 
					
						2022-04-18 09:49:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							4156d51d78
							
						
					 | 
					
						
						
							
							优化楼层装修
						
						
						
						
						
						
					 | 
					
						2022-04-18 09:38:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d09920314
							
						
					 | 
					
						
						
							
							修复楼层装修选择链接时可能出现的bug
						
						
						
						
						
						
					 | 
					
						2022-04-18 09:01:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							36fd58a446
							
						
					 | 
					
						
						
							
							解决短信模版页面分页条件不显示问题
						
						
						
						
						
						
					 | 
					
						2022-04-13 10:40:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							df408e640a
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2022-04-08 17:31:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							f365231ee7
							
						
					 | 
					
						
						
							
							提交高德api中更新安全密钥的提示
						
						
						
						
						
						
					 | 
					
						2022-04-08 17:29:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a33db76e9
							
						
					 | 
					
						
						
							
							楼层装修 问题
						
						
						
						
						
						
					 | 
					
						2022-03-22 10:14:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							65aa9d0a9f
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2022-03-18 17:41:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							baaeef0978
							
						
					 | 
					
						
						
							
							管理端无法修改会员信息问题处理
						
						
						
						
						
						
					 | 
					
						2022-03-18 17:41:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							e27070e089
							
						
					 | 
					
						
						
							
							优化一个上传组件控制台报错bug 以及 buyer端楼层装修显示
						
						
						
						
						
						
					 | 
					
						2022-03-17 16:35:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							5188bba5b1
							
						
					 | 
					
						
						
							
							会员流量报表 名称修改
						
						
						
						
						
						
					 | 
					
						2022-03-15 11:46:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							33bb16a0d3
							
						
					 | 
					
						
						
							
							修改菜单栏重复点击console会显示bug , 以及行政地区不回显问题
						
						
						
						
						
						
					 | 
					
						2022-03-04 15:12:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							87f6b81e37
							
						
					 | 
					
						
						
							
							合并
						
						
						
						
						
						
					 | 
					
						2022-03-04 02:31:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							378ac39315
							
						
					 | 
					
						
						
							
							商家楼层装修
						
						
						
						
						
						
					 | 
					
						2022-03-03 11:26:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							c879cb2af0
							
						
					 | 
					
						
						
							
							优化订单详情中显示的价格问题
						
						
						
						
						
						
					 | 
					
						2022-03-02 15:02:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e737a3fa7
							
						
					 | 
					
						
						
							
							解决冲突
						
						
						
						
						
						
					 | 
					
						2022-02-26 15:27:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							535a36c378
							
						
					 | 
					
						
						
							
							‘合并
						
						
						
						
						
						
					 | 
					
						2022-02-23 21:24:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b30bc42d7
							
						
					 | 
					
						
						
							
							添加
						
						
						
						
						
						
					 | 
					
						2022-02-23 20:56:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							800b91d406
							
						
					 | 
					
						
						
							
							修改会员信息少一个前缀问题
						
						
						
						
						
						
					 | 
					
						2022-02-23 16:15:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							31f438edfa
							
						
					 | 
					
						
						
							
							IM更新
						
						
						
						
						
						
					 | 
					
						2022-02-21 22:45:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhenghao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7ed6454af
							
						
					 | 
					
						
						
							
							clerk
						
						
						
						
						
						
					 | 
					
						2022-02-17 16:37:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							f9d09365ea
							
						
					 | 
					
						
						
							
							部分bug
						
						
						
						
						
						
					 | 
					
						2022-02-17 10:43:46 +08:00 | 
					
					
						
						
							
							
							
						
					 |