Merge remote-tracking branch 'origin/main'

# Conflicts:
#	packageA/pages/UnitDetails/UnitDetails.vue
#	pages.json
#	pages/careerfair/careerfair.vue

pages/careerfair/careerfair.vue

@@ -167,7 +167,7 @@
 		console.log("登录成功");
 		// 可以在这里添加登录成功后的处理逻辑
 	};
-	
+
 	function goDetail(jobFairId){
 		if(state.current != 3){
 			navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId)
@@ -793,4 +793,4 @@
 	.cards .card:first-child {
 		margin-top: 0;
 	}
-</style>
+</style>