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 1/3] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=B7=BB=E5=8A=A0=E6=8B=9B=E8=81=98=E4=BC=9A=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=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");
 				}
 			}
-			
 		}
 	}
 

From 84f29ab03e93fdd7929d742d2dca8daf88a2aec2 Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Tue, 23 Dec 2025 13:03:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=90=8E=E5=8E=BB=E9=99=A4Padmin-Token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stores/useUserStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stores/useUserStore.js b/stores/useUserStore.js
index 630f2b6..5fc5864 100644
--- a/stores/useUserStore.js
+++ b/stores/useUserStore.js
@@ -72,7 +72,7 @@ const useUserStore = defineStore("user", () => {
         role.value = {}
         uni.removeStorageSync('userInfo')
         uni.removeStorageSync('token')
-        
+        uni.removeStorageSync('Padmin-Token')
         // 如果需要显示登录弹窗，则通过事件通知页面显示微信登录弹窗
         if (showLoginModal) {
             // 通过 uni.$emit 发送全局事件，通知页面显示登录弹窗

From e465224773e1778f3ce41f23581fec407a48bcdf Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Tue, 23 Dec 2025 17:01:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=8B=9B=E8=81=98?=
 =?UTF-8?q?=E4=BC=9A=E6=8A=A5=E5=90=8D=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=A0=A1?=
 =?UTF-8?q?=E7=A0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/jobfair/signDialog.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/components/jobfair/signDialog.vue b/components/jobfair/signDialog.vue
index 70a1704..6890a57 100644
--- a/components/jobfair/signDialog.vue
+++ b/components/jobfair/signDialog.vue
@@ -274,7 +274,21 @@
 			$api.myRequest("/jobfair/public/job-info/list", data, "GET", 9100, {
 				Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
 			}).then((resData) => {
-				jobList.value = resData.data.list || [];
+				if(resData.code == 200){
+					let isPublishJobList = resData.data.list || [];
+          			jobList.value = isPublishJobList.filter(job => job.isPublish === "1");
+					if (isPublishJobList.length > 0 && jobList.value.length === 0) {
+						uni.showToast({
+							title: '请等待岗位审核通过后，再进行报名',
+							icon: 'none'
+						});
+          			}
+				}else{
+					uni.showToast({
+						title: '请前往基本信息中完善企业信息和岗位信息',
+						icon: 'none'
+					});
+				}
 			});
 		});
 	};