paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bda042bc9
							
						
					 | 
					
						
						
							
							add wholesale of sale model
						
						
						
						
						
						
					 | 
					
						2022-05-27 15:22:36 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							68d2c25ff5
							
						
					 | 
					
						
						
							
							合并提交
						
						
						
						
						
						
					 | 
					
						2022-05-12 15:46:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ccf51dd5c
							
						
					 | 
					
						
						
							
							优化商品发布规格丢失问题 新增修改删除规格值不丢失
						
						
						
						
						
						
					 | 
					
						2022-05-12 15:36:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							479470832d
							
						
					 | 
					
						
						
							
							结算单修改
						
						
						
						
						
						
					 | 
					
						2022-05-11 19:18:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ran
							
						 
					 | 
					
						
						
						
						
							
						
						
							1691f8244f
							
						
					 | 
					
						
						
							
							修改账户昵称过长问题以及viper 在pr上提的Bug
						
						
						
						
						
						
					 | 
					
						2022-04-28 16:13:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							24f4a36082
							
						
					 | 
					
						
						
							
							流水信息退款单中展示更多细节
						
						
						
						
						
						
					 | 
					
						2022-04-26 11:14:57 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							7312b3ec3f
							
						
					 | 
					
						
						
							
							店铺结算单修改
						
						
						
						
						
						
					 | 
					
						2022-04-18 19:10:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							d641123987
							
						
					 | 
					
						
						
							
							新增商家商品模版显示分页显示
						
						
						
						
						
						
					 | 
					
						2022-04-13 14:34:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							f365231ee7
							
						
					 | 
					
						
						
							
							提交高德api中更新安全密钥的提示
						
						
						
						
						
						
					 | 
					
						2022-04-08 17:29:28 +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橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b4f0b8c9d
							
						
					 | 
					
						
						
							
							修改店铺
						
						
						
						
						
						
					 | 
					
						2022-03-03 11:33:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b540b1aac
							
						
					 | 
					
						
						
							
							提交补漏
						
						
						
						
						
						
					 | 
					
						2022-03-03 11:31:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							378ac39315
							
						
					 | 
					
						
						
							
							商家楼层装修
						
						
						
						
						
						
					 | 
					
						2022-03-03 11:26:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							c879cb2af0
							
						
					 | 
					
						
						
							
							优化订单详情中显示的价格问题
						
						
						
						
						
						
					 | 
					
						2022-03-02 15:02:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							32336decc6
							
						
					 | 
					
						
						
							
							动态导航
						
						
						
						
						
						
					 | 
					
						2022-02-27 18:24:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cd64553ab
							
						
					 | 
					
						
						
							
							chongtu
						
						
						
						
						
						
					 | 
					
						2022-02-26 15:35:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e737a3fa7
							
						
					 | 
					
						
						
							
							解决冲突
						
						
						
						
						
						
					 | 
					
						2022-02-26 15:27:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							25b403cde9
							
						
					 | 
					
						
						
							
							冲突文件
						
						
						
						
						
						
					 | 
					
						2022-02-26 15:05:51 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e8ff778f9
							
						
					 | 
					
						
						
							
							商家增加im按钮
						
						
						
						
						
						
					 | 
					
						2022-02-22 01:32:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhenghao
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7ed6454af
							
						
					 | 
					
						
						
							
							clerk
						
						
						
						
						
						
					 | 
					
						2022-02-17 16:37:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							f9d09365ea
							
						
					 | 
					
						
						
							
							部分bug
						
						
						
						
						
						
					 | 
					
						2022-02-17 10:43:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							a220339fd6
							
						
					 | 
					
						
						
							
							合并内容
						
						
						
						
						
						
					 | 
					
						2022-02-16 11:26:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							0994b6659a
							
						
					 | 
					
						
						
							
							合并部分代码 回滚规格
						
						
						
						
						
						
					 | 
					
						2022-02-16 11:22:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4037a346d
							
						
					 | 
					
						
						
							
							修改样式  和 优化一些 功能
						
						
						
						
						
						
					 | 
					
						2022-02-16 09:25:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							aee67ec317
							
						
					 | 
					
						
						
							
							修改版本号
						
						
						
						
						
						
					 | 
					
						2022-02-15 14:08:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							51610546c4
							
						
					 | 
					
						
						
							
							重新修改config
						
						
						
						
						
						
					 | 
					
						2022-02-15 10:17:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8e7d27c0d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2022-02-15 10:12:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								夜良king
							
						 
					 | 
					
						
						
						
						
							
						
						
							166e889b6f
							
						
					 | 
					
						
						
							
							commit
						
						
						
						
						
						
					 | 
					
						2022-02-15 10:12:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							db13814156
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2022-02-14 17:10:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cf3956bc8
							
						
					 | 
					
						
						
							
							取消cdn加载
						
						
						
						
						
						
					 | 
					
						2022-02-14 17:10:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							8023852b3c
							
						
					 | 
					
						
						
							
							升级版本号
						
						
						
						
						
						
					 | 
					
						2022-02-14 15:35:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							228935034d
							
						
					 | 
					
						
						
							
							适配api
						
						
						
						
						
						
					 | 
					
						2022-02-14 14:21:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							acff55dc65
							
						
					 | 
					
						
						
							
							适配修改后的api
						
						
						
						
						
						
					 | 
					
						2022-02-12 15:20:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							61a9110c51
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into fengtianyangyang
						
						
						
						
						
						
					 | 
					
						2022-02-11 16:44:27 +08:00 | 
					
					
						
						
							
							
							
						
					 |