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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yeliang-king
							
						 
					 | 
					
						
						
						
						
							
						
						
							92aafe3031
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2022-04-25 14:50:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yeliang-king
							
						 
					 | 
					
						
						
						
						
							
						
						
							81f4f4a742
							
						
					 | 
					
						
						
							
							接口更改
						
						
						
						
						
						
					 | 
					
						2022-04-25 14:49:57 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ff51b5e53
							
						
					 | 
					
						
						
							
							修复结算页显示失效商品问题
						
						
						
						
						
						
					 | 
					
						2022-04-21 16:11:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4168c9a2b
							
						
					 | 
					
						
						
							
							优惠移动端楼层装修
						
						
						
						
						
						
					 | 
					
						2022-04-21 14:57:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							7312b3ec3f
							
						
					 | 
					
						
						
							
							店铺结算单修改
						
						
						
						
						
						
					 | 
					
						2022-04-18 19:10:46 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yeliang-king
							
						 
					 | 
					
						
						
						
						
							
						
						
							0faae31b2e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2022-04-18 09:18:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yeliang-king
							
						 
					 | 
					
						
						
						
						
							
						
						
							79a719e7ff
							
						
					 | 
					
						
						
							
							取消横向滚动条
						
						
						
						
						
						
					 | 
					
						2022-04-18 09:15:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d09920314
							
						
					 | 
					
						
						
							
							修复楼层装修选择链接时可能出现的bug
						
						
						
						
						
						
					 | 
					
						2022-04-18 09:01:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							d641123987
							
						
					 | 
					
						
						
							
							新增商家商品模版显示分页显示
						
						
						
						
						
						
					 | 
					
						2022-04-13 14:34:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce871a804c
							
						
					 | 
					
						
						
							
							合并提交
						
						
						
						
						
						
					 | 
					
						2022-04-13 10:42:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							36fd58a446
							
						
					 | 
					
						
						
							
							解决短信模版页面分页条件不显示问题
						
						
						
						
						
						
					 | 
					
						2022-04-13 10:40:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e0a681e01
							
						
					 | 
					
						
						
							
							buyer端的导航条下拉
						
						
						
						
						
						
					 | 
					
						2022-04-12 18:03:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							df408e640a
							
						
					 | 
					
						
						
							
							合并master
						
						
						
						
						
						
					 | 
					
						2022-04-08 17:31:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							f365231ee7
							
						
					 | 
					
						
						
							
							提交高德api中更新安全密钥的提示
						
						
						
						
						
						
					 | 
					
						2022-04-08 17:29:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e8d124560
							
						
					 | 
					
						
						
							
							修复pc端订单详情不展示发票信息
						
						
						
						
						
						
					 | 
					
						2022-04-08 15:32:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e8279c849
							
						
					 | 
					
						
						
							
							improve code
						
						
						
						
						
						
					 | 
					
						2022-03-31 09:26:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							48668fd2d4
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:58:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee5539fb0f
							
						
					 | 
					
						
						
							
							修复pc搜索商品分类参数无效问题
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:57:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							97d88abf80
							
						
					 | 
					
						
						
							
							溢出 滚动显示
						
						
						
						
						
						
					 | 
					
						2022-03-28 18:21:44 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							2ea2723aed
							
						
					 | 
					
						
						
							
							样式 问题
						
						
						
						
						
						
					 | 
					
						2022-03-16 11:31:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								pikachu
							
						 
					 | 
					
						
						
						
						
							
						
						
							5188bba5b1
							
						
					 | 
					
						
						
							
							会员流量报表 名称修改
						
						
						
						
						
						
					 | 
					
						2022-03-15 11:46:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							33bb16a0d3
							
						
					 | 
					
						
						
							
							修改菜单栏重复点击console会显示bug , 以及行政地区不回显问题
						
						
						
						
						
						
					 | 
					
						2022-03-04 15:12:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							2dac958227
							
						
					 | 
					
						
						
							
							更改买家提交售后显示的价格
						
						
						
						
						
						
					 | 
					
						2022-03-02 15:21:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							c879cb2af0
							
						
					 | 
					
						
						
							
							优化订单详情中显示的价格问题
						
						
						
						
						
						
					 | 
					
						2022-03-02 15:02:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							403ae0a963
							
						
					 | 
					
						
						
							
							修改管理端会员详情缺少前缀问题
						
						
						
						
						
						
					 | 
					
						2022-02-23 16:16:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							800b91d406
							
						
					 | 
					
						
						
							
							修改会员信息少一个前缀问题
						
						
						
						
						
						
					 | 
					
						2022-02-23 16:15:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf92b0804e
							
						
					 | 
					
						
						
							
							修改会员API路径调整导致无法修改会员信息问题处理
						
						
						
						
						
						
					 | 
					
						2022-02-23 16:00:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e8ff778f9
							
						
					 | 
					
						
						
							
							商家增加im按钮
						
						
						
						
						
						
					 | 
					
						2022-02-22 01:32:36 +08:00 | 
					
					
						
						
							
							
							
						
					 |