From 19c48d7c71f36dd4b64918cea862b398ea1c6301 Mon Sep 17 00:00:00 2001
From: liyijie <13605448550@163.com>
Date: Wed, 5 Nov 2025 17:21:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=81=98=E4=BC=9A=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/jobfair/signDialog.vue          |  639 +++++++++
 packageA/pages/UnitDetails/UnitDetails.vue |  686 +++++-----
 packageA/pages/exhibitors/exhibitors.vue   |  153 ++-
 packageA/pages/post/post.vue               |    1 +
 packageB/jobFair/detail.vue                |  559 --------
 packageB/jobFair/detailCom.vue             | 1029 ++++++++++++++
 pages.json                                 |    3 +-
 pages/careerfair/careerfair.vue            | 1428 ++++++++++----------
 pages/index/components/index-one.vue       |    2 -
 9 files changed, 2885 insertions(+), 1615 deletions(-)
 create mode 100644 components/jobfair/signDialog.vue
 delete mode 100644 packageB/jobFair/detail.vue
 create mode 100644 packageB/jobFair/detailCom.vue

diff --git a/components/jobfair/signDialog.vue b/components/jobfair/signDialog.vue
new file mode 100644
index 0000000..1b12efb
--- /dev/null
+++ b/components/jobfair/signDialog.vue
@@ -0,0 +1,639 @@
+<template>
+	<view class="job-dialog">
+		<view class="header-title">
+			<image :src="`${imgBaseUrl}/jobfair/xb.png`" mode=""></image>
+			<text>招聘会报名</text>
+		</view>
+		<view class="dialog-content">
+			<view class="detail-item" v-if="type == 2">
+				<view class="gw-label">选择展区展位：</view>
+				<!-- 展位状态说明 -->
+				<view class="status-description">
+					<view class="status-title">
+						<text>展位状态说明：</text>
+					</view>
+					<view class="status-item">
+						<view class="status-color available"></view>
+						<text class="status-text">未被占用</text>
+					</view>
+					<view class="status-item">
+						<view class="status-color occupied"></view>
+						<text class="status-text">已被占用</text>
+					</view>
+					<view class="status-item">
+						<view class="status-color pending"></view>
+						<text class="status-text">待审核占用</text>
+					</view>
+					<view class="status-item">
+						<view class="status-color selected"></view>
+						<text class="status-text">当前选中</text>
+					</view>
+				</view>
+				<view class="gw-value">
+					<view class="cd-detail" v-for="(item, index) in areaAndBoothList" :key="index">
+						<view class="cd-name">{{ item.jobFairAreaName }}</view>
+						<view class="cd-con">
+							<view class="cd-con-item" :class="getBoothStatusClass(booth)"
+								v-for="(booth, boothIndex) in item.boothList" :key="boothIndex"
+								@click="selectBooth(booth, item.jobFairAreaId)">
+								<text>{{ booth.jobFairBoothName }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="detail-item">
+				<view class="gw-label">请选择招聘岗位：</view>
+				<view class="gw-value">
+					<view class="checkbox-group">
+						<view class="checkbox-item job-item" v-for="(item, index) in jobList" :key="index"
+							:class="{ 'checked': checkList.includes(item) }" @click="toggleJobSelection(item)">
+							<view class="item-checkbox">
+								<view class="checkbox-icon" :class="{ 'checked': checkList.includes(item) }">
+									<text v-if="checkList.includes(item)">✓</text>
+								</view>
+								<view class="job-info">
+									<view class="job-name">{{ item.jobTitle }}</view>
+									<view class="salary">{{ item.salaryRange }}元/月</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="detail-item">
+				<view class="gw-label">请上传招聘海报：</view>
+				<view class="gw-value">
+					<view v-if="imageUrl">
+						<image v-if="imageUrl" :src="publicUrl + '/file/file/minio' + imageUrl" class="avatar"
+							mode="aspectFit" />
+						<button type="warn" class="del-icon" @click="imageUrl = ''" size="mini">删除</button>
+					</view>
+					<view v-else>
+						<button @click="chooseImage" class="avatar-uploader transparent-btn" type="default">
+							<view class="avatar-uploader-icon">+</view>
+						</button>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="btn-box">
+			<button style="background: #409EFF;color: #fff;" @click="submitForm">提交</button>
+			<button type="default" @click="closeDialog">取消</button>
+		</view>
+	</view>
+
+</template>
+
+<script setup>
+	import config from "@/config.js"
+	import {
+		ref,
+		reactive,
+		onMounted,
+		nextTick,
+		watch,
+		inject
+	} from 'vue';
+
+	const emit = defineEmits(['closePopup']);
+	import {
+		createRequest
+	} from '@/utils/request.js';
+	const {
+		$api
+	} = inject('globalFunction');
+
+	// 定义props
+	const props = defineProps({
+		// 招聘会类型1线上   2线下
+		signType: {
+			type: Number,
+			default: 1
+		},
+		// 报名角色  ent企业   person个人
+		signRole: {
+			type: String,
+			default: 'ent'
+		},
+		// 招聘会id
+		jobFairId: {
+			type: String,
+			default: ''
+		}
+	});
+
+	// 监听props变化
+	watch(() => props.signType, (newVal) => {
+		type.value = newVal;
+	});
+
+	// 响应式数据
+	const checkList = ref([]);
+	const imageUrl = ref('');
+	const type = ref('');
+	const id = ref('');
+	const jobList = ref([]);
+	const userId = ref('');
+	const areaAndBoothList = ref([]);
+	const jobFairAreaId = ref(null);
+	const jobFairBoothId = ref(null);
+	const avatarUploader = ref(null);
+
+	// 配置
+	const publicUrl = config.LCBaseUrl;
+	const imgBaseUrl = config.imgBaseUrl
+	const uploadUrl = config.LCBaseUrl + "/file/file/upload";
+
+	// 方法
+	const selectBooth = (booth, jobFairAreaIdVal) => {
+		if (booth.status == 0) {
+			jobFairBoothId.value = booth.jobFairBoothId;
+			jobFairAreaId.value = jobFairAreaIdVal;
+		}
+	};
+
+	const submitForm = async () => {
+		if (type.value == "2") {
+			if (!jobFairBoothId.value || !jobFairAreaId.value) {
+				uni.showToast({
+					title: '请选择展区展位',
+					icon: 'none'
+				});
+				return;
+			}
+		}
+		if (checkList.value.length === 0) {
+			uni.showToast({
+				title: '请选择招聘岗位',
+				icon: 'none'
+			});
+			return;
+		}
+		if (!imageUrl.value) {
+			uni.showToast({
+				title: '请上传招聘海报',
+				icon: 'none'
+			});
+			return;
+		}
+
+		$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, {
+			Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+		}).then((userInfo) => {
+			let data = {}
+			if (type.value == "2") {
+				data = {
+					jobFairId: id.value,
+					enterpriseId: userInfo.info.userId,
+					jobInfoList: checkList.value,
+					poster: imageUrl.value,
+					jobFairAreaId: jobFairAreaId.value,
+					jobFairBoothId: jobFairBoothId.value,
+					code: userInfo.info.entCreditCode
+				};
+			} else {
+				data = {
+					jobFairId: id.value,
+					enterpriseId: userInfo.info.userId,
+					jobInfoList: checkList.value,
+					poster: imageUrl.value,
+					code: userInfo.info.entCreditCode
+				};
+			}
+			$api.myRequest("/jobfair/public/job-fair-sign-up-enterprise/sign-up", data, "post", 9100, {
+				Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+			}).then((res) => {
+				if (res.code === 200) {
+					uni.showToast({
+						title: '报名成功',
+						icon: 'success'
+					});
+					closeDialog();
+				} else {
+					uni.showToast({
+						title: res.msg || '报名失败',
+						icon: 'none'
+					});
+				}
+			});
+		})
+	};
+
+	const closeDialog = () => {
+		checkList.value = [];
+		imageUrl.value = '';
+		jobFairBoothId.value = null;
+		jobFairAreaId.value = null;
+		emit('closePopup')
+	};
+
+	const handleAvatarSuccess = (response) => {
+		imageUrl.value = response.data.url;
+		uni.showToast({
+			title: '海报上传成功',
+			icon: 'success'
+		});
+	};
+
+	const showDialog = (dialogType, dialogId) => {
+		type.value = dialogType;
+		id.value = dialogId;
+		nextTick(() => {
+			getJobList();
+			if (type.value === "2") {
+				getAreaAndBoothInfo();
+			}
+		});
+	};
+
+	// 展区展位列表
+	const getAreaAndBoothInfo = () => {
+		const data = {
+			jobFairId: props.jobFairId,
+		}
+		$api.myRequest("/jobfair/public/jobfair/area-and-booth-info-by-job-fair-id", data, "GET", 9100, {
+			Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+		}).then((resData) => {
+			areaAndBoothList.value = resData.data || [];
+		});
+	};
+
+	// 岗位列表
+	const getJobList = () => {
+		$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, {
+			Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+		}).then((userInfo) => {
+			const data = {
+				jobFairId: id.value,
+				enterpriseId: userInfo.info.userId,
+				pageNum: 1,
+				pageSize: 1000,
+				code: userInfo.info.entCreditCode
+			}
+			$api.myRequest("/jobfair/public/job-info/list", data, "GET", 9100, {
+				Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+			}).then((resData) => {
+				jobList.value = resData.data.list || [];
+			});
+		});
+	};
+
+	const getBoothStatusClass = (booth) => {
+		const s = booth.status || 0;
+		if (s == 1) return "cd-con-item-checked";
+		if (s == 2) return "cd-con-item-review";
+		if (jobFairBoothId.value && jobFairBoothId.value == booth.jobFairBoothId)
+			return "cd-con-item-mychecked";
+		return "";
+	};
+
+	// 选择图片
+	const chooseImage = () => {
+		uni.chooseImage({
+			count: 1,
+			sizeType: ['original', 'compressed'],
+			sourceType: ['album', 'camera'],
+			success: (res) => {
+				const tempFilePath = res.tempFilePaths[0];
+				uploadImage(tempFilePath);
+			}
+		});
+	};
+
+	// 上传图片
+	const uploadImage = (tempFilePath) => {
+		uni.uploadFile({
+			url: uploadUrl,
+			filePath: tempFilePath,
+			name: 'file',
+			success: (uploadFileRes) => {
+				try {
+					const response = JSON.parse(uploadFileRes.data);
+					handleAvatarSuccess(response);
+				} catch (e) {
+					uni.showToast({
+						title: '上传失败，请重试',
+						icon: 'none'
+					});
+				}
+			},
+			fail: (err) => {
+				console.error('上传失败:', err);
+				uni.showToast({
+					title: '上传失败，请重试',
+					icon: 'none'
+				});
+			}
+		});
+	};
+
+	// 切换岗位选择
+	const toggleJobSelection = (item) => {
+		const index = checkList.value.indexOf(item);
+		if (index > -1) {
+			checkList.value.splice(index, 1);
+		} else {
+			checkList.value.push(item);
+		}
+	};
+
+	// 暴露方法给父组件
+	defineExpose({
+		showDialog
+	});
+
+	onMounted(() => {
+		setTimeout(() => {
+			type.value = props.signType;
+			if (props.jobFairId) {
+				id.value = props.jobFairId;
+				getJobList();
+				if (props.signType == 2) {
+					getAreaAndBoothInfo();
+				}
+			}
+		}, 100);
+	});
+
+	// 监听jobFairId变化
+	watch(() => props.jobFairId, (newVal) => {
+		if (newVal) {
+			id.value = newVal;
+			getJobList();
+			if (type.value === 2) {
+				getAreaAndBoothInfo();
+			}
+		}
+	});
+</script>
+
+<style lang="scss" scoped>
+	.del-icon {
+		margin-left: 30rpx;
+	}
+
+	.btn-box {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-top: 30rpx;
+	}
+
+	.btn-box button {
+		padding: 0 80rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+
+	.avatar-uploader {
+		border: 2rpx solid #0983ff;
+		border-radius: 12rpx;
+		cursor: pointer;
+		position: relative;
+		overflow: hidden;
+		width: 400rpx;
+		height: 200rpx;
+	}
+
+	.avatar-uploader-icon {
+		font-size: 56rpx;
+		color: #007AFF;
+		line-height: 200rpx;
+		text-align: center;
+	}
+
+	.job-dialog {
+		width: 100%;
+		height: 100%;
+	}
+
+	.dialog-content {
+		padding: 0 20rpx;
+		height: calc(100% - 17vh);
+		overflow-y: auto;
+		box-sizing: border-box;
+	}
+
+	.checkbox-group {
+		width: 100%;
+	}
+
+	.checkbox-item {
+		display: flex;
+		align-items: center;
+		border-bottom: 2rpx solid #b5d3ff;
+		padding: 30rpx 0;
+	}
+
+	.job-item {
+		width: 97%;
+	}
+
+	.checkbox-icon {
+		width: 40rpx;
+		height: 40rpx;
+		border: 2rpx solid #ddd;
+		border-radius: 8rpx;
+		margin-right: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.checkbox-icon.checked {
+		background-color: #409eff;
+		border-color: #409eff;
+		color: white;
+	}
+
+	.job-info {
+		flex: 1;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.detail-item {
+		margin-bottom: 40rpx;
+	}
+
+	.detail-item .gw-label {
+		font-size: 32rpx;
+		color: #333333;
+		margin-bottom: 20rpx;
+	}
+
+	.detail-item .gw-value {
+		display: flex;
+		flex-wrap: wrap;
+		overflow-y: auto;
+	}
+
+	.detail-item .gw-value .cd-detail {
+		width: 100%;
+		background: #fff;
+		border-radius: 20rpx;
+		margin-bottom: 28rpx;
+		margin-top: 28rpx;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-name {
+		background: #d3e8ff;
+		color: #0076d9;
+		font-size: 40rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		padding: 0 40rpx;
+		border-radius: 16rpx;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-name::after {
+		content: "";
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 10rpx;
+		height: 100%;
+		background: #349cfc;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+		padding: 30rpx 40rpx;
+		gap: 20rpx;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con .cd-con-item {
+		width: 80rpx;
+		height: 80rpx;
+		background: #67CFA7;
+		line-height: 80rpx;
+		text-align: center;
+		color: #fff;
+		border: 2rpx solid #ddd;
+		border-radius: 20rpx;
+		cursor: pointer;
+		font-weight: 600;
+		font-size: 32rpx;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con .cd-con-item-review {
+		background-color: #F8BB92;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con .cd-con-item-checked {
+		background: #F6A1A1;
+	}
+
+	.detail-item .gw-value .cd-detail .cd-con .cd-con-item-mychecked {
+		background: #79BEFE;
+	}
+
+	.item-checkbox {
+		width: 100%;
+		padding: 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.job-name {
+		font-size: 32rpx;
+		color: #409eff;
+	}
+
+	.salary {
+		font-size: 32rpx;
+		color: #ff6e27;
+		font-weight: 600;
+	}
+
+	.header-title {
+		font-size: 38rpx;
+		font-weight: 600;
+		color: #303133;
+		padding: 20rpx;
+		padding-bottom: 40rpx;
+		background: #fff;
+		display: flex;
+		align-items: center;
+		position: sticky;
+		top: 0;
+	}
+
+	.header-title image {
+		width: 14rpx;
+		height: 33rpx;
+		margin-right: 14rpx;
+	}
+
+	.avatar {
+		width: 400rpx;
+		height: 200rpx;
+		border-radius: 12rpx;
+	}
+
+	/* 展位状态说明样式 */
+	.status-description {
+		margin-top: 30rpx;
+		padding: 20rpx;
+		background-color: #f5f7fa;
+		border-radius: 8rpx;
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+	}
+
+	.status-title {
+		font-weight: bold;
+		margin-bottom: 16rpx;
+		width: 100%;
+	}
+
+	.status-item {
+		width: 43%;
+		display: flex;
+		align-items: center;
+		margin-right: 30rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.status-color {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 16rpx;
+	}
+
+	.status-color.available {
+		background-color: #67CFA7;
+		border: 2rpx solid #ddd;
+	}
+
+	.status-color.occupied {
+		background-color: #F6A1A1;
+	}
+
+	.status-color.pending {
+		background-color: #F8BB92;
+	}
+
+	.status-color.selected {
+		background-color: #79BEFE;
+	}
+
+	.status-text {
+		margin-right: 16rpx;
+	}
+
+	/* 透明按钮样式 */
+	.transparent-btn {
+		background: transparent !important;
+		border: 2rpx dashed #0983ff !important;
+	}
+</style>
\ No newline at end of file
diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue
index c11cc7d..bafa516 100644
--- a/packageA/pages/UnitDetails/UnitDetails.vue
+++ b/packageA/pages/UnitDetails/UnitDetails.vue
@@ -1,353 +1,417 @@
 <template>
-  <AppLayout title="" :use-scroll-view="false">
-    <template #headerleft>
-      <view class="btnback">
-        <image src="@/static/icon/back.png" @click="navBack"></image>
-      </view>
-    </template>
-    <template #headerright>
-      <view class="btn mar_ri10">
-        <image
-          src="@/static/icon/collect3.png"
-          v-if="!companyInfo.isCollection"
-        ></image>
-        <image src="@/static/icon/collect2.png" v-else></image>
-      </view>
-    </template>
-    <view class="content">
-      <view class="content-top">
-        <view class="companyinfo-left">
-          <image src="@/static/icon/companyIcon.png" mode=""></image>
-        </view>
-        <view class="companyinfo-right">
-          <view class="row1">{{ companyInfo?.companyName }}</view>
-          <view class="row2">
-            {{ companyInfo?.scale }}
-          </view>
-        </view>
-      </view>
-      <view class="conetent-info" :class="{ expanded: isExpanded }">
-        <view class="info-title">公司介绍</view>
-        <view class="info-desirption">{{
+	<AppLayout title="" :use-scroll-view="false">
+		<template #headerleft>
+			<view class="btnback">
+				<image src="@/static/icon/back.png" @click="navBack"></image>
+			</view>
+		</template>
+		<template #headerright>
+			<view class="btn mar_ri10">
+				<image src="@/static/icon/collect3.png" v-if="!companyInfo.isCollection"></image>
+				<image src="@/static/icon/collect2.png" v-else></image>
+			</view>
+		</template>
+		<view class="content">
+			<view class="content-top">
+				<view class="companyinfo-left">
+					<image src="@/static/icon/companyIcon.png" mode=""></image>
+				</view>
+				<view class="companyinfo-right">
+					<view class="row1">{{ companyInfo?.companyName }}</view>
+					<view class="row2">
+						{{ companyInfo?.scale }}
+					</view>
+				</view>
+			</view>
+			<view class="conetent-info" :class="{ expanded: isExpanded }">
+				<view class="info-title">公司介绍</view>
+				<view class="info-desirption">{{
           companyInfo.companyIntroduction
         }}</view>
-        <!-- <view class="info-title title2">公司地址</view>
+				<!-- <view class="info-title title2">公司地址</view>
                 <view class="locationCompany"></view> -->
-      </view>
-      <view class="expand" @click="expand">
-        <text>{{ isExpanded ? "收起" : "展开" }}</text>
-        <image
-          class="expand-img"
-          :class="{ 'expand-img-active': !isExpanded }"
-          src="@/static/icon/downs.png"
-        ></image>
-      </view>
-      <scroll-view scroll-y class="Detailscroll-view">
-        <view class="views">
-          <view class="Detail-title"><text class="title">在招职位</text></view>
-          <template v-if="companyInfo.jobInfoList.length != 0">
-            <view v-for="job in companyInfo.jobInfoList" :key="job.id">
-              <!-- @click="navTo(`/packageA/pages/post/post?jobId=${JSON.stringify(job)}`)" -->
-              <view class="cards" :style="getItemBackgroundStyle('bj2.png')">
-                <view class="card-company">
-                  <text class="company">{{ job.jobTitle }}</text>
-                  <view class="salary"> ￥{{ job.salaryRange }}/月 </view>
-                </view>
-                <view class="card-tags">
-                  <view class="tag jy">
-									  <image :src="`${baseUrl}/jobfair/jy.png`" mode=""></image>
-                    {{ job.experienceRequirement }}
-                  </view>
-                  <view class="tag xl">
-									<image :src="`${baseUrl}/jobfair/xx.png`" mode=""></image>
-                    {{ job.educationRequirement }}
-                  </view>
-                  <view class="tag yd" v-if="job.jobRequirement">
-									<image :src="`${baseUrl}/jobfair/lx-1.png`" mode=""></image>
-                    {{ job.jobRequirement }}
-                  </view>
-                </view>
-                <view class="card-companyName">
-									<image :src="`${baseUrl}/jobfair/hd.png`" mode=""></image>
-                  {{ job.jobDescription }}
-                  </view>
-
-              </view>
-            </view>
-          </template>
-          <empty v-else pdTop="200"></empty>
-        </view>
-      </scroll-view>
-    </view>
-  </AppLayout>
+			</view>
+			<view class="expand" @click="expand">
+				<text>{{ isExpanded ? "收起" : "展开" }}</text>
+				<image class="expand-img" :class="{ 'expand-img-active': !isExpanded }" src="@/static/icon/downs.png">
+				</image>
+			</view>
+			<scroll-view scroll-y class="Detailscroll-view">
+				<view class="views">
+					<view class="Detail-title"><text class="title">在招职位</text></view>
+					<template v-if="companyInfo.jobInfoList.length != 0">
+						<view v-for="job in companyInfo.jobInfoList" :key="job.id">
+							<!-- @click="navTo(`/packageA/pages/post/post?jobId=${JSON.stringify(job)}`)" -->
+							<!--  :style="getItemBackgroundStyle('bj2.png')" -->
+							<view class="cards">
+								<view class="card-company">
+									<text class="company">{{ job.jobTitle }}</text>
+									<view class="salary"> ￥{{ job.salaryRange }}/月 </view>
+								</view>
+								<view class="card-tags">
+									<view class="tag jy">
+										<image :src="`${baseUrl}/jobfair/jy.png`" mode=""></image>
+										{{ job.experienceRequirement }}
+									</view>
+									<view class="tag xl">
+										<image :src="`${baseUrl}/jobfair/xx.png`" mode=""></image>
+										{{ job.educationRequirement }}
+									</view>
+									<view class="tag yd" v-if="job.jobRequirement">
+										<image :src="`${baseUrl}/jobfair/lx-1.png`" mode=""></image>
+										{{ job.jobRequirement }}
+									</view>
+								</view>
+								<view class="card-companyName">
+									{{ job.jobDescription }}
+								</view>
+								<view class="deliver-box">
+									<view class="deliver-btn" @click="deliverResume">
+										简历投递
+									</view>
+								</view>
+							</view>
+						</view>
+					</template>
+					<empty v-else pdTop="200"></empty>
+				</view>
+			</scroll-view>
+		</view>
+	</AppLayout>
 </template>
 
 <script setup>
-import { reactive, inject, watch, ref, onMounted, computed } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
-import dictLabel from "@/components/dict-Label/dict-Label.vue";
-import config from "@/config.js";
-import { storeToRefs } from "pinia";
-import useLocationStore from "@/stores/useLocationStore";
-const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
-const { $api, navTo, vacanciesTo, navBack } = inject("globalFunction");
-const isExpanded = ref(false);
-const pageState = reactive({
-  page: 0,
-  list: [],
-  total: 0,
-  maxPage: 1,
-  pageSize: 10,
-});
-const companyInfo = ref({
-  jobInfoList: [],
-});
+	import {
+		reactive,
+		inject,
+		watch,
+		ref,
+		onMounted,
+		computed
+	} from "vue";
+	import {
+		onLoad,
+		onShow
+	} from "@dcloudio/uni-app";
+	import dictLabel from "@/components/dict-Label/dict-Label.vue";
+	import config from "@/config.js";
+	import {
+		storeToRefs
+	} from "pinia";
+	import useLocationStore from "@/stores/useLocationStore";
+	const {
+		longitudeVal,
+		latitudeVal
+	} = storeToRefs(useLocationStore());
+	const {
+		$api,
+		navTo,
+		vacanciesTo,
+		navBack
+	} = inject("globalFunction");
+	const isExpanded = ref(false);
+	const pageState = reactive({
+		page: 0,
+		list: [],
+		total: 0,
+		maxPage: 1,
+		pageSize: 10,
+	});
+	const companyInfo = ref({
+		jobInfoList: [],
+	});
 
-const baseUrl = config.imgBaseUrl;
-const getItemBackgroundStyle = (imageName) => ({
-  backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
-  backgroundSize: "100% 100%", // 覆盖整个容器
-  backgroundPosition: "center", // 居中
-  backgroundRepeat: "no-repeat",
-});
+	const baseUrl = config.imgBaseUrl;
+	const getItemBackgroundStyle = (imageName) => ({
+		backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
+		backgroundSize: "100% 100%", // 覆盖整个容器
+		backgroundPosition: "center", // 居中
+		backgroundRepeat: "no-repeat",
+	});
 
-onLoad((options) => {
-  companyInfo.value = JSON.parse(options.job);
-  console.log(companyInfo.value, "companyInfo.value");
-});
+	onLoad((options) => {
+		companyInfo.value = JSON.parse(options.job);
+	});
 
-function expand() {
-  isExpanded.value = !isExpanded.value;
-}
+	function expand() {
+		isExpanded.value = !isExpanded.value;
+	}
+
+	function deliverResume() {
+		const raw = uni.getStorageSync("Padmin-Token");
+		const token = typeof raw === "string" ? raw.trim() : "";
+		const headers = token ? {
+			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
+		} : {};
+
+		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData1) => {
+			if (resData1.code == 200) {
+				$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, headers).then((resData) => {
+					$api.myRequest("/jobfair/public/job-fair-person-job/insert", {}, "GET", 9100, {
+						"Content-Type": "application/json"
+					}).then((data) => {
+						if (data && data.code === 200) {
+							$api.msg("简历投递成功");
+						} else {
+							$api.msg((data && data.msg) || "简历投递失败");
+						}
+					});
+				});
+			} else {
+				$api.msg('请先登录')
+			}
+		});
+
+	}
 </script>
 
 <style lang="stylus" scoped>
-.btnback {
-  width: 64rpx;
-  height: 64rpx;
-}
+	.btnback {
+		width: 64rpx;
+		height: 64rpx;
+	}
 
-.btn {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 52rpx;
-  height: 52rpx;
-}
+	.btn {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 52rpx;
+		height: 52rpx;
+	}
 
-image {
-  height: 100%;
-  width: 100%;
-}
+	image {
+		height: 100%;
+		width: 100%;
+	}
 
-.content {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
+	.content {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
 
-  .content-top {
-    padding: 28rpx;
-    padding-top: 50rpx;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
+		.content-top {
+			padding: 28rpx;
+			padding-top: 50rpx;
+			display: flex;
+			flex-direction: row;
+			flex-wrap: nowrap;
 
-    .companyinfo-left {
-      width: 96rpx;
-      height: 96rpx;
-      margin-right: 24rpx;
-    }
+			.companyinfo-left {
+				width: 96rpx;
+				height: 96rpx;
+				margin-right: 24rpx;
+			}
 
-    .companyinfo-right {
-      .row1 {
-        font-weight: 500;
-        font-size: 32rpx;
-        color: #333333;
-      }
+			.companyinfo-right {
+				.row1 {
+					font-weight: 500;
+					font-size: 32rpx;
+					color: #333333;
+				}
 
-      .row2 {
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #6C7282;
-        line-height: 45rpx;
-      }
-    }
-  }
+				.row2 {
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #6C7282;
+					line-height: 45rpx;
+				}
+			}
+		}
 
-  .conetent-info {
-    padding: 0 28rpx;
-    overflow: hidden;
-    max-height: 0rpx;
-    transition: max-height 0.3s ease;
+		.conetent-info {
+			padding: 0 28rpx;
+			overflow: hidden;
+			max-height: 0rpx;
+			transition: max-height 0.3s ease;
 
-    .info-title {
-      font-weight: 600;
-      font-size: 28rpx;
-      color: #000000;
-    }
+			.info-title {
+				font-weight: 600;
+				font-size: 28rpx;
+				color: #000000;
+			}
 
-    .info-desirption {
-      margin-top: 12rpx;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #495265;
-      text-align: justified;
-    }
+			.info-desirption {
+				margin-top: 12rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #495265;
+				text-align: justified;
+			}
 
-    .title2 {
-      margin-top: 48rpx;
-    }
-  }
+			.title2 {
+				margin-top: 48rpx;
+			}
+		}
 
-  .expanded {
-    max-height: 1000rpx; // 足够显示完整内容
-  }
+		.expanded {
+			max-height: 1000rpx; // 足够显示完整内容
+		}
 
-  .expand {
-    display: flex;
-    flex-wrap: nowrap;
-    white-space: nowrap;
-    justify-content: center;
-    margin-top: 20rpx;
-    margin-bottom: 28rpx;
-    font-weight: 400;
-    font-size: 28rpx;
-    color: #256BFA;
+		.expand {
+			display: flex;
+			flex-wrap: nowrap;
+			white-space: nowrap;
+			justify-content: center;
+			margin-top: 20rpx;
+			margin-bottom: 28rpx;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #256BFA;
 
-    .expand-img {
-      width: 40rpx;
-      height: 40rpx;
-    }
+			.expand-img {
+				width: 40rpx;
+				height: 40rpx;
+			}
 
-    .expand-img-active {
-      transform: rotate(180deg);
-    }
-  }
-}
+			.expand-img-active {
+				transform: rotate(180deg);
+			}
+		}
+	}
 
-.Detailscroll-view {
-  flex: 1;
-  overflow: hidden;
-  background: #F4F4F4;
+	.Detailscroll-view {
+		flex: 1;
+		overflow: hidden;
+		background: #F4F4F4;
 
-  .views {
-    padding: 28rpx;
+		.views {
+			padding: 28rpx;
 
-    .Detail-title {
-      font-weight: 600;
-      font-size: 32rpx;
-      color: #000000;
-      position: relative;
-      display: flex;
-      justify-content: space-between;
+			.Detail-title {
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #000000;
+				position: relative;
+				display: flex;
+				justify-content: space-between;
 
-      .title {
-        position: relative;
-        z-index: 2;
-      }
-    }
+				.title {
+					position: relative;
+					z-index: 2;
+				}
+			}
 
-    .Detail-title::before {
-      position: absolute;
-      content: '';
-      left: -14rpx;
-      bottom: 0;
-      height: 16rpx;
-      width: 108rpx;
-      background: linear-gradient(to right, #CBDEFF, #FFFFFF);
-      border-radius: 8rpx;
-      z-index: 1;
-    }
+			.Detail-title::before {
+				position: absolute;
+				content: '';
+				left: -14rpx;
+				bottom: 0;
+				height: 16rpx;
+				width: 108rpx;
+				background: linear-gradient(to right, #CBDEFF, #FFFFFF);
+				border-radius: 8rpx;
+				z-index: 1;
+			}
 
-    .cards {
-      padding: 32rpx;
-      background: #FFFFFF;
-      box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
-      border-radius: 20rpx 20rpx 20rpx 20rpx;
-      margin-top: 22rpx;
-      padding-bottom: 18rpx;
+			.cards {
+				padding: 32rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				margin-top: 22rpx;
+				padding-bottom: 18rpx;
+				background: #f2f8fc;
 
-      .card-company {
-        display: flex;
-        justify-content: space-between;
-        align-items: flex-start;
+				.card-company {
+					display: flex;
+					justify-content: space-between;
+					align-items: flex-start;
+					border-bottom: 1rpx solid #c2d7ea;
 
-        .company {
-          font-weight: 600;
-          font-size: 32rpx;
-          color: #333333;
-        }
+					.company {
+						font-weight: 600;
+						font-size: 32rpx;
+						color: #207AC7;
+					}
 
-        .salary {
-          font-weight: 600;
-          font-size: 28rpx;
-          color: #F83A3C;
-          white-space: nowrap;
-          line-height: 48rpx;
-        }
-      }
+					.salary {
+						font-weight: 600;
+						font-size: 28rpx;
+						color: #F83A3C;
+						white-space: nowrap;
+						line-height: 48rpx;
+					}
+				}
 
-      .card-companyName {
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #fff;
-        margin-top: 23rpx;
-        display: flex;
-        align-items: center;
-        image{
-          width: 24rpx;
-          height: 24rpx;
-          margin-right: 8rpx;
-        }
-      }
+				.deliver-box {
+					width: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					margin-top: 5rpx;
 
-      .card-tags {
-        display: flex;
-        flex-wrap: wrap;
-          margin: 25rpx 0 35rpx;
-          image{
-            width: 24rpx;
-            height: 24rpx;
-            margin-right: 8rpx;
-          }
-        .jy {
-          background: #D9EDFF;
-          color: #0086FF;
-        }
+					.deliver-btn {
+						padding: 10rpx 25rpx;
+						background: #53ACFF;
+						width: max-content;
+						color: #fff;
+					}
+				}
 
-        .xl {
-          background: #FFF1D5;
-          color: #FF7F01;
-        }
-        .yd {
-          background: #FFD8D8;
-          color: #F83A3C;
-        }
+				.card-companyName {
+					font-weight: 400;
+					font-size: 28rpx;
+					margin-top: 23rpx;
+					display: flex;
+					align-items: center;
 
-        .tag {
-          width: fit-content;
-          height: 30rpx;
-          border-radius: 4rpx;
-          padding: 6rpx 20rpx;
-          line-height: 30rpx;
-          font-weight: 400;
-          font-size: 24rpx;
-          text-align: center;
-          white-space: nowrap;
-          margin-right: 20rpx;
-          display: flex;
-          align-items: center;
-        }
-      }
+					image {
+						width: 24rpx;
+						height: 24rpx;
+						margin-right: 8rpx;
+					}
+				}
 
-      .card-bottom {
-        margin-top: 32rpx;
-        display: flex;
-        justify-content: space-between;
-        font-size: 28rpx;
-        color: #6C7282;
-      }
-    }
-  }
-}
-</style>
+				.card-tags {
+					display: flex;
+					flex-wrap: wrap;
+					margin: 25rpx 0 35rpx;
+
+					image {
+						width: 24rpx;
+						height: 24rpx;
+						margin-right: 8rpx;
+					}
+
+					.jy {
+						background: #D9EDFF;
+						color: #0086FF;
+					}
+
+					.xl {
+						background: #FFF1D5;
+						color: #FF7F01;
+					}
+
+					.yd {
+						background: #FFD8D8;
+						color: #F83A3C;
+					}
+
+					.tag {
+						width: fit-content;
+						height: 30rpx;
+						border-radius: 4rpx;
+						padding: 6rpx 20rpx;
+						line-height: 30rpx;
+						font-weight: 400;
+						font-size: 24rpx;
+						text-align: center;
+						white-space: nowrap;
+						margin-right: 20rpx;
+						display: flex;
+						align-items: center;
+					}
+				}
+
+				.card-bottom {
+					margin-top: 32rpx;
+					display: flex;
+					justify-content: space-between;
+					font-size: 28rpx;
+					color: #6C7282;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/packageA/pages/exhibitors/exhibitors.vue b/packageA/pages/exhibitors/exhibitors.vue
index 2219672..ba7533d 100644
--- a/packageA/pages/exhibitors/exhibitors.vue
+++ b/packageA/pages/exhibitors/exhibitors.vue
@@ -105,16 +105,23 @@
 		</view>
 		<template #footer>
 			<view class="footer" v-if="hasnext">
-				<view class="btn-wq button-click" :class="{ 'btn-desbel': fairInfo.isCollection }"
+				<view class="btn-wq button-click" :class="{ 'btn-desbel': fairInfo.isSignUp==1 }"
 					@click="applyExhibitors">
-					{{ fairInfo.isCollection ? '已预约招聘会' : '预约招聘会' }}
+					{{ fairInfo.isSignUp==1 ? '已报名' : '报名招聘会' }}
 				</view>
 			</view>
 		</template>
+		<uni-popup ref="CompanySignPopup" background-color="#fff" :mask-click="false">
+			<view class="popup-content">
+				<signDialog v-if="signDialogisshow" :signType="signType" :signRole="signRole"
+					:jobFairId="fairInfo.jobFairId" @closePopup="closePopup"></signDialog>
+			</view>
+		</uni-popup>
 	</AppLayout>
 </template>
 
 <script setup>
+	import signDialog from '@/components/jobfair/signDialog.vue';
 	import config from "@/config.js"
 	import {
 		reactive,
@@ -128,7 +135,6 @@
 		onLoad,
 		onShow
 	} from '@dcloudio/uni-app';
-	import dictLabel from '@/components/dict-Label/dict-Label.vue';
 	import useLocationStore from '@/stores/useLocationStore';
 	const {
 		$api,
@@ -148,6 +154,15 @@
 	const fairInfo = ref({});
 	const companyList = ref([]);
 	const hasnext = ref(true);
+	const userInfo = ref({});
+	const signDialogisshow = ref(false)
+	// 弹窗
+	const signType = ref(1);
+	// person个人   ent企业
+	const signRole = ref('ent');
+	const CompanySignPopup = ref(null)
+
+	const jobFairId = ref(null)
 
 	const baseUrl = config.imgBaseUrl
 	const getItemBackgroundStyle = (imageName) => ({
@@ -157,28 +172,59 @@
 		backgroundRepeat: 'no-repeat'
 	});
 	onLoad((options) => {
-		getCompanyInfo(options.jobFairId);
+		jobFairId.value=options.jobFairId
+		const raw = uni.getStorageSync("Padmin-Token");
+		const token = typeof raw === "string" ? raw.trim() : "";
+		const headers = token ? {
+			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
+		} : {};
+
+		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
+			if (resData.code == 200) {
+				$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, {
+					Authorization: `Bearer ${uni.getStorageSync("Padmin-Token")}`
+				}).then((userinfo) => {
+					userInfo.value = userinfo
+					getCompanyInfo(userInfo.value.info.userId, options.jobFairId);
+				});
+			} else {
+				getCompanyInfo('', options.jobFairId);
+			}
+		});
 	});
 
-	function getCompanyInfo(id) {
-		// $api.createRequest(`/app/fair/${id}`).then((resData) => {
-		// 	fairInfo.value = resData.data;
-		// 	companyList.value = resData.data.companyList;
-		// 	hasAppointment();
-		// });
-		$api.myRequest('/jobfair/public/jobfair/detail', {
-			jobFairId: id
-		}).then((resData) => {
-			console.log(resData, 'resData');
+	function closePopup() {
+		CompanySignPopup.value.close()
+		getCompanyInfo(userInfo.value.info.userId, jobFairId.value)
+	}
+
+	function getCompanyInfo(userId, id) {
+		let data={}
+		if (userInfo.value&&userInfo.value.userType == 'ent') {
+			data={
+				jobFairId: id,
+				enterpriseId: userId,
+				code:userInfo.value.info.entCreditCode
+			}
+		}else if(userInfo.value&&userInfo.value.userType == 'ent'){
+			data={
+				jobFairId: id,
+				personId: userId,
+				idCard:userInfo.value.info.personCardNo
+			}
+		}else{
+			data={
+				jobFairId: id,
+				personId: userId
+			}
+		}
+		$api.myRequest('/jobfair/public/jobfair/detail', data).then((resData) => {
 			fairInfo.value = resData.data;
-			console.log(fairInfo.value, 'fairInfo.value');
-			// hasAppointment()
 		});
 		$api.myRequest('/jobfair/public/jobfair/enterprises-with-jobs-by-job-fair-id', {
 			jobFairId: id
 		}).then((resData) => {
 			companyList.value = resData.data;
-			// hasAppointment()
 		});
 	};
 
@@ -205,21 +251,56 @@
 		isExpanded.value = !isExpanded.value;
 	}
 
-	// 取消/收藏岗位
+	// 报名招聘会
 	function applyExhibitors() {
-		const fairId = fairInfo.value.jobFairId;
-		if (fairInfo.value.isCollection) {
-			// $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
-			//     getCompanyInfo(fairId);
-			//     $api.msg('取消预约成功');
-			// });
-			$api.msg('已预约成功');
-		} else {
-			$api.createRequest(`/app/fair/collection/${fairId}`, {}, 'POST').then((resData) => {
-				getCompanyInfo(fairId);
-				$api.msg('预约成功');
-			});
+		if (fairInfo.value.isSignUp == 1) {
+			$api.msg('请勿重复报名');
+			return
 		}
+		const raw = uni.getStorageSync("Padmin-Token");
+		const token = typeof raw === "string" ? raw.trim() : "";
+		const headers = token ? {
+			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
+		} : {};
+
+		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
+			if (resData.code == 200) {
+				if (userInfo.value.userType == 'ent') {
+					// 企业
+					signType.value = fairInfo.value.jobFairType;
+					signRole.value = userInfo.userType;
+					signDialogisshow.value = true
+					CompanySignPopup.value.open()
+				}else{
+					$api.myRequest("/jobfair/public/job-fair-sign-up-person/sign-up", {
+						personId: userInfo.value.info.userId,
+						  jobFairId: jobFairId.value,
+						  idCard:userInfo.value.info.personCardNo
+					}, "POST", 9100, { "Content-Type": "application/json",...headers }).then((res) => {
+						if (res.code === 200) {
+							uni.showToast({
+								title: '报名成功',
+								icon: 'success'
+							});
+							getCompanyInfo(userInfo.value.info.userId, jobFairId.value)
+						} else {
+							uni.showToast({
+								title: res.msg || '报名失败',
+								icon: 'none'
+							});
+						}
+					})
+					
+				}
+			} else {
+				$api.msg('请先登录');
+				setTimeout(() => {
+					uni.redirectTo({
+						url: '/packageB/login'
+					})
+				}, 1000)
+			}
+		});
 	}
 
 	function parseDateTime(datetimeStr) {
@@ -288,6 +369,12 @@
 </script>
 
 <style lang="stylus" scoped>
+	.popup-content {
+		width: 90vw;
+		height: 80vh;
+		position: relative;
+	}
+
 	.btnback {
 		width: 64rpx;
 		height: 64rpx;
@@ -528,6 +615,7 @@
 						color: #333333;
 						display: flex;
 						align-items: center;
+
 						image {
 							width: 30rpx;
 							height: 30rpx;
@@ -577,7 +665,8 @@
 						display: flex;
 						align-items: center;
 						margin-right: 20rpx;
-						image{
+
+						image {
 							width: 22rpx;
 							height: 22rpx;
 							margin-right: 8rpx;
@@ -677,4 +766,4 @@
 			box-shadow: 0rpx -4rpx 24rpx 0rpx rgba(11, 44, 112, 0.12);
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index 1f118fb..8e02701 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -240,6 +240,7 @@ const applicants = ref([
 ]);
 
 onLoad((option) => {
+	console.log(option, 'option');
     if (option.jobId) {
         initLoad(option);
     }
diff --git a/packageB/jobFair/detail.vue b/packageB/jobFair/detail.vue
deleted file mode 100644
index c28e9f0..0000000
--- a/packageB/jobFair/detail.vue
+++ /dev/null
@@ -1,559 +0,0 @@
-<template>
-    <AppLayout title="" :use-scroll-view="false">
-        <template #headerleft>
-            <view class="btnback">
-                <image src="@/static/icon/back.png" @click="navBack"></image>
-            </view>
-        </template>
-        <view class="content">
-            <view class="content-top">
-                <view class="companyinfo-left">
-                    <image src="@/static/icon/companyIcon.png" mode=""></image>
-                </view>
-                <view class="companyinfo-right">
-                    <view class="row1 line_2">{{ fairInfo?.name }}</view>
-                    <view class="row2">
-                        <text>{{ fairInfo.location }}</text>
-                        <convert-distance
-                            :alat="fairInfo.latitude"
-                            :along="fairInfo.longitude"
-                            :blat="latitudeVal"
-                            :blong="longitudeVal"
-                        ></convert-distance>
-                    </view>
-                </view>
-            </view>
-            <view class="locations">
-                <image class="location-img" src="/static/icon/mapLine.png"></image>
-                <view class="location-info">
-                    <view class="info">
-                        <text class="info-title">{{ fairInfo.address }}</text>
-                        <text class="info-text">位置</text>
-                    </view>
-                </view>
-            </view>
-            <view class="conetent-info" :class="{ expanded: isExpanded }">
-                <view class="info-title">内容描述</view>
-                <view class="info-desirption">{{ fairInfo.description }}</view>
-                <!-- <view class="info-title title2">公司地址</view>
-                <view class="locationCompany"></view> -->
-                <view class="company-times">
-                    <view class="info-title">内容描述</view>
-                    <view class="card-times">
-                        <view class="time-left">
-                            <view class="left-date">{{ parseDateTime(fairInfo.startTime).time }}</view>
-                            <view class="left-dateDay">{{ parseDateTime(fairInfo.startTime).date }}</view>
-                        </view>
-                        <view class="line"></view>
-                        <view class="time-center">
-                            <view class="center-date">
-                                {{ getTimeStatus(fairInfo.startTime, fairInfo.endTime).statusText }}
-                            </view>
-                            <view class="center-dateDay">
-                                {{ getHoursBetween(fairInfo.startTime, fairInfo.endTime) }}小时
-                            </view>
-                        </view>
-                        <view class="line"></view>
-                        <view class="time-right">
-                            <view class="left-date">{{ parseDateTime(fairInfo.endTime).time }}</view>
-                            <view class="left-dateDay">{{ parseDateTime(fairInfo.endTime).date }}</view>
-                        </view>
-                    </view>
-                </view>
-            </view>
-            <view class="expand" @click="expand">
-                <text>{{ isExpanded ? '收起' : '展开' }}</text>
-                <image
-                    class="expand-img"
-                    :class="{ 'expand-img-active': !isExpanded }"
-                    src="@/static/icon/downs.png"
-                ></image>
-            </view>
-            <scroll-view scroll-y class="Detailscroll-view">
-                <view class="views">
-                    <view class="Detail-title">
-                        <text class="title">参会单位（{{ companyList.length }}）</text>
-                    </view>
-                    <renderCompanys
-                        v-if="companyList.length"
-                        :list="companyList"
-                        :longitude="longitudeVal"
-                        :latitude="latitudeVal"
-                    ></renderCompanys>
-                    <empty v-else pdTop="200"></empty>
-                </view>
-            </scroll-view>
-        </view>
-        <template #footer>
-            <view class="footer" v-if="hasnext">
-                <view
-                    class="btn-wq button-click"
-                    :class="{ 'btn-desbel': fairInfo.isCollection }"
-                    @click="applyExhibitors"
-                >
-                    {{ fairInfo.isCollection ? '已预约招聘会' : '预约招聘会' }}
-                </view>
-            </view>
-        </template>
-    </AppLayout>
-</template>
-
-<script setup>
-import point from '@/static/icon/point.png';
-import { reactive, inject, watch, ref, onMounted, computed } from 'vue';
-import { onLoad, onShow } from '@dcloudio/uni-app';
-import dictLabel from '@/components/dict-Label/dict-Label.vue';
-import useLocationStore from '@/stores/useLocationStore';
-const { $api, navTo, vacanciesTo, navBack } = inject('globalFunction');
-import { storeToRefs } from 'pinia';
-const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
-
-const isExpanded = ref(false);
-const fairInfo = ref({});
-const companyList = ref([]);
-const hasnext = ref(true);
-onLoad((options) => {
-    getCompanyInfo(options.jobFairId);
-});
-
-function getCompanyInfo(id) {
-    $api.createRequest(`/app/fair/${id}`).then((resData) => {
-        fairInfo.value = resData.data;
-        companyList.value = resData.data.companyList;
-        hasAppointment();
-    });
-}
-
-const hasAppointment = () => {
-    const isTimePassed = (timeStr) => {
-        const targetTime = new Date(timeStr.replace(/-/g, '/')).getTime(); // 兼容格式
-        const now = Date.now();
-        return now < targetTime;
-    };
-
-    hasnext.value = isTimePassed(fairInfo.value.startTime);
-};
-
-function openMap(lat, lng, name = '位置') {
-    const isConfirmed = window.confirm('是否打开地图查看位置？');
-    if (!isConfirmed) return;
-
-    // 使用高德地图或百度地图的 H5 链接打开
-    const url = `https://uri.amap.com/marker?position=${lng},${lat}&name=${encodeURIComponent(name)}`;
-    window.location.href = url;
-}
-
-function expand() {
-    isExpanded.value = !isExpanded.value;
-}
-
-// 取消/收藏岗位
-function applyExhibitors() {
-    const fairId = fairInfo.value.jobFairId;
-    if (fairInfo.value.isCollection) {
-        // $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'DELETE').then((resData) => {
-        //     getCompanyInfo(fairId);
-        //     $api.msg('取消预约成功');
-        // });
-        $api.msg('已预约成功');
-    } else {
-        $api.createRequest(`/app/fair/collection/${fairId}`, {}, 'POST').then((resData) => {
-            getCompanyInfo(fairId);
-            $api.msg('预约成功');
-        });
-    }
-}
-
-function toIOSDate(input) {
-  if (!input) return null;
-  if (input instanceof Date) return isNaN(input.getTime()) ? null : input;
-  if (typeof input === 'number') {
-    const d = new Date(input);
-    return isNaN(d.getTime()) ? null : d;
-  }
-  if (typeof input !== 'string') return null;
-  let s = input.trim();
-  if (/^\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}(:\d{2})?$/.test(s)) {
-    s = s.replace(' ', 'T');
-    if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/.test(s)) {
-      s = s + ':00';
-    }
-  }
-  const d = new Date(s);
-  return isNaN(d.getTime()) ? null : d;
-}
-
-function parseDateTime(datetimeStr) {
-    if (!datetimeStr) return { time: '', date: '' };
-
-    const dateObj = toIOSDate(datetimeStr);
-
-    if (isNaN(dateObj.getTime())) return { time: '', date: '' }; // 无效时间
-
-    const year = dateObj.getFullYear();
-    const month = String(dateObj.getMonth() + 1).padStart(2, '0');
-    const day = String(dateObj.getDate()).padStart(2, '0');
-    const hours = String(dateObj.getHours()).padStart(2, '0');
-    const minutes = String(dateObj.getMinutes()).padStart(2, '0');
-
-    return {
-        time: `${hours}:${minutes}`,
-        date: `${year}年${month}月${day}日`,
-    };
-}
-
-function getTimeStatus(startTimeStr, endTimeStr) {
-    const now = new Date();
-    const startTime = toIOSDate(startTimeStr);
-    const endTime = toIOSDate(endTimeStr);
-
-    if (!startTime || !endTime) {
-        return { status: 1, statusText: '时间异常' };
-    }
-
-    let status = 0;
-    let statusText = '开始中';
-    if (now < startTime) {
-        status = 2;
-        statusText = '待开始';
-    } else if (now > endTime) {
-        status = 1;
-        statusText = '已过期';
-    } else {
-        status = 0;
-        statusText = '进行中';
-    }
-    return { status, statusText };
-}
-
-function getHoursBetween(startTimeStr, endTimeStr) {
-    const start = toIOSDate(startTimeStr);
-    const end = toIOSDate(endTimeStr);
-    if (!start || !end) return 0;
-    const diffMs = end - start;
-    const diffHours = diffMs / (1000 * 60 * 60);
-    return +diffHours.toFixed(2);
-}
-</script>
-
-<style lang="stylus" scoped>
-.btnback{
-    width: 64rpx;
-    height: 64rpx;
-}
-.btn {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 52rpx;
-    height: 52rpx;
-}
-image {
-    height: 100%;
-    width: 100%;
-}
-.content{
-    height: 100%
-    display: flex;
-    flex-direction: column
-    .content-top{
-        padding: 28rpx
-        padding-top: 50rpx
-        display: flex
-        flex-direction: row
-        flex-wrap: nowrap
-        .companyinfo-left{
-            width: 96rpx;
-            height: 96rpx;
-            margin-right: 24rpx
-        }
-        .companyinfo-right{
-            flex: 1
-            .row1{
-                font-weight: 500;
-                font-size: 32rpx;
-                color: #333333;
-                font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-            }
-            .row2{
-                font-weight: 400;
-                font-size: 28rpx;
-                color: #6C7282;
-                line-height: 45rpx;
-                display: flex
-                justify-content: space-between
-            }
-        }
-    }
-    .locations{
-        padding: 0 28rpx
-        height: 86rpx;
-        position: relative
-        margin-bottom: 36rpx
-        .location-img{
-            border-radius: 8rpx 8rpx 8rpx 8rpx;
-            border: 2rpx solid #EFEFEF;
-        }
-        .location-info{
-            position: absolute
-            top: 0
-            left: 0
-            width: 100%
-            height: 100%
-
-            .info{
-               padding: 0 60rpx
-               height: 100%
-               display: flex
-               align-items: center
-               justify-content: space-between
-               white-space: nowrap
-               padding-top:  rpx
-               .info-title{
-                    font-weight: 600;
-                    font-size: 28rpx;
-                    color: #333333;
-               }
-               .info-text{
-                   font-weight: 400;
-                   font-size: 28rpx;
-                   color: #9B9B9B;
-                   position: relative;
-                   padding-right: 20rpx
-
-               }
-               .info-text::before{
-                   position: absolute;
-                   right: 0;
-                   top: 50%;
-                   content: '';
-                   width: 4rpx;
-                   height: 16rpx;
-                   border-radius: 2rpx
-                   background: #9B9B9B;
-                   transform: translate(0, -75%) rotate(-45deg)
-               }
-
-               .info-text::after {
-                   position: absolute;
-                   right: 0;
-                   top: 50%;
-                   content: '';
-                   width: 4rpx;
-                   height: 16rpx;
-                   border-radius: 2rpx
-                   background: #9B9B9B;
-                   transform: translate(0, -25%) rotate(45deg)
-               }
-
-            }
-        }
-    }
-    .conetent-info{
-        padding: 0 28rpx
-        overflow: hidden;
-        max-height: 0rpx;
-        transition: max-height 0.3s ease;
-        .info-title{
-            font-weight: 600;
-            font-size: 28rpx;
-            color: #000000;
-        }
-        .info-desirption{
-            margin-top: 12rpx
-            font-weight: 400;
-            font-size: 28rpx;
-            color: #495265;
-            text-align: justified;
-        }
-        .title2{
-            margin-top: 48rpx
-        }
-    }
-    .company-times{
-        padding-top: 40rpx
-        .info-title{
-            font-weight: 600;
-            font-size: 28rpx;
-            color: #000000;
-        }
-    }
-    .expanded {
-        max-height: 1000rpx; // 足够显示完整内容
-    }
-    .expand{
-        display: flex
-        flex-wrap: nowrap
-        white-space: nowrap
-        justify-content: center
-        margin-bottom: 46rpx
-        font-weight: 400;
-        font-size: 28rpx;
-        color: #256BFA;
-        .expand-img{
-            width: 40rpx;
-            height: 40rpx;
-        }
-        .expand-img-active{
-            transform: rotate(180deg)
-        }
-    }
-}
-.Detailscroll-view{
-    flex: 1;
-    overflow: hidden;
-    background: #F4F4F4;
-    .views{
-        padding: 28rpx
-        .Detail-title{
-            font-weight: 600;
-            font-size: 32rpx;
-            color: #000000;
-            position: relative;
-            display: flex
-            justify-content: space-between
-            .title{
-                position: relative;
-                z-index: 2;
-            }
-        }
-        .Detail-title::before{
-            position: absolute
-            content:  '';
-            left: -14rpx
-            bottom: 0
-            height: 16rpx;
-            width: 108rpx;
-            background: linear-gradient(to right, #CBDEFF, #FFFFFF);
-            border-radius: 8rpx;
-            z-index: 1;
-        }
-        .cards{
-            padding: 32rpx;
-            background: #FFFFFF;
-            box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
-            border-radius: 20rpx 20rpx 20rpx 20rpx;
-            margin-top: 22rpx;
-            .card-company{
-                display: flex
-                justify-content: space-between
-                align-items: flex-start
-                .company{
-                    font-weight: 500;
-                    font-size: 32rpx;
-                    color: #333333;
-                }
-                .salary{
-                    font-weight: 500;
-                    font-size: 28rpx;
-                    color: #4C6EFB;
-                    white-space: nowrap
-                    line-height: 48rpx
-                }
-            }
-            .card-companyName{
-                font-weight: 400;
-                font-size: 28rpx;
-                color: #6C7282;
-            }
-            .card-tags{
-                display: flex
-                flex-wrap: wrap
-                .tag{
-                    width: fit-content;
-                    height: 30rpx;
-                    background: #F4F4F4;
-                    border-radius: 4rpx;
-                    padding: 6rpx 20rpx;
-                    line-height: 30rpx;
-                    font-weight: 400;
-                    font-size: 24rpx;
-                    color: #6C7282;
-                    text-align: center;
-                    margin-top: 14rpx;
-                    white-space: nowrap
-                    margin-right: 20rpx
-                }
-            }
-            .card-bottom{
-                margin-top: 32rpx
-                display: flex
-                justify-content: space-between
-                font-size: 28rpx;
-                color: #6C7282;
-            }
-        }
-    }
-}
-.card-times{
-    display: flex;
-    justify-content: space-between
-    align-items: center
-    padding: 24rpx 30rpx 10rpx 30rpx
-    .time-left,
-    .time-right{
-        text-align: center
-        .left-date{
-            font-weight: 500;
-            font-size: 48rpx;
-            color: #333333;
-        }
-        .left-dateDay{
-            font-weight: 400;
-            font-size: 24rpx;
-            color: #333333;
-            margin-top: 12rpx
-        }
-    }
-    .line{
-        width: 40rpx;
-        height: 0rpx;
-        border: 2rpx solid #D4D4D4;
-        margin-top: 64rpx
-    }
-    .time-center{
-        text-align: center;
-        display: flex
-        flex-direction: column
-        justify-content: center
-        align-items: center
-        .center-date{
-            font-weight: 400;
-            font-size: 28rpx;
-            color: #FF881A;
-            padding-top: 10rpx
-        }
-        .center-dateDay{
-            font-weight: 400;
-            font-size: 24rpx;
-            color: #333333;
-            margin-top: 6rpx
-            line-height: 48rpx;
-            width: 104rpx;
-            height: 48rpx;
-            background: #F9F9F9;
-            border-radius: 8rpx 8rpx 8rpx 8rpx;
-        }
-    }
-}
-.footer{
-    background: #FFFFFF;
-    box-shadow: 0rpx -4rpx 24rpx 0rpx rgba(11,44,112,0.12);
-    border-radius: 0rpx 0rpx 0rpx 0rpx;
-    padding: 40rpx 28rpx 20rpx 28rpx
-    .btn-wq{
-        height: 90rpx;
-        background: #256BFA;
-        border-radius: 12rpx 12rpx 12rpx 12rpx;
-        font-weight: 500;
-        font-size: 32rpx;
-        color: #FFFFFF;
-        text-align: center;
-        line-height: 90rpx
-    }
-    .btn-desbel{
-        background: #6697FB;
-        box-shadow: 0rpx -4rpx 24rpx 0rpx rgba(11,44,112,0.12);
-    }
-}
-</style>
diff --git a/packageB/jobFair/detailCom.vue b/packageB/jobFair/detailCom.vue
new file mode 100644
index 0000000..2c637a4
--- /dev/null
+++ b/packageB/jobFair/detailCom.vue
@@ -0,0 +1,1029 @@
+<template>
+	<view class="job-detail">
+		<view class="company-header">
+			<view class="company-img">
+				<image :src="`${imgBaseUrl}/jobfair/company.png`" mode=""></image>
+			</view>
+			<view>
+				<view class="company-name">
+					{{ fair.jobFairTitle }}
+					<view class="job-type">
+						{{ fair.jobFairType == 1 ? "线上" : "线下" }}
+					</view>
+				</view>
+				<view class="company-Address">
+					{{ fair.jobFairAddress }}
+					<view class="activity-status">
+						{{
+              getActivityStatus(fair.jobFairStartTime, fair.jobFairEndTime).text
+            }}
+					</view>
+				</view>
+			</view>
+		</view>
+		<template v-if="isExpanded">
+			<view class="jobfair-title"> 招聘会单位： </view>
+			<view class="jobfair-content">
+				<view> 1、招聘会协办单位：{{ fair.jobFairHelpUnit }} </view>
+				<view> 2、招聘会主办单位：{{ fair.jobFairHostUnit }} </view>
+				<view> 3、招聘会承办单位：{{ fair.jobFairOrganizeUnit }} </view>
+			</view>
+			<view class="jobfair-title"> 内容描述： </view>
+			<view class="jobfair-content">
+				{{ fair.jobFairIntroduction }}
+			</view>
+			<view class="jobfair-title"> 联系电话： </view>
+			<view class="jobfair-content">
+				{{ fair.jobFairPhone }}
+			</view>
+			<view class="jobfair-title"> 招聘会备注： </view>
+			<view class="jobfair-content">
+				{{ fair.jobFairRemark }}
+			</view>
+			<view class="jobfair-content">
+				<view class="card-times">
+					<view class="time-left">
+						<view class="left-date">{{
+              parseDateTime(fair.jobFairStartTime).time
+            }}</view>
+						<view class="left-dateDay">{{
+              parseDateTime(fair.jobFairStartTime).date
+            }}</view>
+					</view>
+					<view class="line"></view>
+					<view class="time-center">
+						<view class="center-date">
+							{{
+                getTimeStatus(fair.jobFairStartTime, fair.jobFairEndTime)
+                  .statusText
+              }}
+						</view>
+						<view class="center-dateDay">
+							{{
+                getHoursBetween(fair.jobFairStartTime, fair.jobFairEndTime)
+              }}小时
+						</view>
+					</view>
+					<view class="line"></view>
+					<view class="time-right">
+						<view class="left-date">{{
+              parseDateTime(fair.jobFairEndTime).time
+            }}</view>
+						<view class="left-dateDay">{{
+              parseDateTime(fair.jobFairEndTime).date
+            }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="jobfair-title"> 招聘会照片： </view>
+			<view class="jobfair-content">
+				<image :src="publicUrl + '/file/file/minio' + fair.jobFairImage" alt="" v-if="fair.jobFairImage" />
+				<text v-else>暂无照片</text>
+			</view>
+		</template>
+		<view class="expand" @click="expand">
+			<text>{{ isExpanded ? "收起" : "展开" }}</text>
+			<image class="expand-img" :class="{ 'expand-img-active': !isExpanded }" src="@/static/icon/downs.png">
+			</image>
+		</view>
+		<view class="num-box">
+			<view class="num-item">
+				<view class="num">
+					{{ fair.myJobNum?fair.myJobNum : 0 }}
+				</view>
+				<view class="num-desc">
+					企业招聘岗位
+				</view>
+			</view>
+			<view class="num-item">
+				<view class="num">
+					{{fair.resumeCount?fair.resumeCount : 0}}
+				</view>
+				<view class="num-desc">
+					收到简历
+				</view>
+			</view>
+		</view>
+
+		<!-- 使用scroll-view实现分页加载 -->
+		<scroll-view scroll-y class="detail-box" @scrolltolower="onReachBottom" lower-threshold="50">
+			<view class="detail-item" v-for="(item, index) in detail.list" :key="index">
+				<view class="gw">
+					岗位名称：<text>{{ item.jobInfo.jobTitle }}</text>
+				</view>
+				<view class="name">
+					{{ item.personInfo.name }}
+					<!-- 应聘状态（1已投递、2已邀请面试、3已录用、4不录用） -->
+					<view class="status" :style="getItemBackgroundStyle('wcl.png')">
+						{{ getStatusText(item.status) }}
+					</view>
+				</view>
+				<view class="bottom">
+					<view class="tag">
+						<view class="tag-item">性别：{{ item.personInfo.sex == 0 ? "男" : "女" }}</view>
+						<view class="tag-item success">年龄：{{ item.personInfo.age }}</view>
+					</view>
+				</view>
+
+				<view class="btn">
+					<button type="primary" plain>查看</button>
+					<button type="primary" @click="interviewBtn(item)" v-if="item.status == 1">
+						面试邀请
+					</button>
+					<button type="primary" @click="acceptBtn(item, 0)" v-if="item.status != 3 && item.status != 4">
+						录用
+					</button>
+					<button type="primary" @click="acceptBtn(item, 2)" v-if="item.status != 3 && item.status != 4">
+						不录用
+					</button>
+				</view>
+			</view>
+			<!-- 加载状态 -->
+			<view v-if="loading" class="loading">加载中...</view>
+			<view v-if="!loading && detail.list.length >= detail.total" class="no-more">没有更多数据了</view>
+		</scroll-view>
+
+		<!-- 面试邀请弹窗 -->
+		<uni-popup ref="interviewPopup" type="center" :maskClick="false">
+			<view class="popup-content job-dialog" :style="getItemBackgroundStyle('zphbm-k.png')">
+				<view class="title">
+					<image :src="`${imgBaseUrl}/jobfair/xb.png`" mode="aspectFit"></image>
+					面试邀请
+				</view>
+				<view class="dialog-content">
+					<view class="detail-item1">
+						<view class="label">面试时间：</view>
+						<view class="value">
+							<picker mode="date" fields="day" :value="interviewForm.date"
+								@change="(e) => (interviewForm.date = e.detail.value)">
+								<view class="picker">
+									{{ interviewForm.date || "选择日期" }}
+								</view>
+							</picker>
+							<picker mode="time" :value="interviewForm.time"
+								@change="(e) => (interviewForm.time = e.detail.value)">
+								<view class="picker">
+									{{ interviewForm.time || "选择时间" }}
+								</view>
+							</picker>
+						</view>
+					</view>
+					<view class="detail-item1">
+						<view class="label">面试地点：</view>
+						<view class="value">
+							<radio-group @change="changeAddress">
+								<!-- v-model="interviewForm.radio" -->
+								<radio :value="'1'" style="transform: scale(0.7)" />企业地址
+								<radio :value="'2'" style="transform: scale(0.7)" />定义地址
+							</radio-group>
+						</view>
+					</view>
+					<view class="detail-item1" v-if="interviewForm.radio == '2'">
+						<view class="label">定义地址：</view>
+						<view class="value">
+							<input v-model="interviewForm.address" placeholder="请输入地址" />
+						</view>
+					</view>
+				</view>
+				<view class="btn-box">
+					<button type="primary" @click="submitInterview">提交</button>
+					<button type="default" @click="closeInterviewPopup">关闭</button>
+				</view>
+			</view>
+		</uni-popup>
+
+		<!-- 企业录用反馈弹窗 -->
+		<uni-popup ref="feedBackPopup" type="center" :maskClick="false">
+			<view class="popup-content job-dialog" :style="getItemBackgroundStyle('zphbm-k.png')">
+				<view class="title">
+					<image :src="`${imgBaseUrl}/jobfair/xb.png`" mode="aspectFit"></image>
+					企业录用反馈
+				</view>
+				<view class="dialog-content">
+					<textarea :rows="7" placeholder="请输入内容（必填）" v-model="feedBack"></textarea>
+				</view>
+				<view class="btn-box">
+					<button type="primary" @click="submitFeedBack">提交</button>
+					<button type="default" @click="closeFeedBackPopup">关闭</button>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script setup>
+	import config from "@/config.js";
+	import {
+		ref,
+		reactive,
+		onMounted,
+		nextTick,
+		watch,
+		inject
+	} from "vue";
+	import {
+		onLoad
+	} from "@dcloudio/uni-app";
+	import {
+		useRouter,
+		useRoute
+	} from "vue-router";
+
+	const {
+		$api
+	} = inject("globalFunction");
+	const imgBaseUrl = config.imgBaseUrl;
+	const router = useRouter();
+	const route = useRoute();
+	const interviewPopup = ref(null);
+	const feedBackPopup = ref(null);
+	const loading = ref(false);
+	const hasMore = ref(true);
+	const jobFairId = ref("");
+	const userInfo = ref({});
+	const isExpanded = ref(false);
+
+	const publicUrl = config.LCBaseUrl;
+	onLoad((option) => {
+		jobFairId.value = option.jobFairId;
+		getUser();
+	});
+	// 响应式数据
+	const interviewForm = reactive({
+		date: "",
+		time: "",
+		address: "",
+		radio: "1",
+	});
+
+	const feedBack = ref("");
+	const pages = reactive({
+		pageNum: 1,
+		pageSize: 10,
+	});
+
+	const detail = reactive({
+		list: [],
+		total: 0,
+	});
+
+	const fair = reactive({});
+	const openGw = reactive({});
+	const isAccept = ref(true);
+
+	function expand() {
+		isExpanded.value = !isExpanded.value;
+	}
+	// 获取状态文本
+	const getStatusText = (status) => {
+		switch (status) {
+			case "1":
+				return "已投递";
+			case "2":
+				return "已邀请面试";
+			case "3":
+				return "已录用";
+			case "4":
+				return "不录用";
+			default:
+				return "未知状态";
+		}
+	};
+
+	const baseUrl = config.imgBaseUrl;
+	const getItemBackgroundStyle = (imageName) => ({
+		backgroundImage: `url(${baseUrl}/jobfair/${imageName})`,
+		backgroundSize: "100% 100%", // 覆盖整个容器
+		backgroundPosition: "center", // 居中
+		backgroundRepeat: "no-repeat",
+	});
+	const getDetail = () => {
+		const data = {
+			jobFairId: jobFairId.value,
+			enterpriseId: userInfo.value.info.userId,
+			code: userInfo.value.info.entCreditCode,
+		};
+		$api.myRequest("/jobfair/public/jobfair/detail", data).then((resData) => {
+			// 直接将数据合并到fair对象
+			Object.assign(fair, resData.data);
+			console.log(fair, "fair data");
+		});
+	};
+
+	function changeAddress(e) {
+		interviewForm.radio = e.detail.value;
+	}
+
+	const getUser = () => {
+		const raw = uni.getStorageSync("Padmin-Token");
+		const token = typeof raw === "string" ? raw.trim() : "";
+		const headers = token ?
+			{
+				Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`,
+			} :
+			{};
+
+		$api
+			.myRequest("/system/user/login/user/info", {}, "GET", 10100, headers)
+			.then((resData) => {
+				userInfo.value = resData;
+				getDetail();
+				getList(false);
+			});
+	};
+	// 获取收到的简历列表
+	const getList = (isLoadMore = false) => {
+		if (loading.value) return;
+
+		loading.value = true;
+		try {
+			$api
+				.myRequest(
+					"/jobfair/public/job-fair-person-job/enterprise/my-received-resume", {
+						enterpriseId: userInfo.value.info.userId,
+						jobFairId: jobFairId.value,
+						...pages,
+					}
+				)
+				.then((data) => {
+					if (data.code === 200) {
+						if (isLoadMore) {
+							detail.list = [...detail.list, ...data.data.list];
+						} else {
+							detail.list = data.data.list || [];
+						}
+						detail.total = data.data.total || 0;
+						hasMore.value = detail.list.length < detail.total;
+					}
+				});
+		} catch (error) {
+			console.log(error, "error");
+			uni.showToast({
+				title: "获取数据失败",
+				icon: "none",
+			});
+		} finally {
+			loading.value = false;
+		}
+	};
+
+	// 面试邀请
+	const interviewBtn = (item) => {
+		Object.assign(openGw, item);
+		interviewPopup.value.open();
+	};
+
+	// 关闭面试弹窗
+	const closeInterviewPopup = () => {
+		interviewPopup.value.close();
+	};
+
+	// 关闭反馈弹窗
+	const closeFeedBackPopup = () => {
+		feedBackPopup.value.close();
+	};
+
+	// 提交面试邀请
+	const submitInterview = () => {
+		if (!interviewForm.date) {
+			uni.showToast({
+				title: "请选择面试日期",
+				icon: "none",
+			});
+			return;
+		}
+
+		if (!interviewForm.time) {
+			uni.showToast({
+				title: "请选择面试时间",
+				icon: "none",
+			});
+			return;
+		}
+
+		if (interviewForm.radio == "2" && !interviewForm.address) {
+			uni.showToast({
+				title: "请输入面试地址",
+				icon: "none",
+			});
+			return;
+		}
+
+		const data = {
+			jobFairPersonJobId: openGw.jobFairPersonJobId,
+			status: "2",
+			interviewTime: `${interviewForm.date} ${interviewForm.time}`,
+			interviewAddress: interviewForm.radio == "2" ? interviewForm.address : fair.jobFairAddress,
+		};
+
+		update(data, "面试邀请成功");
+	};
+
+	function toIOSDate(input) {
+		if (!input) return null;
+		if (input instanceof Date) return isNaN(input.getTime()) ? null : input;
+		if (typeof input === "number") {
+			const d = new Date(input);
+			return isNaN(d.getTime()) ? null : d;
+		}
+		if (typeof input !== "string") return null;
+		let s = input.trim();
+		// "YYYY-MM-DD HH:mm[:ss]" -> "YYYY-MM-DDTHH:mm[:ss]"
+		if (/^\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}(:\d{2})?$/.test(s)) {
+			s = s.replace(" ", "T");
+			// 仅到分钟则补秒
+			if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/.test(s)) {
+				s = s + ":00";
+			}
+		}
+		// 其余已是 iOS 可解析格式："YYYY/MM/DD[ HH:mm:ss]"、"YYYY-MM-DD"、ISO 8601 等
+		const d = new Date(s);
+		return isNaN(d.getTime()) ? null : d;
+	}
+
+	function parseDateTime(datetimeStr) {
+		if (!datetimeStr)
+			return {
+				time: "",
+				date: "",
+			};
+
+		const dateObj = toIOSDate(datetimeStr);
+
+		if (!dateObj)
+			return {
+				time: "",
+				date: "",
+			}; // 无效时间
+
+		const year = dateObj.getFullYear();
+		const month = String(dateObj.getMonth() + 1).padStart(2, "0");
+		const day = String(dateObj.getDate()).padStart(2, "0");
+		const hours = String(dateObj.getHours()).padStart(2, "0");
+		const minutes = String(dateObj.getMinutes()).padStart(2, "0");
+
+		return {
+			time: `${hours}:${minutes}`,
+			date: `${year}年${month}月${day}日`,
+		};
+	}
+
+	function getTimeStatus(startTimeStr, endTimeStr) {
+		const now = new Date();
+		const startTime = toIOSDate(startTimeStr);
+		const endTime = toIOSDate(endTimeStr);
+
+		if (!startTime || !endTime) {
+			return {
+				status: 1,
+				statusText: "时间异常",
+				color: "#999999",
+			};
+		}
+
+		// 判断状态：0 开始中，1 过期，2 未开始
+		let status = 0;
+		let statusText = "开始中";
+		let color = "#13C57C"; // 进行中 - 绿色
+		if (now < startTime) {
+			status = 2; // 未开始
+			statusText = "未开始";
+			color = "#015EEA"; // 未开始 - 蓝色
+		} else if (now > endTime) {
+			status = 1; // 已过期
+			statusText = "已过期";
+			color = "#999999"; // 已过期 - 灰色
+		} else {
+			status = 0; // 进行中
+			statusText = "进行中";
+			color = "#13C57C"; // 进行中 - 绿色
+		}
+		return {
+			status, // 0: 进行中，1: 已过期，2: 未开始
+			statusText,
+			color,
+		};
+	}
+
+	function getHoursBetween(startTimeStr, endTimeStr) {
+		const start = toIOSDate(startTimeStr);
+		const end = toIOSDate(endTimeStr);
+
+		if (!start || !end) return 0;
+
+		const diffMs = end - start;
+		const diffHours = diffMs / (1000 * 60 * 60);
+
+		return +diffHours.toFixed(2); // 保留 2 位小数
+	}
+
+	// 更新简历状态
+	const update = (data, msg) => {
+		$api
+			.myRequest(
+				"/jobfair/public/job-fair-person-job/update",
+				data,
+				"POST",
+				9100, {
+					"Content-Type": "application/json",
+				}
+			)
+			.then((resData) => {
+				if (resData.code == 200) {
+					uni.showToast({
+						title: msg,
+						icon: "success",
+					});
+					closeInterviewPopup();
+					closeFeedBackPopup();
+					// 重新加载列表
+					pages.pageNum = 1;
+					getList(false);
+				} else {
+					uni.showToast({
+						title: "操作失败",
+						icon: "none",
+					});
+				}
+			});
+	};
+
+	// 提交反馈
+	const submitFeedBack = () => {
+		if (!feedBack.value) {
+			uni.showToast({
+				title: "请输入内容",
+				icon: "none",
+			});
+			return;
+		}
+
+		const data = {
+			jobFairPersonJobId: openGw.jobFairPersonJobId,
+			status: isAccept.value ? "3" : "4",
+			feedback: feedBack.value,
+		};
+
+		update(data, "操作成功");
+		feedBack.value = "";
+	};
+
+	// 录用/不录用按钮
+	const acceptBtn = (item, num) => {
+		isAccept.value = num == 0;
+		Object.assign(openGw, item);
+		feedBackPopup.value.open();
+	};
+
+	// 返回
+	const goBack = () => {
+		router.go(-1);
+	};
+
+	// 获取活动状态
+	const getActivityStatus = (startTime, endTime) => {
+		// 获取当前时间戳（毫秒）
+		const now = Date.now();
+
+		// 将开始时间和结束时间转换为时间戳
+		const start =
+			typeof startTime === "string" ? new Date(startTime).getTime() : startTime;
+		const end =
+			typeof endTime === "string" ? new Date(endTime).getTime() : endTime;
+
+		// 处理无效时间
+		if (isNaN(start) || isNaN(end)) {
+			return {
+				text: "未知状态",
+				style: {},
+			};
+		}
+
+		// 判断状态
+		if (now < start) {
+			return {
+				status: 0,
+				text: "未开始",
+				style: {},
+			};
+		} else if (now > end) {
+			return {
+				status: 1,
+				text: "已结束",
+				style: {},
+			};
+		} else {
+			return {
+				status: 2,
+				text: "进行中",
+				style: {},
+			};
+		}
+	};
+
+	// 滚动到底部加载更多
+	const onReachBottom = () => {
+		if (!loading.value && hasMore.value) {
+			pages.pageNum++;
+			getList(true);
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.jobfair-content {
+		color: #656565;
+		margin-bottom: 20rpx;
+		line-height: 44rpx;
+
+		image {
+			width: 300rpx;
+			height: 300rpx;
+		}
+	}
+
+	.jobfair-title {
+		width: max-content;
+		color: #404040;
+		font-weight: 600;
+		font-size: 28rpx;
+		margin-bottom: 25rpx;
+		position: relative;
+
+		&::after {
+			bottom: -8px;
+			position: absolute;
+			left: 31%;
+			content: "";
+			display: block;
+			width: 37rpx;
+			height: 9rpx;
+			background: linear-gradient(to right, #ffad58 0%, #ff7a5b 100%);
+			border-radius: 10rpx;
+		}
+	}
+
+	.job-detail {
+		width: 100%;
+		height: 100vh;
+		overflow-y: auto;
+		padding: 20rpx;
+		background: #e9f2ff;
+		box-sizing: border-box;
+
+		.detail-box {
+			min-height: max-content;
+			max-height: calc(100vh - 375rpx);
+			padding-top: 20rpx;
+			box-sizing: border-box;
+			overflow-y: auto;
+
+			.detail-item {
+				margin-top: 30rpx;
+				background: linear-gradient(to bottom, #deecff 0%, #ffffff 100%);
+				box-shadow: 0 0 10rpx rgba(0, 95, 169, 0.19);
+				border-radius: 12rpx;
+				border: 2rpx solid #ffffff;
+				padding: 30rpx;
+			}
+
+			.name {
+				font-size: 32rpx;
+				font-weight: 600;
+				margin: 18rpx 0;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.status {
+					width: 160rpx;
+					text-align: center;
+					margin-left: 24rpx;
+					font-size: 24rpx;
+					color: #fff;
+					background-size: 100% 100%;
+					font-weight: normal;
+					padding: 6rpx 0;
+				}
+			}
+
+			.bottom {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				flex-wrap: wrap;
+
+				.tag {
+					width: 100%;
+					display: flex;
+					align-items: center;
+					gap: 16rpx;
+					flex-wrap: wrap;
+
+					.tag-item {
+						padding: 6rpx 30rpx;
+						border-radius: 6rpx;
+						background-color: #E5F1FF;
+						color: #589BFF;
+						font-size: 28rpx;
+
+						&.success {
+							background-color: #E6F8EB;
+							color: #21AA5B;
+						}
+					}
+				}
+			}
+
+			.btn {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+
+				button {
+					margin: 10rpx;
+					font-size: 24rpx;
+				}
+			}
+
+			.gw {
+				display: flex;
+				align-items: center;
+				color: #1477f1;
+				font-weight: 600;
+				font-size: 30rpx;
+			}
+		}
+
+		.company-header {
+			display: flex;
+			align-items: center;
+			gap: 20rpx;
+			margin-bottom: 26rpx;
+
+			.company-img {
+				width: 110rpx;
+				height: 107rpx;
+				border-radius: 20rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.company-Address {
+			font-size: 26rpx;
+			color: #404040;
+			display: flex;
+			align-items: center;
+			gap: 10rpx;
+
+			.activity-status {
+				font-size: 24rpx;
+				color: #0088ff;
+				font-weight: 600;
+				position: relative;
+				margin-left: 10rpx;
+
+				&::before {
+					content: "";
+					display: inline-block;
+					width: 10rpx;
+					height: 10rpx;
+					background: #0088ff;
+					border-radius: 50rpx;
+					margin-right: 6rpx;
+				}
+			}
+		}
+
+		.company-name {
+			display: flex;
+			align-items: center;
+			font-size: 38rpx;
+			font-weight: bold;
+			color: #4d4d4d;
+			position: relative;
+			margin-bottom: 10rpx;
+			gap: 10rpx;
+
+			.job-type {
+				padding: 0 20rpx;
+				color: #fff;
+				background: #fd9a33;
+				border-radius: 20rpx;
+				font-weight: normal;
+				font-size: 24rpx;
+			}
+		}
+
+		.loading,
+		.no-more {
+			text-align: center;
+			padding: 20rpx 0;
+			color: #909399;
+			font-size: 28rpx;
+		}
+	}
+
+	// 弹窗样式
+	.popup-content {
+		width: 90vw;
+		height: 70vh;
+		// max-width: 600rpx;
+		// background: #fff;
+		border-radius: 20rpx;
+		padding: 10rpx 20rpx;
+	}
+
+	.btn-box {
+		width: 100%;
+		padding: 15rpx 0 20rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		gap: 50rpx;
+
+		button {
+			padding: 0 80rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+		}
+	}
+
+	.job-dialog {
+		// background: url("../../../assets/images/job/company/module/") no-repeat 100% 100%;
+
+		.dialog-content {
+			padding: 10rpx;
+			height: 80%;
+
+			.detail-item1 {
+				// display: flex;
+				// align-items: center;
+				margin: 30rpx 0;
+
+				.label {
+					width: 200rpx;
+					font-size: 32rpx;
+					color: #303133;
+					margin-bottom: 15rpx;
+				}
+
+				.value {
+					flex: 1;
+					display: flex;
+					gap: 20rpx;
+					align-items: center;
+				}
+
+				.picker {
+					width: 275rpx;
+					border: 1px solid #dcdfe6;
+					border-radius: 8rpx;
+					padding: 16rpx;
+				}
+			}
+		}
+
+		.title {
+			font-size: 38rpx;
+			font-weight: 600;
+			color: #303133;
+			padding: 20rpx;
+			padding-bottom: 0;
+			display: flex;
+			align-items: center;
+			position: sticky;
+			top: 0;
+
+			image {
+				width: 14rpx;
+				height: 33rpx;
+				margin-right: 14rpx;
+			}
+		}
+
+		textarea {
+			width: 100%;
+			height: 300rpx;
+			border: 1px solid #dcdfe6;
+			border-radius: 8rpx;
+			padding: 20rpx;
+			box-sizing: border-box;
+		}
+
+		input {
+			width: 100%;
+			border: 1px solid #dcdfe6;
+			border-radius: 8rpx;
+			height: 75rpx;
+			line-height: 75rpx;
+		}
+	}
+
+	.card-times {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 24rpx;
+
+		.left-date {
+			font-weight: 600;
+			font-size: 48rpx;
+			font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue", Helvetica,
+				Arial, "Microsoft YaHei", sans-serif;
+			background: linear-gradient(180deg, #015eea 0%, #00c0fa 100%);
+			-webkit-background-clip: text;
+			-webkit-text-fill-color: transparent;
+		}
+
+		.left-dateDay {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #333333;
+			margin-top: 12rpx;
+		}
+
+		.line {
+			width: 40rpx;
+			height: 2rpx;
+			background: #7bb6ff;
+			margin-top: 7rpx;
+		}
+
+		.time-center {
+			text-align: center;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+
+	.card-times .time-center .center-dateDay {
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #fff;
+		margin-top: 6rpx;
+		line-height: 48rpx;
+		width: max-content;
+		height: 48rpx;
+		background: #71b1ff;
+		border-radius: 8rpx;
+		padding: 0 30rpx;
+	}
+
+	.card-times .time-left,
+	.card-times .time-right {
+		text-align: center;
+	}
+
+	.expand {
+		display: flex;
+		flex-wrap: nowrap;
+		white-space: nowrap;
+		justify-content: center;
+		margin-bottom: 12rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #256bfa;
+
+		.expand-img {
+			width: 40rpx;
+			height: 40rpx;
+		}
+
+		.expand-img-active {
+			transform: rotate(180deg);
+		}
+	}
+
+	.num-box {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.num-item {
+			width: 50%;
+			text-align: center;
+
+			.num {
+				font-size: 40rpx;
+				font-weight: 600;
+				background: linear-gradient(184deg, #0BBAFB 0%, #4285EC 100%);
+				-webkit-background-clip: text;
+				-webkit-text-fill-color: transparent;
+			}
+
+			.num-desc {
+				font-size: 30rpx;
+				color: #0C458A;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index fca66c3..7d97d59 100644
--- a/pages.json
+++ b/pages.json
@@ -350,7 +350,8 @@
 	    "root": "packageB",
 	    "pages": [
 	        {
-	            "path" : "jobFair/detail",
+                // 我参与的招聘会详情
+	            "path" : "jobFair/detailCom",
 	            "style" :
 	            {
 	                "navigationBarTitleText" : "招聘会详情",
diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index 2b49310..a952a5b 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -1,788 +1,796 @@
 <template>
-  <view class="app-custom-root">
-    <view class="app-container">
-      <!-- 顶部头部区域 -->
-      <view class="container-header">
-        <view class="header-top">
-          <view
-            class="header-btnLf button-click"
-            @click="seemsg(1)"
-            :class="{ active: state.current === 1 }"
-          >
-            线上招聘会
-          </view>
-          <view
-            class="header-btnLf button-click"
-            @click="seemsg(2)"
-            :class="{ active: state.current === 2 }"
-          >
-            线下招聘会
-          </view>
-          <view
-            class="header-btnLf button-click"
-            @click="seemsg(3)"
-            :class="{ active: state.current === 3 }"
-          >
-            我参与的
-          </view>
-          <view
-            class="header-btnLf button-click"
-            @click="navTo('/packageB/login')"
-          >
-            登录
-          </view>
-        </view>
-        <view class="header-input btn-feel">
-          <uni-icons
-            class="iconsearch"
-            color="#666666"
-            type="search"
-            size="18"
-            @click="getFair('refresh')"
-          ></uni-icons>
-          <input
-            class="input"
-            placeholder="招聘会"
-            placeholder-class="inputplace"
-            v-model="pageState.jobFairTitle"
-          />
-        </view>
-      </view>
+	<view class="app-custom-root">
+		<view class="app-container">
+			<!-- 顶部头部区域 -->
+			<view class="container-header">
+				<view class="header-top">
+					<view class="header-btnLf button-click" @click="seemsg(1)" :class="{ active: state.current === 1 }">
+						线上招聘会
+					</view>
+					<view class="header-btnLf button-click" @click="seemsg(2)" :class="{ active: state.current === 2 }">
+						线下招聘会
+					</view>
+					<view class="header-btnLf button-click" @click="seemsg(3)" :class="{ active: state.current === 3 }">
+						我参与的
+					</view>
+					<view class="header-btnLf button-click" @click="navTo('/packageB/login')">
+						登录
+					</view>
+				</view>
+				<view class="header-input btn-feel">
+					<uni-icons class="iconsearch" color="#666666" type="search" size="18"
+						@click="getFair('refresh')"></uni-icons>
+					<input class="input" placeholder="招聘会" placeholder-class="inputplace"
+						v-model="pageState.jobFairTitle" />
+				</view>
+			</view>
 
-      <!-- 主体内容区域 -->
-      <view class="container-main">
-        <scroll-view
-          scroll-y
-          class="main-scroll"
-          @scrolltolower="handleScrollToLower"
-        >
-          <view class="cards" v-if="fairList.length">
-            <view
-              class="card press-button"
-              v-for="(item, index) in fairList"
-              :key="index"
-              @click="
-                navTo(
-                  '/packageA/pages/exhibitors/exhibitors?jobFairId=' +
-                    item.jobFairId
-                )
-              "
-            >
-              <view class="card-title">
-                {{ item.jobFairTitle }}
-                <view class="center-date" :style="{ color: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color }">
-                  {{ getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).statusText }}
-                </view>
-              </view>
-              <view class="card-row">
-                <text class="">{{ item.jobFairAddress }}</text>
-              </view>
-              <view class="card-times">
-                <view class="time-left">
-                  <view class="left-date">{{
-                    parseDateTime(item.jobFairStartTime).time
-                  }}</view>
-                  <view class="left-dateDay">{{
-                    parseDateTime(item.jobFairStartTime).date
-                  }}</view>
-                </view>
-                <view class="line"></view>
-                <view class="time-center">
-                  <view class="center-dateDay">
-                    {{
-                      getHoursBetween(
-                        item.jobFairStartTime,
-                        item.jobFairEndTime
-                      )
-                    }}小时
-                  </view>
-                </view>
-                <view class="line"></view>
-                <view class="time-right">
-                  <view class="left-date">{{
-                    parseDateTime(item.jobFairEndTime).time
-                  }}</view>
-                  <view class="left-dateDay">{{
-                    parseDateTime(item.jobFairEndTime).date
-                  }}</view>
-                </view>
-              </view>
-              <view class="recommend-card-line"></view>
-              <view class="card-footer"
-                >内容简介：{{ item.jobFairIntroduction || "暂无" }}</view
-              >
-            </view>
-          </view>
-          <empty v-else pdTop="200"></empty>
-        </scroll-view>
-      </view>
-      <!-- 自定义tabbar -->
-      <CustomTabBar :currentPage="1" />
+			<!-- 主体内容区域 -->
+			<view class="container-main">
+				<scroll-view scroll-y class="main-scroll" @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)">
+							<view class="card-title">
+								{{ item.jobFairTitle }}
+								<view class="center-date"
+									:style="{ color: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color,borderColor: getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).color  }">
+									{{ getTimeStatus(item.jobFairStartTime, item.jobFairEndTime).statusText }}
+								</view>
+							</view>
+							<view class="card-row">
+								<text class="">{{ item.jobFairAddress }}</text>
+							</view>
+							<view class="card-times">
+								<view class="time-left">
+									<view class="left-date">
+										{{parseDateTime(item.jobFairStartTime).time}}
+									</view>
+									<view class="left-dateDay">
+										{{parseDateTime(item.jobFairStartTime).date}}
+									</view>
+								</view>
+								<view class="line"></view>
+								<view class="time-center">
+									<view class="center-dateDay">
+										{{getHoursBetween(item.jobFairStartTime,item.jobFairEndTime)}}小时
+									</view>
+								</view>
+								<view class="line"></view>
+								<view class="time-right">
+									<view class="left-date">
+										{{parseDateTime(item.jobFairEndTime).time}}
+									</view>
+									<view class="left-dateDay">
+										{{parseDateTime(item.jobFairEndTime).date}}
+									</view>
+								</view>
+							</view>
+							<view class="recommend-card-line"></view>
+							<view class="card-footer">内容简介：{{ item.jobFairIntroduction || "暂无" }}</view>
+						</view>
+					</view>
+					<empty v-else pdTop="200"></empty>
+				</scroll-view>
+			</view>
+			<!-- 自定义tabbar -->
+			<CustomTabBar :currentPage="1" />
 
-      <!-- 微信授权登录弹窗 -->
-      <WxAuthLogin
-        ref="wxAuthLoginRef"
-        @success="handleLoginSuccess"
-      ></WxAuthLogin>
-    </view>
-  </view>
+			<!-- 微信授权登录弹窗 -->
+			<WxAuthLogin ref="wxAuthLoginRef" @success="handleLoginSuccess"></WxAuthLogin>
+		</view>
+	</view>
 </template>
 
 <script setup>
-import { reactive, inject, watch, ref, onMounted, onUnmounted } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
-import useLocationStore from "@/stores/useLocationStore";
-import { storeToRefs } from "pinia";
-import { tabbarManager } from "@/utils/tabbarManager";
-import WxAuthLogin from "@/components/WxAuthLogin/WxAuthLogin.vue";
-import config from "@/config.js";
-const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
-const wxAuthLoginRef = ref(null);
-const { $api, navTo, cloneDeep } = inject("globalFunction");
-const isLogin = ref(false);
-const weekList = ref([]);
-const fairList = ref([]);
-const currentDay = ref({});
-const userInfo = ref({});
-const state = reactive({
-  current: 1,
-  all: [{}],
-});
-const pageState = reactive({
-  pageNum: 0,
-  total: 0,
-  maxPage: 2,
-  pageSize: 10,
-  jobFairTitle: "",
-});
-const baseUrl = config.imgBaseUrl;
+	import {
+		reactive,
+		inject,
+		watch,
+		ref,
+		onMounted,
+		onUnmounted
+	} from "vue";
+	import {
+		onLoad,
+		onShow
+	} from "@dcloudio/uni-app";
+	import useLocationStore from "@/stores/useLocationStore";
+	import {
+		storeToRefs
+	} from "pinia";
+	import {
+		tabbarManager
+	} from "@/utils/tabbarManager";
+	import WxAuthLogin from "@/components/WxAuthLogin/WxAuthLogin.vue";
+	import config from "@/config.js";
+	const {
+		longitudeVal,
+		latitudeVal
+	} = storeToRefs(useLocationStore());
+	const wxAuthLoginRef = ref(null);
+	const {
+		$api,
+		navTo,
+		cloneDeep
+	} = inject("globalFunction");
+	const isLogin = ref(false);
+	const weekList = ref([]);
+	const fairList = ref([]);
+	const currentDay = ref({});
+	const userInfo = ref({});
+	const state = reactive({
+		current: 1,
+		all: [{}],
+	});
+	const pageState = reactive({
+		pageNum: 0,
+		total: 0,
+		maxPage: 2,
+		pageSize: 10,
+		jobFairTitle: "",
+	});
+	const baseUrl = config.imgBaseUrl;
 
-onLoad(() => {
-  // const today = new Date();
-  // const year = today.getFullYear();
-  // const month = String(today.getMonth() + 1).padStart(2, '0');
-  // const day = String(today.getDate()).padStart(2, '0');
+	onLoad(() => {
+		// const today = new Date();
+		// const year = today.getFullYear();
+		// const month = String(today.getMonth() + 1).padStart(2, '0');
+		// const day = String(today.getDate()).padStart(2, '0');
 
-  // const currentDate = `${year}-${month}-${day}`;
-  // const result = getNextDates({
-  //     startDate: currentDate,
-  // });
-  // weekList.value = result;
-  getHeart();
-});
+		// const currentDate = `${year}-${month}-${day}`;
+		// const result = getNextDates({
+		//     startDate: currentDate,
+		// });
+		// weekList.value = result;
+		getHeart();
+	});
 
-onShow(() => {
-  // 更新自定义tabbar选中状态
-  tabbarManager.updateSelected(1);
-});
+	onShow(() => {
+		// 更新自定义tabbar选中状态
+		tabbarManager.updateSelected(1);
+	});
 
-onMounted(() => {
-  // 监听退出登录事件，显示微信登录弹窗
-  uni.$on("showLoginModal", () => {
-    wxAuthLoginRef.value?.open();
-  });
-});
+	onMounted(() => {
+		// 监听退出登录事件，显示微信登录弹窗
+		uni.$on("showLoginModal", () => {
+			wxAuthLoginRef.value?.open();
+		});
+	});
 
-onUnmounted(() => {
-  uni.$off("showLoginModal");
-});
+	onUnmounted(() => {
+		uni.$off("showLoginModal");
+	});
 
-// 登录成功回调
-const handleLoginSuccess = () => {
-  console.log("登录成功");
-  // 可以在这里添加登录成功后的处理逻辑
-};
+	// 登录成功回调
+	const handleLoginSuccess = () => {
+		console.log("登录成功");
+		// 可以在这里添加登录成功后的处理逻辑
+	};
+	
+	function goDetail(jobFairId){
+		if(state.current != 3){
+			navTo('/packageA/pages/exhibitors/exhibitors?jobFairId=' + jobFairId)
+		}else{
+			navTo('/packageB/jobFair/detailCom?jobFairId=' + jobFairId)
+		}
+	}
 
-function toSelectDate() {
-  navTo("/packageA/pages/selectDate/selectDate", {
-    query: {
-      date: currentDay.value.fullDate,
-    },
-    onBack: (res) => {
-      const result = getNextDates({
-        startDate: res.date,
-      });
-      const formattedDate = res.date.slice(5); // MM-DD
-      const dateFull = {
-        date: res.date.slice(5),
-        day: "周" + res.week,
-        fullDate: res.date,
-      };
-      currentDay.value = dateFull;
-      weekList.value = result;
-      getFair("refresh");
-    },
-  });
-}
-// 查看消息类型
-function changeSwiperMsgType(e) {
-  const currented = e.detail.current;
-  state.current = currented;
-}
+	function toSelectDate() {
+		navTo("/packageA/pages/selectDate/selectDate", {
+			query: {
+				date: currentDay.value.fullDate,
+			},
+			onBack: (res) => {
+				const result = getNextDates({
+					startDate: res.date,
+				});
+				const formattedDate = res.date.slice(5); // MM-DD
+				const dateFull = {
+					date: res.date.slice(5),
+					day: "周" + res.week,
+					fullDate: res.date,
+				};
+				currentDay.value = dateFull;
+				weekList.value = result;
+				getFair("refresh");
+			},
+		});
+	}
+	// 查看消息类型
+	function changeSwiperMsgType(e) {
+		const currented = e.detail.current;
+		state.current = currented;
+	}
 
-function seemsg(index) {
-  state.current = index;
-  console.log(index, "index");
+	function seemsg(index) {
+		state.current = index;
+		if (index != 3) {
+			getFair("refresh");
+		} else {
+			if (!isLogin.value) {
+				getHeart();
+				return;
+			}
+			// 确保获取到用户信息后再请求“我参与的”列表
+			if (!userInfo.value?.info?.userId) {
+				getUser().then(() => {
+					getMyFair("refresh");
+				});
+			} else {
+				getMyFair("refresh");
+			}
+		}
+	}
 
-  if (index != 3) {
-    getFair("refresh");
-  } else {
-    if (!isLogin.value) {
-      // 未登录则先触发心跳与登录流程
-      getHeart();
-      return;
-    }
-    // 确保获取到用户信息后再请求“我参与的”列表
-    if (!userInfo.value?.info?.userId) {
-      getUser().then(() => {
-        getMyFair("refresh");
-      });
-    } else {
-      getMyFair("refresh");
-    }
-  }
-}
+	const handleScrollToLower = () => {
+		if (pageState.pageNum >= pageState.maxPage) {
+			return;
+		} else {
+			if (state.current != 3) {
+				getFair();
+			} else {
+				this.$nextTick(() => {
+					getMyFair();
+				});
+			}
+		}
+	};
 
-const handleScrollToLower = () => {
-  if (pageState.pageNum >= pageState.maxPage) {
-    return;
-  } else {
-    if (state.current != 3) {
-      getFair();
-    } else {
-      this.$nextTick(() => {
-        getMyFair();
-      });
-    }
-  }
-};
+	function getHeart() {
+		const raw = uni.getStorageSync("Padmin-Token");
+		const token = typeof raw === "string" ? raw.trim() : "";
+		const headers = token ? {
+			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
+		} : {};
 
-function getHeart() {
-  const raw = uni.getStorageSync("Padmin-Token");
-  const token = typeof raw === "string" ? raw.trim() : "";
-  const headers = token
-    ? { Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}` }
-    : {};
+		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData) => {
+			if (resData.code == 200) {
+				isLogin.value = true;
+				getUser();
+			} else {
+				isLogin.value = false;
+				$api.msg('请先登录')
+				getFair("refresh");
+			}
+		});
+	}
 
-  $api
-    .myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers)
-    .then((resData) => {
-      if (resData.code == 200) {
-        isLogin.value = true;
-        getUser();
-      } else {
-        isLogin.value = false;
-        getFair("refresh");
-      }
-    });
-}
-function getUser() {
-  const raw = uni.getStorageSync("Padmin-Token");
-  const token = typeof raw === "string" ? raw.trim() : "";
-  const headers = token
-    ? { Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}` }
-    : {};
+	function getUser() {
+		const raw = uni.getStorageSync("Padmin-Token");
+		const token = typeof raw === "string" ? raw.trim() : "";
+		const headers = token ? {
+			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
+		} : {};
 
-  return $api
-    .myRequest("/system/user/login/user/info", {}, "GET", 10100, headers)
-    .then((resData) => {
-      // 正确映射响应为用户信息（优先使用 data 字段）
-      const data = resData?.data ?? resData;
-      userInfo.value = data || {};
-      getFair("refresh");
-      return userInfo.value;
-    });
-}
-function getMyFair(type = "add") {
-  if (type === "refresh") {
-    pageState.pageNum = 1;
-    pageState.maxPage = 1;
-  }
-  if (type === "add" && pageState.pageNum < pageState.maxPage) {
-    pageState.pageNum += 1;
-  }
-  let params = {
-    pageNum: pageState.pageNum,
-    pageSize: pageState.pageSize,
-    jobFairTitle: pageState.jobFairTitle,
-  };
-  if (isLogin.value) {
-    if (userInfo.value.userType == "ent") {
-      params.enterpriseId = userInfo.value.info.userId;
-    } else {
-      params.personId = userInfo.value.info.userId;
-    }
-  }
-  $api
-    .myRequest("/jobfair/public/jobfair/enterprise/my-sign-up-job-fair", params)
-    .then((resData) => {
-      if (type === "add") {
-        const reslist = resData.data.list;
-        fairList.value = fairList.value.concat(reslist);
-      } else {
-        fairList.value = resData.data.list;
-      }
-      pageState.total = resData.data.total;
-      pageState.maxPage = resData.data.pages;
-    });
-}
-function getFair(type = "add") {
-  if (type === "refresh") {
-    pageState.pageNum = 1;
-    pageState.maxPage = 1;
-  }
-  if (type === "add" && pageState.pageNum < pageState.maxPage) {
-    pageState.pageNum += 1;
-  }
-  let params = {
-    pageNum: pageState.pageNum,
-    pageSize: pageState.pageSize,
-    jobFairTitle: pageState.jobFairTitle,
-    jobFairType: state.current,
-  };
-  if (isLogin.value) {
-    if (userInfo.value.userType == "ent") {
-      params.enterpriseId = userInfo.value.info.userId;
-    } else {
-      params.personId = userInfo.value.info.userId;
-    }
-  }
-  $api.myRequest("/jobfair/public/jobfair/page", params).then((resData) => {
-    if (type === "add") {
-      const reslist = resData.data.list;
-      fairList.value = fairList.value.concat(reslist);
-    } else {
-      fairList.value = resData.data.list;
-    }
-    pageState.total = resData.data.total;
-    pageState.maxPage = resData.data.pages;
-  });
-}
+		return $api.myRequest("/system/user/login/user/info", {}, "GET", 10100, headers).then((resData) => {
+			// 正确映射响应为用户信息（优先使用 data 字段）
+			const data = resData?.data ?? resData;
+			userInfo.value = data || {};
+			getFair("refresh");
+			return userInfo.value;
+		});
+	}
 
-function toIOSDate(input) {
-  if (!input) return null;
-  if (input instanceof Date) return isNaN(input.getTime()) ? null : input;
-  if (typeof input === "number") {
-    const d = new Date(input);
-    return isNaN(d.getTime()) ? null : d;
-  }
-  if (typeof input !== "string") return null;
-  let s = input.trim();
-  // "YYYY-MM-DD HH:mm[:ss]" -> "YYYY-MM-DDTHH:mm[:ss]"
-  if (/^\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}(:\d{2})?$/.test(s)) {
-    s = s.replace(" ", "T");
-    // 仅到分钟则补秒
-    if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/.test(s)) {
-      s = s + ":00";
-    }
-  }
-  // 其余已是 iOS 可解析格式："YYYY/MM/DD[ HH:mm:ss]"、"YYYY-MM-DD"、ISO 8601 等
-  const d = new Date(s);
-  return isNaN(d.getTime()) ? null : d;
-}
+	function getMyFair(type = "add") {
+		if (type === "refresh") {
+			pageState.pageNum = 1;
+			pageState.maxPage = 1;
+		}
+		if (type === "add" && pageState.pageNum < pageState.maxPage) {
+			pageState.pageNum += 1;
+		}
+		let params = {
+			pageNum: pageState.pageNum,
+			pageSize: pageState.pageSize,
+			jobFairTitle: pageState.jobFairTitle,
+		};
+		if (isLogin.value) {
+			console.log(userInfo, 'userInfo');
+			if (userInfo.value.userType == "ent") {
+				params.enterpriseId = userInfo.value.info.userId;
+				$api.myRequest("/jobfair/public/jobfair/enterprise/my-sign-up-job-fair", params).then((resData) => {
+					if (type === "add") {
+						const reslist = resData.data.list;
+						fairList.value = fairList.value.concat(reslist);
+					} else {
+						fairList.value = resData.data.list;
+					}
+					pageState.total = resData.data.total;
+					pageState.maxPage = resData.data.pages;
+				});
+			} else {
+				params.personId = userInfo.value.info.userId;
+				$api.myRequest("/jobfair/public/jobfair/person/my-sign-up-job-fair", params).then((resData) => {
+					if (type === "add") {
+						const reslist = resData.data.list;
+						fairList.value = fairList.value.concat(reslist);
+					} else {
+						fairList.value = resData.data.list;
+					}
+					pageState.total = resData.data.total;
+					pageState.maxPage = resData.data.pages;
+				});
+			}
+			console.log(params, 'params');
+		} else {
+			$api.msg('请先登录');
+		}
 
-function parseDateTime(datetimeStr) {
-  if (!datetimeStr)
-    return {
-      time: "",
-      date: "",
-    };
+	}
 
-  const dateObj = toIOSDate(datetimeStr);
+	function getFair(type = "add") {
+		if (type === "refresh") {
+			pageState.pageNum = 1;
+			pageState.maxPage = 1;
+		}
+		if (type === "add" && pageState.pageNum < pageState.maxPage) {
+			pageState.pageNum += 1;
+		}
+		let params = {
+			pageNum: pageState.pageNum,
+			pageSize: pageState.pageSize,
+			jobFairTitle: pageState.jobFairTitle,
+			jobFairType: state.current,
+		};
+		if (isLogin.value) {
+			if (userInfo.value.userType == "ent") {
+				params.enterpriseId = userInfo.value.info.userId;
+			} else {
+				params.personId = userInfo.value.info.userId;
+			}
+		}
+		$api.myRequest("/jobfair/public/jobfair/page", params).then((resData) => {
+			if (type === "add") {
+				const reslist = resData.data.list;
+				fairList.value = fairList.value.concat(reslist);
+			} else {
+				fairList.value = resData.data.list;
+			}
+			pageState.total = resData.data.total;
+			pageState.maxPage = resData.data.pages;
+		});
+	}
 
-  if (!dateObj)
-    return {
-      time: "",
-      date: "",
-    }; // 无效时间
+	function toIOSDate(input) {
+		if (!input) return null;
+		if (input instanceof Date) return isNaN(input.getTime()) ? null : input;
+		if (typeof input === "number") {
+			const d = new Date(input);
+			return isNaN(d.getTime()) ? null : d;
+		}
+		if (typeof input !== "string") return null;
+		let s = input.trim();
+		// "YYYY-MM-DD HH:mm[:ss]" -> "YYYY-MM-DDTHH:mm[:ss]"
+		if (/^\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}(:\d{2})?$/.test(s)) {
+			s = s.replace(" ", "T");
+			// 仅到分钟则补秒
+			if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/.test(s)) {
+				s = s + ":00";
+			}
+		}
+		// 其余已是 iOS 可解析格式："YYYY/MM/DD[ HH:mm:ss]"、"YYYY-MM-DD"、ISO 8601 等
+		const d = new Date(s);
+		return isNaN(d.getTime()) ? null : d;
+	}
 
-  const year = dateObj.getFullYear();
-  const month = String(dateObj.getMonth() + 1).padStart(2, "0");
-  const day = String(dateObj.getDate()).padStart(2, "0");
-  const hours = String(dateObj.getHours()).padStart(2, "0");
-  const minutes = String(dateObj.getMinutes()).padStart(2, "0");
+	function parseDateTime(datetimeStr) {
+		if (!datetimeStr)
+			return {
+				time: "",
+				date: "",
+			};
 
-  return {
-    time: `${hours}:${minutes}`,
-    date: `${year}年${month}月${day}日`,
-  };
-}
+		const dateObj = toIOSDate(datetimeStr);
 
-function getTimeStatus(startTimeStr, endTimeStr) {
-  const now = new Date();
-  const startTime = toIOSDate(startTimeStr);
-  const endTime = toIOSDate(endTimeStr);
+		if (!dateObj)
+			return {
+				time: "",
+				date: "",
+			}; // 无效时间
 
-  if (!startTime || !endTime) {
-    return { status: 1, statusText: "时间异常", color: "#999999" };
-  }
+		const year = dateObj.getFullYear();
+		const month = String(dateObj.getMonth() + 1).padStart(2, "0");
+		const day = String(dateObj.getDate()).padStart(2, "0");
+		const hours = String(dateObj.getHours()).padStart(2, "0");
+		const minutes = String(dateObj.getMinutes()).padStart(2, "0");
 
-  // 判断状态：0 开始中，1 过期，2 未开始
-  let status = 0;
-  let statusText = "开始中";
-  let color = "#13C57C"; // 进行中 - 绿色
-  if (now < startTime) {
-    status = 2; // 未开始
-    statusText = "未开始";
-    color = "#015EEA"; // 未开始 - 蓝色
-  } else if (now > endTime) {
-    status = 1; // 已过期
-    statusText = "已过期";
-    color = "#999999"; // 已过期 - 灰色
-  } else {
-    status = 0; // 进行中
-    statusText = "进行中";
-    color = "#13C57C"; // 进行中 - 绿色
-  }
-  return {
-    status, // 0: 进行中，1: 已过期，2: 未开始
-    statusText,
-    color
-  };
-}
+		return {
+			time: `${hours}:${minutes}`,
+			date: `${year}年${month}月${day}日`,
+		};
+	}
 
-function getHoursBetween(startTimeStr, endTimeStr) {
-  const start = toIOSDate(startTimeStr);
-  const end = toIOSDate(endTimeStr);
+	function getTimeStatus(startTimeStr, endTimeStr) {
+		const now = new Date();
+		const startTime = toIOSDate(startTimeStr);
+		const endTime = toIOSDate(endTimeStr);
 
-  if (!start || !end) return 0;
+		if (!startTime || !endTime) {
+			return {
+				status: 1,
+				statusText: "时间异常",
+				color: "#999999"
+			};
+		}
 
-  const diffMs = end - start;
-  const diffHours = diffMs / (1000 * 60 * 60);
+		// 判断状态：0 开始中，1 过期，2 未开始
+		let status = 0;
+		let statusText = "开始中";
+		let color = "#13C57C"; // 进行中 - 绿色
+		if (now < startTime) {
+			status = 2; // 未开始
+			statusText = "未开始";
+			color = "#015EEA"; // 未开始 - 蓝色
+		} else if (now > endTime) {
+			status = 1; // 已过期
+			statusText = "已过期";
+			color = "#999999"; // 已过期 - 灰色
+		} else {
+			status = 0; // 进行中
+			statusText = "进行中";
+			color = "#13C57C"; // 进行中 - 绿色
+		}
+		return {
+			status, // 0: 进行中，1: 已过期，2: 未开始
+			statusText,
+			color
+		};
+	}
 
-  return +diffHours.toFixed(2); // 保留 2 位小数
-}
+	function getHoursBetween(startTimeStr, endTimeStr) {
+		const start = toIOSDate(startTimeStr);
+		const end = toIOSDate(endTimeStr);
 
-const selectDate = (item) => {
-  if (currentDay.value?.fullDate === item.fullDate) {
-    currentDay.value = {};
-    getFair("refresh");
-    return;
-  }
-  currentDay.value = item;
-  getFair("refresh");
-};
+		if (!start || !end) return 0;
 
-function getNextDates({ startDate = "", count = 6 }) {
-  const baseDate = startDate ? toIOSDate(startDate) || new Date() : new Date(); // 指定起点或今天
-  const dates = [];
-  const dayNames = ["日", "一", "二", "三", "四", "五", "六"];
+		const diffMs = end - start;
+		const diffHours = diffMs / (1000 * 60 * 60);
 
-  for (let i = 0; i < count; i++) {
-    const date = new Date(baseDate);
-    date.setDate(baseDate.getDate() + i);
+		return +diffHours.toFixed(2); // 保留 2 位小数
+	}
 
-    const fullDate = date.toISOString().slice(0, 10); // YYYY-MM-DD
-    const formattedDate = fullDate.slice(5); // MM-DD
-    const dayOfWeek = dayNames[date.getDay()];
+	const selectDate = (item) => {
+		if (currentDay.value?.fullDate === item.fullDate) {
+			currentDay.value = {};
+			getFair("refresh");
+			return;
+		}
+		currentDay.value = item;
+		getFair("refresh");
+	};
 
-    dates.push({
-      date: formattedDate,
-      fullDate,
-      day: "周" + dayOfWeek,
-    });
-  }
+	function getNextDates({
+		startDate = "",
+		count = 6
+	}) {
+		const baseDate = startDate ? toIOSDate(startDate) || new Date() : new Date(); // 指定起点或今天
+		const dates = [];
+		const dayNames = ["日", "一", "二", "三", "四", "五", "六"];
 
-  // 可选设置默认选中项
-  // currentDay.value = dates[0];
+		for (let i = 0; i < count; i++) {
+			const date = new Date(baseDate);
+			date.setDate(baseDate.getDate() + i);
 
-  return dates;
-}
+			const fullDate = date.toISOString().slice(0, 10); // YYYY-MM-DD
+			const formattedDate = fullDate.slice(5); // MM-DD
+			const dayOfWeek = dayNames[date.getDay()];
+
+			dates.push({
+				date: formattedDate,
+				fullDate,
+				day: "周" + dayOfWeek,
+			});
+		}
+
+		// 可选设置默认选中项
+		// currentDay.value = dates[0];
+
+		return dates;
+	}
 </script>
 
 <style scoped lang="stylus">
-.app-custom-root {
-  position: fixed;
-  z-index: 10;
-  width: 100vw;
-  height: calc(100% - var(--window-bottom));
-  overflow: hidden;
-}
+	.app-custom-root {
+		position: fixed;
+		z-index: 10;
+		width: 100vw;
+		height: calc(100% - var(--window-bottom));
+		overflow: hidden;
+	}
 
-.app-container {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  width: 100%;
-}
+	.app-container {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		width: 100%;
+	}
 
-.app-container .container-header {
-  background: url("@/static/icon/background2.png") 0 0 no-repeat;
-  background-size: 100% 400rpx;
-}
+	.app-container .container-header {
+		background: url("@/static/icon/background2.png") 0 0 no-repeat;
+		background-size: 100% 400rpx;
+	}
 
-.app-container .container-header .header-top {
-  display: flex;
-  line-height: calc(88rpx - 14rpx);
-  padding: 16rpx 44rpx 14rpx 44rpx;
-}
+	.app-container .container-header .header-top {
+		display: flex;
+		line-height: calc(88rpx - 14rpx);
+		padding: 16rpx 44rpx 14rpx 44rpx;
+	}
 
-.app-container .container-header .header-top .header-btnLf {
-  display: flex;
-  white-space: nowrap;
-  justify-content: flex-start;
-  align-items: center;
-  width: calc(60rpx * 3);
-  font-weight: 500;
-  font-size: 40rpx;
-  color: #696969;
-  margin-right: 44rpx;
-  position: relative;
-}
+	.app-container .container-header .header-top .header-btnLf {
+		display: flex;
+		white-space: nowrap;
+		justify-content: flex-start;
+		align-items: center;
+		width: calc(60rpx * 3);
+		font-weight: 500;
+		font-size: 40rpx;
+		color: #696969;
+		margin-right: 44rpx;
+		position: relative;
+	}
 
-.app-container .container-header .header-top .header-btnLf .btns-wd {
-  position: absolute;
-  top: 2rpx;
-  right: 2rpx;
-  width: 16rpx;
-  height: 16rpx;
-  background: #f73636;
-  border-radius: 50%;
-  border: 4rpx solid #eeeeff;
-}
+	.app-container .container-header .header-top .header-btnLf .btns-wd {
+		position: absolute;
+		top: 2rpx;
+		right: 2rpx;
+		width: 16rpx;
+		height: 16rpx;
+		background: #f73636;
+		border-radius: 50%;
+		border: 4rpx solid #eeeeff;
+	}
 
-.app-container .container-header .header-top .active {
-  font-weight: 600;
-  font-size: 40rpx;
-  color: #000000;
-}
+	.app-container .container-header .header-top .active {
+		font-weight: 600;
+		font-size: 40rpx;
+		color: #000000;
+	}
 
-.app-container .container-header .header-input {
-  padding: 0 24rpx;
-  width: calc(100% - 48rpx);
-  position: relative;
-}
+	.app-container .container-header .header-input {
+		padding: 0 24rpx;
+		width: calc(100% - 48rpx);
+		position: relative;
+	}
 
-.app-container .container-header .header-input .iconsearch {
-  position: absolute;
-  left: 50rpx;
-  top: 50%;
-  transform: translate(0, -50%);
-}
+	.app-container .container-header .header-input .iconsearch {
+		position: absolute;
+		left: 50rpx;
+		top: 50%;
+		transform: translate(0, -50%);
+	}
 
-.app-container .container-header .header-input .input {
-  padding: 0 30rpx 0 80rpx;
-  height: 80rpx;
-  background: #ffffff;
-  border-radius: 75rpx;
-  font-size: 28rpx;
-}
+	.app-container .container-header .header-input .input {
+		padding: 0 30rpx 0 80rpx;
+		height: 80rpx;
+		background: #ffffff;
+		border-radius: 75rpx;
+		font-size: 28rpx;
+	}
 
-.app-container .container-header .header-input .inputplace {
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #b5b5b5;
-}
+	.app-container .container-header .header-input .inputplace {
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #b5b5b5;
+	}
 
-.app-container .container-header .header-date {
-  padding: 28rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
+	.app-container .container-header .header-date {
+		padding: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
 
-.app-container .container-header .header-date .data-week {
-  flex: 1;
-  display: flex;
-  justify-content: space-between;
-  flex-wrap: nowrap;
-  overflow: hidden;
-}
+	.app-container .container-header .header-date .data-week {
+		flex: 1;
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: nowrap;
+		overflow: hidden;
+	}
 
-.app-container .container-header .header-date .data-week .weel-days {
-  font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue", Helvetica,
-    Arial, "Microsoft YaHei", sans-serif;
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-  text-align: center;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #333333;
-  width: 96rpx;
-  height: 88rpx;
-}
+	.app-container .container-header .header-date .data-week .weel-days {
+		font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue", Helvetica,
+			Arial, "Microsoft YaHei", sans-serif;
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		text-align: center;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #333333;
+		width: 96rpx;
+		height: 88rpx;
+	}
 
-.app-container .container-header .header-date .data-week .weel-days .day {
-  font-weight: 500;
-}
+	.app-container .container-header .header-date .data-week .weel-days .day {
+		font-weight: 500;
+	}
 
-.app-container .container-header .header-date .data-week .active {
-  background: rgba(37, 107, 250, 0.1);
-  border-radius: 12rpx;
-  color: #256bfa;
-}
+	.app-container .container-header .header-date .data-week .active {
+		background: rgba(37, 107, 250, 0.1);
+		border-radius: 12rpx;
+		color: #256bfa;
+	}
 
-.app-container .container-header .header-date .data-all {
-  width: 66rpx;
-  height: 66rpx;
-  margin-left: 18rpx;
-}
+	.app-container .container-header .header-date .data-all {
+		width: 66rpx;
+		height: 66rpx;
+		margin-left: 18rpx;
+	}
 
-.app-container .container-header .header-date .data-all .allimg {
-  width: 100%;
-  height: 100%;
-}
+	.app-container .container-header .header-date .data-all .allimg {
+		width: 100%;
+		height: 100%;
+	}
 
-.container-main {
-  flex: 1;
-  overflow: hidden;
-  background-color: #f4f4f4;
-}
+	.container-main {
+		flex: 1;
+		overflow: hidden;
+		background-color: #f4f4f4;
+	}
 
-.main-scroll {
-  width: 100%;
-  height: calc(100% - 150rpx);
-}
+	.main-scroll {
+		width: 100%;
+		height: calc(100% - 150rpx);
+	}
 
-.cards {
-  padding: 28rpx;
-}
+	.cards {
+		padding: 28rpx;
+	}
 
-.cards .card {
-  margin-top: 28rpx;
-  padding: 32rpx;
-  background: linear-gradient(to bottom, #e3efff 0%, #fbfdff 100%);
-  box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
-  border-radius: 20rpx;
-}
+	.cards .card {
+		margin-top: 28rpx;
+		padding: 32rpx;
+		background: linear-gradient(to bottom, #e3efff 0%, #fbfdff 100%);
+		box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
+		border-radius: 20rpx;
+	}
 
-.cards .card-title {
-  font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue", Helvetica,
-    Arial, "Microsoft YaHei", sans-serif;
-  font-weight: 600;
-  font-size: 34rpx;
-  color: #005eb6;
-  text-align: center;
-  position relative
-  &::after {
-    content: "";
-    width: 120rpx;
-    height: 4rpx;
-    background: linear-gradient(to right, #015EEA 0%, #00C0FA 100%);
-    position: absolute;
-    left: 50%;
-    bottom: -14rpx;
-    transform: translate(-50%, -50%);
-  }
-  .center-date {
-    font-weight: 400;
-    font-size: 28rpx;
-    color: #ff881a;
-    position: absolute;
-    right: 0;
-  }
-}
+	.cards .card-title {
+		font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue", Helvetica,
+			Arial, "Microsoft YaHei", sans-serif;
+		font-weight: 600;
+		font-size: 34rpx;
+		color: #005eb6;
+		text-align: center;
+		position relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 
-.cards .card-row {
-  display: flex;
-  justify-content: center;
-  font-size: 26rpx;
-  color: #3e8ff3;
-  margin-top: 23rpx;
-}
+		&::after {
+			content: "";
+			width: 120rpx;
+			height: 4rpx;
+			background: linear-gradient(to right, #015EEA 0%, #00C0FA 100%);
+			position: absolute;
+			left: 50%;
+			bottom: -14rpx;
+			transform: translate(-50%, -50%);
+		}
 
-.cards .card-times {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 24rpx;
-}
+		.center-date {
+			font-weight: 400;
+			font-size: 24rpx;
+			// position: absolute;
+			// right: 0;
+			// top: 0;
+			border: 1rpx solid;
+			padding: 5rpx 10rpx;
+			margin-left: 10rpx;
+		}
+	}
 
-.cards .card-times .time-left,
-.cards .card-times .time-right {
-  text-align: center;
-}
+	.cards .card-row {
+		display: flex;
+		justify-content: center;
+		font-size: 26rpx;
+		color: #3e8ff3;
+		margin-top: 23rpx;
+	}
 
-.cards .card-times .left-date {
-  font-weight: 600;
-  font-size: 48rpx;
-  font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue", Helvetica,
-    Arial, "Microsoft YaHei", sans-serif;
-    background: linear-gradient(180deg, #015EEA 0%, #00C0FA 100%);
--webkit-background-clip: text;
--webkit-text-fill-color: transparent;
-}
+	.cards .card-times {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 24rpx;
+	}
 
-.cards .card-times .left-dateDay {
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #333333;
-  margin-top: 12rpx;
-}
+	.cards .card-times .time-left,
+	.cards .card-times .time-right {
+		text-align: center;
+	}
 
-.cards .card-times .line {
-  width: 40rpx;
-  height: 2rpx;
-  background: #7BB6FF;
-  margin-top: 64rpx;
-}
+	.cards .card-times .left-date {
+		font-weight: 600;
+		font-size: 48rpx;
+		font-family: "PingFangSC-Medium", "PingFang SC", "Helvetica Neue", Helvetica,
+			Arial, "Microsoft YaHei", sans-serif;
+		background: linear-gradient(180deg, #015EEA 0%, #00C0FA 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+	}
 
-.cards .card-times .time-center {
-  text-align: center;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
+	.cards .card-times .left-dateDay {
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #333333;
+		margin-top: 12rpx;
+	}
+
+	.cards .card-times .line {
+		width: 40rpx;
+		height: 2rpx;
+		background: #7BB6FF;
+		margin-top: 7rpx;
+	}
+
+	.cards .card-times .time-center {
+		text-align: center;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
 
 
-.cards .card-times .time-center .center-dateDay {
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #fff;
-  margin-top: 6rpx;
-  line-height: 48rpx;
-  width: max-content;
-  height: 48rpx;
-  background: #71B1FF;
-  border-radius: 8rpx;
-  padding: 0 30rpx;
-}
+	.cards .card-times .time-center .center-dateDay {
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #fff;
+		margin-top: 6rpx;
+		line-height: 48rpx;
+		width: max-content;
+		height: 48rpx;
+		background: #71B1FF;
+		border-radius: 8rpx;
+		padding: 0 30rpx;
+	}
 
-.cards .recommend-card-line {
-  width: 100%;
-  height: 0;
-  border-radius: 0;
-  border-bottom: 2rpx dashed rgba(0, 0, 0, 0.14);
-  margin-top: 32rpx;
-  position: relative;
-}
+	.cards .recommend-card-line {
+		width: 100%;
+		height: 0;
+		border-radius: 0;
+		border-bottom: 2rpx dashed rgba(0, 0, 0, 0.14);
+		margin-top: 32rpx;
+		position: relative;
+	}
 
-.cards .recommend-card-line::before {
-  content: "";
-  position: absolute;
-  left: 0;
-  top: 0;
-  transform: translate(-50%, -50%);
-  width: 28rpx;
-  height: 28rpx;
-  background: #f4f4f4;
-  border-radius: 50%;
-}
+	.cards .recommend-card-line::before {
+		content: "";
+		position: absolute;
+		left: 0;
+		top: 0;
+		transform: translate(-50%, -50%);
+		width: 28rpx;
+		height: 28rpx;
+		background: #f4f4f4;
+		border-radius: 50%;
+	}
 
-.cards .recommend-card-line::after {
-  content: "";
-  position: absolute;
-  right: 0;
-  top: 0;
-  transform: translate(50%, -50%);
-  width: 28rpx;
-  height: 28rpx;
-  background: #f4f4f4;
-  border-radius: 50%;
-}
+	.cards .recommend-card-line::after {
+		content: "";
+		position: absolute;
+		right: 0;
+		top: 0;
+		transform: translate(50%, -50%);
+		width: 28rpx;
+		height: 28rpx;
+		background: #f4f4f4;
+		border-radius: 50%;
+	}
 
-.cards .card-footer {
-  margin-top: 32rpx;
-  min-height: 50rpx;
-  font-weight: 400;
-  font-size: 28rpx;
-  color: #6c7282;
-  text-align: center;
-}
+	.cards .card-footer {
+		margin-top: 32rpx;
+		min-height: 50rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #6c7282;
+		text-align: center;
+	}
 
-.cards .card:first-child {
-  margin-top: 0;
-}
-</style>
+	.cards .card:first-child {
+		margin-top: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index ff417f2..8fc56e7 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -593,8 +593,6 @@ const { columnCount, columnSpace } = useColumnCount(() => {
 const getCompanyInfo = () => {
     try {
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        console.log('缓存中的userInfo:', cachedUserInfo);
-        
         // 重置企业信息
         companyInfo.name = '';
         companyInfo.avatar = '';