Merge branch 'main' of http://124.243.245.42:3000/sdz/ks-app-employment-service

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'
+					});
+				}
 			});
 		});
 	};

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)
 			}
 		});
 	}

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");
 				}
 			}
-			
 		}
 	}
 

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 发送全局事件，通知页面显示登录弹窗