夜良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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a3e14e0a7
							
						
					 | 
					
						
						
							
							适配微服务
						
						
						
						
						
						
					 | 
					
						2022-02-10 18:57:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							925365018b
							
						
					 | 
					
						
						
							
							优化商家发布商品丢失规格问题,修改开启cdn
						
						
						
						
						
						
					 | 
					
						2022-02-10 14:26:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							21f9fd92e2
							
						
					 | 
					
						
						
							
							取消cdn加载
						
						
						
						
						
						
					 | 
					
						2022-02-09 20:49:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3311568e50
							
						
					 | 
					
						
						
							
							修改路径
						
						
						
						
						
						
					 | 
					
						2022-01-25 19:08:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5918b041a
							
						
					 | 
					
						
						
							
							路径修改
						
						
						
						
						
						
					 | 
					
						2022-01-25 12:01:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							631519d7c7
							
						
					 | 
					
						
						
							
							路径修改
						
						
						
						
						
						
					 | 
					
						2022-01-25 09:22:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fengtianyangyang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c3d711298
							
						
					 | 
					
						
						
							
							路径修改
						
						
						
						
						
						
					 | 
					
						2022-01-20 17:21:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bee69cefb
							
						
					 | 
					
						
						
							
							优化管理端和卖家端登录
						
						
						
						
						
						
					 | 
					
						2022-01-17 18:00:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf740d9605
							
						
					 | 
					
						
						
							
							修复富文本编辑器xss过滤样式问题
						
						
						
						
						
						
					 | 
					
						2022-01-17 16:49:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e5eefc079
							
						
					 | 
					
						
						
							
							提交 buyer和seller退出uuid清空bug
						
						
						
						
						
						
					 | 
					
						2021-12-30 11:16:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ff8eb6494
							
						
					 | 
					
						
						
							
							修复优化拼团
						
						
						
						
						
						
					 | 
					
						2021-12-29 19:50:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							f45b115355
							
						
					 | 
					
						
						
							
							修复满额活动赠送积分不显示填写积分。商品规格默认项无法退格删除。权限菜单选择某一子项获取选择全部问题
						
						
						
						
						
						
					 | 
					
						2021-12-28 19:54:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							54dcd2d8be
							
						
					 | 
					
						
						
							
							修复优化促销问题
						
						
						
						
						
						
					 | 
					
						2021-12-25 18:36:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e408eb8ae
							
						
					 | 
					
						
						
							
							修复管理端积分商品问题
						
						
						
						
						
						
					 | 
					
						2021-12-23 17:11:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d5c60ed8c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-12-21 18:59:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ab2bcb515f
							
						
					 | 
					
						
						
							
							优化促销相关代码
						
						
						
						
						
						
					 | 
					
						2021-12-21 18:59:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								lemon橪
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3e6eb72eb
							
						
					 | 
					
						
						
							
							新增npmrc以及yarnrc文件,修改config配置变成可配置的cdn加载以及端口设置
						
						
						
						
						
						
					 | 
					
						2021-12-21 16:30:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeer
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							09dd9861fd
							
						
					 | 
					
						
						
							
							update seller/vue.config.js. 统一取消cdn加载 目前cdn链接的https请求挂了
						
						
						
						
						
						
					 | 
					
						2021-12-20 06:31:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef73a6fe94
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-12-11 13:51:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paulGao
							
						 
					 | 
					
						
						
						
						
							
						
						
							edef393535
							
						
					 | 
					
						
						
							
							适配重构促销
						
						
						
						
						
						
					 | 
					
						2021-12-11 13:50:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							97e6fc79ea
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui
						
						
						
						
						
						
					 | 
					
						2021-12-09 20:21:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chopper
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b82ae7569
							
						
					 | 
					
						
						
							
							商家设置坐席id代码补充
						
						
						
						
						
						
					 | 
					
						2021-12-09 20:21:46 +08:00 | 
					
					
						
						
							
							
							
						
					 |