From 1da5df831c270922fb595a1604af95c1242311d2 Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Tue, 23 Dec 2025 12:40:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8B=9B=E8=81=98=E4=BC=9A=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/pages/exhibitors/exhibitors.vue | 10 +++++-----
 pages/careerfair/careerfair.vue          | 25 ++++++++++++------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue
index ba7533d..6ca78cb 100644
--- a/packageA/pages/exhibitors/exhibitors.vue
+++ b/packageA/pages/exhibitors/exhibitors.vue
@@ -294,11 +294,11 @@
 				}
 			} else {
 				$api.msg('请先登录');
-				setTimeout(() => {
-					uni.redirectTo({
-						url: '/packageB/login'
-					})
-				}, 1000)
+				// setTimeout(() => {
+				// 	uni.redirectTo({
+				// 		url: '/packageB/login'
+				// 	})
+				// }, 1000)
 			}
 		});
 	}
diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index f6f9e7d..7230dc7 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -187,6 +187,7 @@
 		var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100);
 		if (resLogin.code=='200') {
 			uni.setStorageSync('Padmin-Token', resLogin.data.access_token)
+			isLogin.value = true;
 			return true;
 		}else{
 			uni.showToast({
@@ -215,20 +216,20 @@
 	};
 
 	async function goDetail(jobFairId){
-		if(await thirdLogin('1')){
-			if(state.current != 3){
+			if(state.current != 3 ){
+				await thirdLogin()
 				navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId)
 			}else{
-				console.log(userInfo.value, 'userInfo');
-				if(userInfo.value){
-					if(userInfo.value.userType=='ent'){
-						navTo('/packageB/jobFair/detailCom?jobFairId=' + jobFairId)
-					}else{
-						navTo('/packageB/jobFair/detailPerson?jobFairId=' + jobFairId)
+				if(await thirdLogin('1')){
+					if(userInfo.value){
+						if(userInfo.value.userType=='ent'){
+							navTo('/packageB/jobFair/detailCom?jobFairId=' + jobFairId)
+						}else{
+							navTo('/packageB/jobFair/detailPerson?jobFairId=' + jobFairId)
+						}
 					}
 				}
 			}
-		}	
 	}
 
 	function toSelectDate() {
@@ -259,17 +260,16 @@
 	}
 
 	async function seemsg(index) {
-		
-		state.current = index;
 		if (index != 3) {
+			state.current = index;
 			getFair("refresh");
 		} else {
-			
 			if(await thirdLogin('1')){
 				if (!isLogin.value) {
 					getHeart();
 					return;
 				}
+				state.current = index;
 				// 确保获取到用户信息后再请求“我参与的”列表
 				if (!userInfo.value?.info?.userId) {
 					getUser().then(() => {
@@ -279,7 +279,6 @@
 					getMyFair("refresh");
 				}
 			}
-			
 		}
 	}