From b07d56801baa0de14acff965b64b20116c7bac86 Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Wed, 24 Dec 2025 17:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=81=98=E4=BC=9A=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/careerfair/careerfair.vue      | 42 +++++++++++++++++-----------
 pages/index/components/index-one.vue | 10 +++----
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index 330db53..5aa3a0a 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -27,7 +27,7 @@
 
 			<!-- 主体内容区域 -->
 			<view class="container-main">
-				<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+				<scroll-view scroll-y class="main-scroll" :class="{fullHeightScroll:!showTabar}" @scrolltolower="handleScrollToLower">
 					<view class="cards" v-if="fairList.length">
 						<view class="card press-button" v-for="(item, index) in fairList" :key="index"
 							@click="goDetail(item.jobFairId)">
@@ -74,10 +74,12 @@
 				</scroll-view>
 			</view>
 			<!-- 自定义tabbar -->
-			<CustomTabBar :currentPage="5" />
+			<template v-if="showTabar">
+				<CustomTabBar :currentPage="5" />
+			</template>
 
 			<!-- 微信授权登录弹窗 -->
-			<WxAuthLogin ref="wxAuthLoginRef" @success="handleLoginSuccess"></WxAuthLogin>
+			<!-- <WxAuthLogin ref="wxAuthLoginRef" @success="handleLoginSuccess"></WxAuthLogin> -->
 		</view>
 	</view>
 </template>
@@ -108,7 +110,7 @@
 		longitudeVal,
 		latitudeVal
 	} = storeToRefs(useLocationStore());
-	const wxAuthLoginRef = ref(null);
+	// const wxAuthLoginRef = ref(null);
 	const {
 		$api,
 		navTo,
@@ -131,7 +133,7 @@
 		jobFairTitle: "",
 	});
 	const baseUrl = config.imgBaseUrl;
-
+	const showTabar = ref(false);
 	onLoad(async () => {
 		// const today = new Date();
 		// const year = today.getFullYear();
@@ -198,16 +200,22 @@
 		}
 	}
 
-	onMounted(() => {
-		// 监听退出登录事件，显示微信登录弹窗
-		uni.$on("showLoginModal", () => {
-			wxAuthLoginRef.value?.open();
-		});
-	});
-
-	onUnmounted(() => {
-		uni.$off("showLoginModal");
-	});
+	// onMounted(() => {
+	// 	// 监听退出登录事件，显示微信登录弹窗
+	// 	uni.$on("showLoginModal", () => {
+	// 		wxAuthLoginRef.value?.open();
+	// 	});
+	// });
+	watch(() => userInfo.value.userType, (newVal) => { 
+		if(newVal=='ent'){
+			showTabar.value = true
+		}else{
+			showTabar.value = false
+		}
+	},{ immediate: true ,deep: true})
+	// onUnmounted(() => {
+	// 	uni.$off("showLoginModal");
+	// });
 
 	// 登录成功回调
 	const handleLoginSuccess = () => {
@@ -698,7 +706,9 @@
 		width: 100%;
 		height: calc(100% - 150rpx);
 	}
-
+	.fullHeightScroll{
+		height: 100% !important;
+	}
 	.cards {
 		padding: 28rpx;
 	}
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index fd36b1a..1f59f3f 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -683,11 +683,6 @@ onMounted(() => {
     // 获取企业信息
     getCompanyInfo();
     // pageNull.value = 0;
-    // 监听退出登录事件，显示微信登录弹窗
-    uni.$on('showLoginModal', () => {
-        wxAuthLoginRef.value?.open();
-        pageNull.value = 0;
-    });
 });
 
 onUnmounted(() => {
@@ -695,6 +690,11 @@ onUnmounted(() => {
 });
 
 onShow(() => {
+    // 监听退出登录事件，显示微信登录弹窗
+    uni.$on('showLoginModal', () => {
+        wxAuthLoginRef.value?.open();
+        pageNull.value = 0;
+    });
     // 获取最新的企业信息
     getCompanyInfo();
     //四级联动单点及权限