9f4dfd7e4c 
								
							
								 
							
						 
						
							
							
								
								chore: update deps  
							
							... 
							
							
							
							(cherry picked from commit 85f93804b5 
							
						 
						
							2023-09-19 20:25:38 +08:00  
				
					
						
							
							
								 
						
							
							
								73cd024a5c 
								
							
								 
							
						 
						
							
							
								
								typo: apiclient_key.perm => apiclient_key.pem  
							
							... 
							
							
							
							(cherry picked from commit 36268cf834 
							
						 
						
							2023-09-19 20:25:33 +08:00  
				
					
						
							
							
								 
						
							
							
								3f479ecffc 
								
							
								 
							
						 
						
							
							
								
								feat: 支付管理/应用信息(alpha)  
							
							... 
							
							
							
							(cherry picked from commit 323417b0d4 
							
						 
						
							2023-09-19 20:25:26 +08:00  
				
					
						
							
							
								 
						
							
							
								da5ad39251 
								
							
								 
							
						 
						
							
							
								
								fix: combinationActivity 调整  
							
							... 
							
							
							
							(cherry picked from commit c327f79177 
							
						 
						
							2023-09-19 20:24:40 +08:00  
				
					
						
							
							
								 
						
							
							
								cace3d1743 
								
							
								 
							
						 
						
							
							
								
								fix: 修正合并代码后前端不能正常启动的问题  
							
							... 
							
							
							
							(cherry picked from commit 39df9be988 
							
						 
						
							2023-09-19 20:24:31 +08:00  
				
					
						
							
							
								 
						
							
							
								e3e2111324 
								
							
								 
							
						 
						
							
							
								
								request支持传递axios原生参数,例如超时:request(method:'GET',url:'',timeout:1000)  
							
							... 
							
							
							
							(cherry picked from commit 0c334ff4d6 
							
						 
						
							2023-09-19 20:24:21 +08:00  
				
					
						
							
							
								 
						
							
							
								67baf1e0a5 
								
							
								 
							
						 
						
							
							
								
								fix: 修正 combinationActivity.data.ts  
							
							... 
							
							
							
							(cherry picked from commit 73b918b4e9 
							
						 
						
							2023-09-19 20:24:15 +08:00  
				
					
						
							
							
								 
						
							
							
								e1b181f2d8 
								
							
								 
							
						 
						
							
							
								
								docs: unocss  
							
							... 
							
							
							
							(cherry picked from commit bc258dbb8c 
							
						 
						
							2023-09-19 20:14:39 +08:00  
				
					
						
							
							
								 
						
							
							
								9ae54036fa 
								
							
								 
							
						 
						
							
							
								
								fix: style  
							
							... 
							
							
							
							(cherry picked from commit 29d493e2da 
							
						 
						
							2023-09-19 20:14:31 +08:00  
				
					
						
							
							
								 
						
							
							
								c50051d930 
								
							
								 
							
						 
						
							
							
								
								fix: eslint  
							
							... 
							
							
							
							(cherry picked from commit 2dcb73764f 
							
						 
						
							2023-09-19 20:14:25 +08:00  
				
					
						
							
							
								 
						
							
							
								2d4c3801f4 
								
							
								 
							
						 
						
							
							
								
								chore: setting  
							
							... 
							
							
							
							(cherry picked from commit 177d497588 
							
						 
						
							2023-09-19 20:09:22 +08:00  
				
					
						
							
							
								 
						
							
							
								05c3245ea5 
								
							
								 
							
						 
						
							
							
								
								chore: unocss  
							
							... 
							
							
							
							(cherry picked from commit 9976850c46 
							
						 
						
							2023-09-19 20:09:09 +08:00  
				
					
						
							
							
								 
						
							
							
								b6bf2f0d91 
								
							
								 
							
						 
						
							
							
								
								chore: unocss  
							
							... 
							
							
							
							(cherry picked from commit b19d31ce4e 
							
						 
						
							2023-09-19 20:09:06 +08:00  
				
					
						
							
							
								 
						
							
							
								e9b60d166a 
								
							
								 
							
						 
						
							
							
								
								chore: unocss  
							
							... 
							
							
							
							(cherry picked from commit 5d9e713981 
							
						 
						
							2023-09-19 20:09:01 +08:00  
				
					
						
							
							
								 
						
							
							
								a7c1a98df1 
								
							
								 
							
						 
						
							
							
								
								docs: unocss  
							
							... 
							
							
							
							(cherry picked from commit e37fe5f4fe 
							
						 
						
							2023-09-19 20:08:55 +08:00  
				
					
						
							
							
								 
						
							
							
								fa4ac7420f 
								
							
								 
							
						 
						
							
							
								
								chore: vscode config  
							
							... 
							
							
							
							(cherry picked from commit 34817269a4 
							
						 
						
							2023-09-19 20:08:52 +08:00  
				
					
						
							
							
								 
						
							
							
								4f81427aa0 
								
							
								 
							
						 
						
							
							
								
								wip: use unocss  
							
							... 
							
							
							
							(cherry picked from commit 4249465b7c 
							
						 
						
							2023-09-19 20:08:38 +08:00  
				
					
						
							
							
								 
						
							
							
								c7d6d35642 
								
							
								 
							
						 
						
							
							
								
								fix: eslint  
							
							... 
							
							
							
							(cherry picked from commit 8e78975521 
							
						 
						
							2023-09-19 20:02:03 +08:00  
				
					
						
							
							
								 
						
							
							
								9dd40c360a 
								
							
								 
							
						 
						
							
							
								
								docs: preview  
							
							... 
							
							
							
							(cherry picked from commit 3f36b57363 
							
						 
						
							2023-09-19 20:00:08 +08:00  
				
					
						
							
							
								 
						
							
							
								4eccb44c88 
								
							
								 
							
						 
						
							
							
								
								docs: update deps  
							
							... 
							
							
							
							(cherry picked from commit 5037aa593e 
							
						 
						
							2023-09-19 19:59:39 +08:00  
				
					
						
							
							
								 
						
							
							
								a13e2f48ec 
								
							
								 
							
						 
						
							
							
								
								chore: update deps  
							
							... 
							
							
							
							(cherry picked from commit af10ccb39a 
							
						 
						
							2023-09-19 19:59:31 +08:00  
				
					
						
							
							
								 
						
							
							
								4cef3e3e5f 
								
							
								 
							
						 
						
							
							
								
								登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度  
							
							... 
							
							
							
							(cherry picked from commit ee802d6335 
							
						 
						
							2023-09-19 19:59:19 +08:00  
				
					
						
							
							
								 
						
							
							
								9fd5a9d7f4 
								
									
								
							
								 
							
						 
						
							
							
								
								!242  fix: 个人中心头像为空时不能修改  
							
							... 
							
							
							
							Merge pull request !242  from clockdotnet/master-vxe 
							
						 
						
							2023-09-11 12:19:21 +00:00  
				
					
						
							
							
								 
						
							
							
								6704805af4 
								
							
								 
							
						 
						
							
							
								
								fix: 个人中心头像为空时不能修改  
							
							
							
						 
						
							2023-09-11 16:35:04 +08:00  
				
					
						
							
							
								 
						
							
							
								bdaeb75ccc 
								
							
								 
							
						 
						
							
							
								
								fix: 个人中心头像为空时不能修改  
							
							... 
							
							
							
							(cherry picked from commit e6a9dd0e4c 
							
						 
						
							2023-09-11 16:10:27 +08:00  
				
					
						
							
							
								 
						
							
							
								a15d777afb 
								
									
								
							
								 
							
						 
						
							
							
								
								!214  增加部门和菜单的详情,解决个人中心无法上传图片的问题  
							
							... 
							
							
							
							Merge pull request !214  from clockdotnet/master-vxe 
							
						 
						
							2023-08-23 16:58:45 +00:00  
				
					
						
							
							
								 
						
							
							
								4d798c82df 
								
							
								 
							
						 
						
							
							
								
								密码提示问题  
							
							
							
						 
						
							2023-08-23 13:51:04 +08:00  
				
					
						
							
							
								 
						
							
							
								b376e8e2a8 
								
							
								 
							
						 
						
							
							
								
								增加部门和菜单的详情,解决个人中心无法上传图片的问题  
							
							
							
						 
						
							2023-08-22 17:33:04 +08:00  
				
					
						
							
							
								 
						
							
							
								7eced09de0 
								
							
								 
							
						 
						
							
							
								
								个人中心重置及校验问题,部分表单增加校验  
							
							
							
						 
						
							2023-08-16 17:31:28 +08:00  
				
					
						
							
							
								 
						
							
							
								fd46445147 
								
									
								
							
								 
							
						 
						
							
							
								
								!185  master-vxe分支合并master分支1.8.0版本的修改  
							
							... 
							
							
							
							Merge pull request !185  from clockdotnet/master-vxe 
							
						 
						
							2023-07-28 00:48:31 +00:00  
				
					
						
							
							
								 
						
							
							
								5620a9da6a 
								
							
								 
							
						 
						
							
							
								
								发布 1.8.0 版本  
							
							
							
						 
						
							2023-07-27 23:33:28 +08:00  
				
					
						
							
							
								 
						
							
							
								7b3b89fc9a 
								
							
								 
							
						 
						
							
							
								
								发布 1.8.0 版本  
							
							
							
						 
						
							2023-07-27 22:11:53 +08:00  
				
					
						
							
							
								 
						
							
							
								206ede95cf 
								
							
								 
							
						 
						
							
							
								
								发布 1.8.0 版本  
							
							
							
						 
						
							2023-07-27 21:10:28 +08:00  
				
					
						
							
							
								 
						
							
							
								74aac991bc 
								
							
								 
							
						 
						
							
							
								
								发布 1.8.0 版本  
							
							
							
						 
						
							2023-07-27 20:53:52 +08:00  
				
					
						
							
							
								 
						
							
							
								2104de6a71 
								
							
								 
							
						 
						
							
							
								
								review 秒杀、拼团活动的 CRUD  
							
							... 
							
							
							
							(cherry picked from commit a003b59e39 
							
						 
						
							2023-07-27 19:51:42 +08:00  
				
					
						
							
							
								 
						
							
							
								8641221274 
								
							
								 
							
						 
						
							
							
								
								!183  同步商城实现 Merge pull request  !183  from 芋道源码/dev  
							
							
							
						 
						
							2023-07-27 19:50:13 +08:00  
				
					
						
							
							
								 
						
							
							
								84d538ad69 
								
							
								 
							
						 
						
							
							
								
								fix: 完善拼团活动 CRUD  
							
							... 
							
							
							
							(cherry picked from commit dc39ad0cd1 
							
						 
						
							2023-07-27 19:45:36 +08:00  
				
					
						
							
							
								 
						
							
							
								e7e0c7a6b7 
								
							
								 
							
						 
						
							
							
								
								update src/views/Login/components/MobileForm.vue.  
							
							... 
							
							
							
							我发现,这个手机号登陆时,登陆成功了但是没有自动跳转,我手动路由到/,又自动跳转到登陆页面,应该是token没存进去,我就照这loginform的逻辑修改了一下
Signed-off-by: water <2778335106@qq.com>
(cherry picked from commit b061c8f32b 
							
						 
						
							2023-07-27 19:44:36 +08:00  
				
					
						
							
							
								 
						
							
							
								85cc7cdb46 
								
							
								 
							
						 
						
							
							
								
								fix: mall SeckillConfig  
							
							... 
							
							
							
							(cherry picked from commit 3fd9f1b43e 
							
						 
						
							2023-07-27 19:43:51 +08:00  
				
					
						
							
							
								 
						
							
							
								5e0d09769d 
								
							
								 
							
						 
						
							
							
								
								fix: login error  
							
							... 
							
							
							
							(cherry picked from commit 44efb13c0e 
							
						 
						
							2023-07-27 19:43:43 +08:00  
				
					
						
							
							
								 
						
							
							
								a7fe002abd 
								
							
								 
							
						 
						
							
							
								
								fix: eslint  
							
							... 
							
							
							
							(cherry picked from commit ba1254f397 
							
						 
						
							2023-07-27 19:43:38 +08:00  
				
					
						
							
							
								 
						
							
							
								469e81c963 
								
							
								 
							
						 
						
							
							
								
								chore: update deps  
							
							... 
							
							
							
							(cherry picked from commit 540d8496b3 
							
						 
						
							2023-07-27 19:43:22 +08:00  
				
					
						
							
							
								 
						
							
							
								a507f26664 
								
							
								 
							
						 
						
							
							
								
								fix: mall SeckillActivity  
							
							... 
							
							
							
							(cherry picked from commit b67fabcf1f 
							
						 
						
							2023-07-27 19:41:28 +08:00  
				
					
						
							
							
								 
						
							
							
								0394f81dab 
								
							
								 
							
						 
						
							
							
								
								fix: mall SeckillActivity and CombinationActivity  
							
							... 
							
							
							
							(cherry picked from commit 4057130275 
							
						 
						
							2023-07-27 19:41:21 +08:00  
				
					
						
							
							
								 
						
							
							
								d1cc7d134b 
								
							
								 
							
						 
						
							
							
								
								fix: mall SeckillActivity  
							
							... 
							
							
							
							(cherry picked from commit ce3ca7c6ce 
							
						 
						
							2023-07-27 19:41:03 +08:00  
				
					
						
							
							
								 
						
							
							
								de53abb249 
								
							
								 
							
						 
						
							
							
								
								fix: mall SeckillActivity  
							
							... 
							
							
							
							(cherry picked from commit 36c0bce184 
							
						 
						
							2023-07-27 19:40:57 +08:00  
				
					
						
							
							
								 
						
							
							
								1ab348f8df 
								
							
								 
							
						 
						
							
							
								
								fix: mall SeckillActivity  
							
							... 
							
							
							
							(cherry picked from commit b98149f1a7 
							
						 
						
							2023-07-27 19:40:48 +08:00  
				
					
						
							
							
								 
						
							
							
								e8088415d9 
								
							
								 
							
						 
						
							
							
								
								!155  fix: 处理 window.bpmnInstances 有时候为 undefined 问题 Merge pull request  !155  from OlyLis/master  
							
							
							
						 
						
							2023-07-27 19:40:20 +08:00  
				
					
						
							
							
								 
						
							
							
								23fa3fe14c 
								
							
								 
							
						 
						
							
							
								
								review 积分配置  
							
							... 
							
							
							
							(cherry picked from commit 4571f893ed 
							
						 
						
							2023-07-27 19:37:26 +08:00  
				
					
						
							
							
								 
						
							
							
								401112f668 
								
							
								 
							
						 
						
							
							
								
								review 秒杀活动  
							
							... 
							
							
							
							(cherry picked from commit b1ce2672e4 
							
						 
						
							2023-07-27 19:37:02 +08:00