1.0.1完善

2 months ago · 09db1caadf
16 changed files with 1821 additions and 905 deletions
--- a/api/httpSetting.js
+++ b/api/httpSetting.js
@ -1,114 +1,133 @@
 // api.js

+// 导入qs库
+import qs from "qs";
+
 // 基础URL，可以根据环境来设置
 // uEnvDev
 const accountInfo = wx.getAccountInfoSync();
 // env类型 develop:开发版、trial:体验版、release:正式版
 export const env = accountInfo.miniProgram.envVersion;
 if (!env) {
-	console.error("获取运行环境失败!");
+  console.error("获取运行环境失败!");
 }
 const baseApi = {
-	// 开发版
-	develop: "http://110.40.156.216:30005/api",
-	// 体验版
-	trial: "http://110.40.156.216:30005/api",
-	// 正式版
-	release: "http://110.40.156.216:30005/api"
+  // 开发版
+  develop: "http://110.40.156.216:30005/api",
+  // 体验版
+  trial: "http://110.40.156.216:30005/api",
+  // 正式版
+  release: "http://110.40.156.216:30005/api",
 };
-console.log(env, 'env')
+console.log(env, "env");
 // request请求baseURL
-const BASE_URL = baseApi[env] || 'http://110.40.156.216:30005/api';
-
+const BASE_URL = baseApi[env] || "http://110.40.156.216:30005/api";

 function request(url, method, data = {}) {
-	const loginRes = uni.getStorageSync('loginRes') || {};
-	const UTCOffset = new Date().getTimezoneOffset();
-	return new Promise((resolve, reject) => {
-		uni.request({
-			url: BASE_URL + url, // 完整的URL
-			method: method,
-			data: data,
-			header: {
-				'AccessToken': loginRes.accessToken || '-1', // 请求头，可根据需要调整
-				'UserId': loginRes.appUserId || '-1', // 请求头，可根据需要调整
-				'LanguageType': 0,
-			},
-			success: (res) => {
-				if (res.statusCode === 200) {
-					console.log(res)
-					if (res.data.code === 200 | res.data.code === 0) {
-						resolve(res.data)
-					} else {
-						reject(res.data)
-					}
-				} else {
-					reject(res);
-				}
-
-			},
-			fail: (err) => {
-				uni.showToast({
-					title: '请求错误', // 提示的文本内容
-					icon: 'none', // 提示的图标，可选值：'success' | 'loading' | 'none'
-					duration: 2000 // 提示框的显示时间，单位为毫秒，默认1500ms
-				});
-				reject(err); // 请求失败
-			}
-		});
-	});
+  const loginRes = uni.getStorageSync("loginRes") || {};
+  const UTCOffset = new Date().getTimezoneOffset();
+  return new Promise((resolve, reject) => {
+    uni.request({
+      url: BASE_URL + url, // 完整的URL
+      method: method,
+      data: data,
+      header: {
+        AccessToken: loginRes.accessToken || "-1", // 请求头，可根据需要调整
+        UserId: loginRes.appUserId || "-1", // 请求头，可根据需要调整
+        LanguageType: 0,
+      },
+      success: (res) => {
+        if (res.statusCode === 200) {
+          console.log(res);
+          if ((res.data.code === 200) | (res.data.code === 0)) {
+            resolve(res.data);
+          } else {
+            reject(res.data);
+          }
+        } else {
+          reject(res);
+        }
+      },
+      fail: (err) => {
+        uni.showToast({
+          title: "请求错误", // 提示的文本内容
+          icon: "none", // 提示的图标，可选值：'success' | 'loading' | 'none'
+          duration: 2000, // 提示框的显示时间，单位为毫秒，默认1500ms
+        });
+        reject(err); // 请求失败
+      },
+    });
+  });
 }

+// 使用uni.addInterceptor拦截请求，处理GET请求中的数组参数
+uni.addInterceptor("request", {
+  invoke(args) {
+    // request 触发前拼接 url
+    const { data, method } = args;
+    if (method === "GET") {
+      // 如果是get请求，且params是数组类型如arr=[1,2]，则转换成arr=1&arr=2
+      const newData = qs.stringify(data, {
+        arrayFormat: "repeat",
+      });
+      delete args.data;
+      args.url = `${args.url}?${newData}`;
+    }
+  },
+  success(args) {},
+  fail(err) {},
+  complete(res) {},
+});
+
 // GET 请求
 export function get(url, params = {}) {
-	return request(url, 'GET', params);
+  return request(url, "GET", params);
 }

 // POST 请求
 export function post(url, data = {}) {
-	return request(url, 'POST', data);
+  return request(url, "POST", data);
 }

-export function uploadFile(url, filePath = '', data = {}) {
-	const loginRes = uni.getStorageSync('loginRes') || {};
-	return new Promise((resolve, reject) => {
-		uni.uploadFile({
-			url: BASE_URL + url, // 完整的URL
-			filePath: filePath,
-			name: 'image',
-			header: {
-				'AccessToken': loginRes.accessToken || '-1', // 请求头，可根据需要调整
-				'UserId': loginRes.appUserId || '-1', // 请求头，可根据需要调整
-				LanguageType: 0,
-				// 其他需要的请求头信息（如Token）
-			},
-			formData: data,
-			success: (res) => {
-				if (res.statusCode === 200) {
-					if (res.data.code === 500) {
-						uni.showToast({
-							title: '系统错误', // 提示的文本内容
-							icon: 'none', // 提示的图标，可选值：'success' | 'loading' | 'none'
-							duration: 2000 // 提示框的显示时间，单位为毫秒，默认1500ms
-						});
-					}
-					if (res.data.code === 20001) {
-						reject(res.data);
-					}
-					resolve(res.data); // 返回数据
-				} else {
-					reject(res.data); // 返回错误信息
-				}
-			},
-			fail: (err) => {
-				uni.showToast({
-					title: '请求错误', // 提示的文本内容
-					icon: 'none', // 提示的图标，可选值：'success' | 'loading' | 'none'
-					duration: 2000 // 提示框的显示时间，单位为毫秒，默认1500ms
-				});
-				reject(err); // 请求失败
-			}
-		});
-	})
-
+export function uploadFile(url, filePath = "", data = {}) {
+  const loginRes = uni.getStorageSync("loginRes") || {};
+  return new Promise((resolve, reject) => {
+    uni.uploadFile({
+      url: BASE_URL + url, // 完整的URL
+      filePath: filePath,
+      name: "image",
+      header: {
+        AccessToken: loginRes.accessToken || "-1", // 请求头，可根据需要调整
+        UserId: loginRes.appUserId || "-1", // 请求头，可根据需要调整
+        LanguageType: 0,
+        // 其他需要的请求头信息（如Token）
+      },
+      formData: data,
+      success: (res) => {
+        if (res.statusCode === 200) {
+          if (res.data.code === 500) {
+            uni.showToast({
+              title: "系统错误", // 提示的文本内容
+              icon: "none", // 提示的图标，可选值：'success' | 'loading' | 'none'
+              duration: 2000, // 提示框的显示时间，单位为毫秒，默认1500ms
+            });
+          }
+          if (res.data.code === 20001) {
+            reject(res.data);
+          }
+          resolve(res.data); // 返回数据
+        } else {
+          reject(res.data); // 返回错误信息
+        }
+      },
+      fail: (err) => {
+        uni.showToast({
+          title: "请求错误", // 提示的文本内容
+          icon: "none", // 提示的图标，可选值：'success' | 'loading' | 'none'
+          duration: 2000, // 提示框的显示时间，单位为毫秒，默认1500ms
+        });
+        reject(err); // 请求失败
+      },
+    });
+  });
 }
--- a/api/index.js
+++ b/api/index.js
@ -15,3 +15,36 @@ export const appserEditUser = (params ={}) => post('/app/user/editUser', params)

 export const factoryMapGetListPage = (params ={}) => get('/app/factoryMap/getListPage', params);

+export const factoryMapGetJobById = (factoryId, params ={}) => get(`/app/factoryMap/getJob/${factoryId}`, params);
+
+export const tagGetListPage = (params ={}) => get('/app/job/getTags', params);
+
+/**
+ * 获取收藏列表
+ */
+export const collectGetCollectList = (params ={}) => get('/collect/getCollectList', params);
+
+/**
+ * 添加收藏
+ */
+export const collectAdd = (params ={}) => post('/collect/add', params);
+
+/**
+ * 取消收藏
+ */
+export const collectCancel = (params ={}) => post('/collect/cancel', params);
+
+/**
+ * 获取评论列表
+ */
+export const commentGetFirstLevelComment= (params ={}) => get('/comment/getFirstLevelComment', params);
+
+/**
+ * 添加评论
+ */
+export const commentAdd = (params ={}) => post('/comment/add', params);
+
+/**
+ * 删除评论
+ */
+export const commentDelete = (params ={}) => post('/comment/delete', params);
--- a/components/popup-drawer/popup-drawer.vue
+++ b/components/popup-drawer/popup-drawer.vue
@ -9,18 +9,11 @@
 		/> -->

 		<!-- 抽屉 -->
-		<view
-			class="drawer"
-			:class="{
+		<view class="drawer" :class="{
 				dragging: isDragging
-			}"
-			:style="{ transform: `translateY(${translateY}px)` }"
-			@touchstart="onStart"
-			@touchmove.stop.prevent="onMove"
-			@touchend="onEnd"
-		>
+			}" :style="{ transform: `translateY(${translateY}px)` }">
 			<!-- 顶部拖拽条 -->
-			<view class="header" @touchstart.stop="onStart">
+			<view class="header" @touchstart.stop="onStart" @touchmove.stop.prevent="onMove" @touchend="onEnd">
 				<view class="bar"></view>
 			</view>

@ -33,58 +26,59 @@
 </template>

 <script>
-export default {
-	name: "PopupDrawer",
-	props: {
-		visible: {
-			type: Boolean,
-			default: false
-		}
-	},
-	data() {
-		return {
-			visibleInner: false,
-
-			// 拖动状态
-			isDragging: false,
-			startY: 0,
-			currentY: 0,
-
-			// 位置
-			windowHeight: 0,
-			halfY: 0,
-			fullY: 0,
-			translateY: 0,
-
-			startTranslateY: 0,
-			
-			// 显示状态
-			isFullScreen: false
-		};
-	},
-	watch: {
-		visible: {
-			immediate: true,
-			handler(v) {
-				if (v) {
-					this.open();
-				} else {
-					this.close();
+	export default {
+		name: "PopupDrawer",
+		props: {
+			visible: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				visibleInner: false,
+
+				// 拖动状态
+				isDragging: false,
+				startY: 0,
+				currentY: 0,
+
+				// 位置
+				windowHeight: 0,
+				halfY: 0,
+				fullY: 0,
+				translateY: 0,
+
+				startTranslateY: 0,
+
+				// 显示状态
+				isFullScreen: false
+			};
+		},
+		watch: {
+			visible: {
+				immediate: true,
+				handler(v) {
+					if (v) {
+						this.open();
+					} else {
+						this.close();
+					}
 				}
 			}
-		}
-	},
-	created() {
+		},
+		created() {
 		const res = uni.getSystemInfoSync();
 		this.windowHeight = res.windowHeight;

 		this.halfY = this.windowHeight * 0.5;
 		this.fullY = 0;

-		this.translateY = this.halfY;
+		// 初始位置设置为完全隐藏
+		this.translateY = this.windowHeight;
 	},
-	methods: {
-		/** 打开 */
+		methods: {
+			/** 打开 */
 		open() {
 			this.visibleInner = true;
 			this.isFullScreen = false; // 默认打开为半屏
@ -93,186 +87,187 @@ export default {
 			});
 		},

-		/** 关闭 */
-		close() {
-			this.isFullScreen = false;
-			this.animateTo(this.windowHeight, () => {
-				this.visibleInner = false;
-				this.$emit("update:visible", false);
-				this.$emit("close");
-			});
-		},
-
-		/** 手势开始 */
-		onStart(e) {
-			// 阻止默认行为和事件冒泡
-			e.preventDefault();
-			e.stopPropagation();
-			
-			this.isDragging = true;
-			this.startY = e.touches[0].clientY;
-			this.startTranslateY = this.translateY;
-		},
-
-		/** 手势移动 */
-		onMove(e) {
-			// 阻止默认行为和事件冒泡
-			e.preventDefault();
-			e.stopPropagation();
-			
-			if (!this.isDragging) return;
-
-			const moveY = e.touches[0].clientY - this.startY;
-			let newY = this.startTranslateY + moveY;
-
-			// 限制范围
-			if (newY < 0) newY = 0;
-			if (newY > this.windowHeight) newY = this.windowHeight;
-
-			this.translateY = newY;
-		},
-
-		/** 手势结束（吸附逻辑） */
-onEnd(e) {
-	e.preventDefault();
-	e.stopPropagation();
-	
-	this.isDragging = false;
-
-	const moveY = e.changedTouches[0].clientY - this.startY;
+			/** 关闭 */
+			close() {
+				this.isFullScreen = false;
+				this.animateTo(this.windowHeight, () => {
+					this.visibleInner = false;
+					this.$emit("update:visible", false);
+					this.$emit("close");
+				});
+			},
+
+			/** 手势开始 */
+			onStart(e) {
+				// 阻止默认行为和事件冒泡
+				e.preventDefault();
+				e.stopPropagation();
+
+				this.isDragging = true;
+				this.startY = e.touches[0].clientY;
+				this.startTranslateY = this.translateY;
+			},
+
+			/** 手势移动 */
+			onMove(e) {
+				// 阻止默认行为和事件冒泡
+				e.preventDefault();
+				e.stopPropagation();
+
+				if (!this.isDragging) return;
+
+				const moveY = e.touches[0].clientY - this.startY;
+				let newY = this.startTranslateY + moveY;
+
+				// 限制范围
+				if (newY < 0) newY = 0;
+				if (newY > this.windowHeight) newY = this.windowHeight;
+
+				this.translateY = newY;
+			},
+
+			/** 手势结束（吸附逻辑） */
+			onEnd(e) {
+				e.preventDefault();
+				e.stopPropagation();
+
+				this.isDragging = false;
+
+			const moveY = e.changedTouches[0].clientY - this.startY;
+			// 调试信息已移除
+				// ---------------------------
+				// 1. 在全屏状态
+				// ---------------------------
+				if (this.isFullScreen) { // translateY = 0
+					if (moveY > 50) {
+						this.isFullScreen = false;
+						return this.animateTo(this.halfY);
+					}
+
+					// 往上拉（基本不会）→ 保持全屏
+					if (moveY < -50) {
+						this.isFullScreen = true;
+						return this.animateTo(this.fullY);
+					}
+				}

-	// ---------------------------
-	// 1. 在全屏状态
-	// ---------------------------
-	if (this.translateY === this.fullY) {  // translateY = 0
-		// 往下拉超过 80 → 吸附到半屏，而不是关闭
-		if (moveY > 80) {
-			this.isFullScreen = false;
-			return this.animateTo(this.halfY);
-		}
+				// ---------------------------
+				// 2. 在半屏状态
+				// ---------------------------
+				if (!this.isFullScreen) {
+					if (moveY < -80) {
+						this.isFullScreen = true;
+						return this.animateTo(this.fullY);
+					}
+					// 下拉轻微 → 保持半屏
+					if (moveY > 0 && moveY < 50) {
+						this.isFullScreen = false;
+						return this.animateTo(this.halfY);
+					}
+				}

-		// 往上拉（基本不会）→ 保持全屏
-		if (moveY < -50) {
-			this.isFullScreen = true;
-			return this.animateTo(this.fullY);
-		}
-	}
+				// ---------------------------
+				// 3. 如果下拉超过阈值（且不是全屏）→ 关闭
+				// ---------------------------
+				if (moveY > 50 && !this.isFullScreen) {
+					this.isFullScreen = false;
+					return this.close();
+				}

-	// ---------------------------
-	// 2. 在半屏状态
-	// ---------------------------
-	if (this.translateY >= this.halfY - 10 && this.translateY <= this.halfY + 10) {
-		// 上拉 → 全屏
-		if (moveY < -80) {
-			this.isFullScreen = true;
-			return this.animateTo(this.fullY);
-		}
-		// 下拉轻微 → 保持半屏
-		if (moveY > 0 && moveY < 120) {
-			this.isFullScreen = false;
-			return this.animateTo(this.halfY);
+				// ---------------------------
+				// 4. 自动吸附最近位置
+				// ---------------------------
+				const points = [this.fullY, this.halfY];
+				let nearest = points.reduce((prev, curr) =>
+					Math.abs(curr - this.translateY) < Math.abs(prev - this.translateY) ? curr : prev
+				);
+
+				this.isFullScreen = (nearest === this.fullY);
+				this.animateTo(nearest);
+			},
+			/** 动画过渡（使用 RAF，不卡顿） */
+			animateTo(targetY, callback) {
+				// 小程序动画对象
+				const animation = uni.createAnimation({
+					duration: 250,
+					timingFunction: "cubic-bezier(0.25, 0.1, 0.25, 1)"
+				});
+
+				animation.translateY(targetY).step();
+
+				this.animationData = animation.export();
+				this.translateY = targetY;
+
+				if (callback) {
+					setTimeout(callback, 260);
+				}
+			}
 		}
-	}
-
-	// ---------------------------
-	// 3. 如果下拉超过阈值（且不是全屏）→ 关闭
-	// ---------------------------
-	if (moveY > 120) {
-		this.isFullScreen = false;
-		return this.close();
-	}
-
-	// ---------------------------
-	// 4. 自动吸附最近位置
-	// ---------------------------
-	const points = [this.fullY, this.halfY];
-	let nearest = points.reduce((prev, curr) =>
-		Math.abs(curr - this.translateY) < Math.abs(prev - this.translateY) ? curr : prev
-	);
-
-	this.isFullScreen = (nearest === this.fullY);
-	this.animateTo(nearest);
-},
-		/** 动画过渡（使用 RAF，不卡顿） */
-animateTo(targetY, callback) {
-	// 小程序动画对象
-	const animation = uni.createAnimation({
-		duration: 250,
-		timingFunction: "cubic-bezier(0.25, 0.1, 0.25, 1)"
-	});
-
-	animation.translateY(targetY).step();
-
-	this.animationData = animation.export();
-	this.translateY = targetY;
-
-	if (callback) {
-		setTimeout(callback, 260);
-	}
-}
-	}
-};
+	};
 </script>

 <style lang="scss" scoped>
-.drawer-container {
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	pointer-events: none; /* 默认不阻挡交互 */
-	z-index: 9999;
-
-	.mask {
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background: rgba(0, 0, 0, 0.45);
-		opacity: 0;
-		transition: opacity 0.25s;
-		pointer-events: auto; /* 蒙层接收交互 */
-
-		&.show {
-			opacity: 1;
-		}
-	}
-
-	.drawer {
-		position: absolute;
+	.drawer-container {
+		position: fixed;
 		left: 0;
 		top: 0;
 		width: 100%;
 		height: 100%;
-		background: #fff;
-		border-radius: 24rpx 24rpx 0 0;
-		transition: transform 0.25s ease-out;
-		pointer-events: auto; /* 抽屉部分接收交互 */
-
-		&.dragging {
-			transition: none !important;
+		pointer-events: none;
+		/* 默认不阻挡交互 */
+		z-index: 9999;
+
+		.mask {
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background: rgba(0, 0, 0, 0.45);
+			opacity: 0;
+			transition: opacity 0.25s;
+			pointer-events: auto;
+			/* 蒙层接收交互 */
+
+			&.show {
+				opacity: 1;
+			}
 		}

-		.header {
+		.drawer {
+			position: absolute;
+			left: 0;
+			top: 0;
 			width: 100%;
-			height: 80rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			.bar {
-				width: 120rpx;
-				height: 12rpx;
-				border-radius: 6rpx;
-				background: #ccc;
+			height: 100%;
+			background: #fff;
+			border-radius: 24rpx 24rpx 0 0;
+			transition: transform 0.25s ease-out;
+			pointer-events: auto;
+			/* 抽屉部分接收交互 */
+
+			&.dragging {
+				transition: none !important;
+			}
+
+			.header {
+				width: 100%;
+				height: 60rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.bar {
+					width: 120rpx;
+					height: 12rpx;
+					border-radius: 6rpx;
+					background: #ccc;
+				}
 			}
-		}

-		.content {
-			height: calc(100% - 80rpx);
-			overflow-y: auto;
+			.content {
+				height: calc(100% - 80rpx);
+				overflow-y: auto;
+			}
 		}
 	}
-}
 </style>
--- a/components/recruitment/recruitment.vue
+++ b/components/recruitment/recruitment.vue
@ -3,7 +3,14 @@
 		<!-- 卡片头部信息 -->
 		<view class="card-head">
 			<div class="factory-info">
+				<!-- view.header -->
 				<h3 class="factory-name">{{dataSource.factoryName || '默认工厂'}}</h3>
+				<view v-if="isFavorite" class="add-collect" @click="handleCancelCollect(dataSource.jobId)">
+					<image src='/static/collect-active.png' mode="widthFix"></image>
+				</view>
+				<view v-else class="add-collect" @click="handleCollect(dataSource.jobId)">
+					<image src="/static/collect-gray.png" mode="widthFix"></image>
+				</view>
 				<!-- <span class="factory-type">{{dataSource.factoryType || '电子厂'}}</span> -->
 			</div>
 			<div class="card-actions">
@ -46,6 +53,8 @@
 </template>

 <script>
+import { collectAdd, collectCancel } from '../../api';
+
 	export default {
 		name: "recruitment",
 		props: {
@ -56,7 +65,7 @@
 		},
 		data() {
 			return {
-				isFavorite: false
+				isFavorite: !!this.dataSource.isCollect
 			};
 		},
 		computed: {
@ -93,6 +102,23 @@
 			}
 		},
 		methods: {
+			 async handleCollect(jobId) {
+				console.log(jobId)
+				try {
+					await collectAdd({ jobId })
+					this.isFavorite = !this.isFavorite;
+				} catch(err) {
+					console.log(err)
+				}
+			},
+			async handleCancelCollect (jobId) {
+				try {
+					await collectCancel({ jobId })
+					this.isFavorite = !this.isFavorite;
+				} catch(err) {
+					console.log(err)
+				}
+			},
 			// 拨打电话
 			makeCall(e) {
 				e.stopPropagation();
@ -100,14 +126,11 @@
 					phoneNumber: this.dataSource.phoneNumber
 				});
 			},
-			// 切换收藏状态
-			toggleFavorite(e) {
-				e.stopPropagation();
-				this.isFavorite = !this.isFavorite;
-			},
 			handleGoToDetail(e) {
+				// 序列化dataSource对象为JSON字符串，并进行URL编码
+				const encodedData = encodeURIComponent(JSON.stringify(this.dataSource));
 				uni.navigateTo({
-					url: '/pages/positionDetail/positionDetail'
+					url: `/pages/positionDetail/positionDetail?dataSource=${encodedData}`
 				})
 			}
 		}
@ -130,8 +153,20 @@
 				width: 100%;
 				display: flex;
 				align-items: center;
+				justify-content: space-between;
 				gap: 8px;
 				margin-bottom: 8px;
+				.add-collect {
+					width: 48rpx;
+					height: 48rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
 				.factory-name {
 					font-size: 18px;
 					font-weight: 700;
--- a/package-lock.json
+++ b/package-lock.json
@ -0,0 +1,275 @@
+{
+  "name": "laowumap",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "qs": "^6.14.0"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.14.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.1.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://repo.huaweicloud.com/repository/npm/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    }
+  }
+}
--- a/package.json
+++ b/package.json
@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "qs": "^6.14.0"
+  }
+}
--- a/pages.json
+++ b/pages.json
@ -45,6 +45,12 @@
 			{
 				"navigationBarTitleText" : "登录"
 			}
+		},
+		{
+			"path": "pages/my/myFavorites",
+			"style": {
+				"navigationBarTitleText": "收藏岗位"
+			}
 		}
 		
 	],
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -1,6 +1,7 @@
 <template>
 	<view class="index-page">
-		<map style="height: 100vh; width: 100vw;" id="myMap" :markers="markers" show-location show-compass
+		<map :latitude="defaultMapCenter.latitude" :longitude="defaultMapCenter.longitude"
+			style="height: 100vh; width: 100vw;" id="myMap" :markers="markers" show-location show-compass
 			@updated="handleMapLoad" @markertap="onMarkerTap"></map>
 		<view class="selectors-group">
 			<view class="distance-selector" @click="openDistancePicker">
@ -41,27 +42,23 @@
 			</picker-view>
 		</view>

-		<view class="rec-swiper">
+		<!-- <view class="rec-swiper">
 			<recruitment></recruitment>
-		</view>
+		</view> -->

 		<!-- 弹出层示例 -->
 		<popup-drawer :visible="showPopup" @update:visible="showPopup = $event" @close="onPopupClose">
 			<view class="popup-content">
-				<view class="popup-title">弹出层标题</view>
+				<!-- <view class="popup-title">弹出层标题</view> -->
 				<view class="popup-body">
-					<p>这是弹出层的内容区域</p>
-					<p>你可以在这里放置任何内容</p>
-					<p>按住顶部拖拽区域可以上拉至全屏</p>
-					<p>向下拉动可以关闭弹出层</p>
+					<template v-for="item in jobFromFactoryList">
+						<recruitment :dataSource="item"></recruitment>
+						<view class="driver"></view>
+					</template>
+
 				</view>
 			</view>
 		</popup-drawer>
-		
-		<!-- 触发按钮 -->
-		<view class="trigger-button" @click="showPopup = true">
-			打开弹出层
-		</view>
 	</view>
 </template>

@ -74,6 +71,7 @@
 		onLoad
 	} from '@dcloudio/uni-app'
 	import {
+		factoryMapGetJobById,
 		factoryMapGetListPage
 	} from '../../api';
 	import {
@ -86,7 +84,10 @@
 	const showRegionPicker = ref(false);
 	const selectedRegion = ref('江苏省');
 	const regionValue = ref(0);
-
+	const defaultMapCenter = ref({
+		latitude: null,
+		longitude: null
+	})
 	// 距离范围选择相关数据
 	const showDistancePicker = ref(false);
 	const selectedDistance = ref(1); // 默认1km
@ -95,6 +96,8 @@
 	// 弹出层相关数据
 	const showPopup = ref(false);

+	const jobFromFactoryList = ref([])
+
 	// 距离范围数据
 	const distanceData = ref([{
 			label: '1',
@ -139,7 +142,7 @@
 		try {
 			const storedRegion = uni.getStorageSync('selectedRegionInfo');
 			if (storedRegion) {
-				return JSON.parse(storedRegion);
+				return storedRegion;
 			}
 		} catch (e) {
 			console.error('读取本地存储的地区信息失败', e);
@ -148,13 +151,9 @@
 	};

 	// 保存省份信息到本地存储
-	const setStoredRegionInfo = (province, label) => {
+	const setStoredRegionInfo = (value) => {
 		try {
-			const regionInfo = {
-				province,
-				label
-			};
-			uni.setStorageSync('selectedRegionInfo', JSON.stringify(regionInfo));
+			uni.setStorageSync('selectedRegionInfo', value);
 		} catch (e) {
 			console.error('保存地区信息到本地存储失败', e);
 		}
@ -193,7 +192,7 @@
 		showRegionPicker.value = false;

 		// 保存地区信息到本地存储
-		setStoredRegionInfo(province.label);
+		setStoredRegionInfo(province.value);

 		// 更新地图数据
 		handleGetFactoryList(province.label);
@ -214,9 +213,8 @@
 		lat: null,
 		lng: null
 	}
-	const markers = ref([
-		{
-			id: 'default1',
+	const markers = ref([/* {
+			id: 1,
 			latitude: 31.230416,
 			longitude: 121.473701,
 			title: '默认点位1',
@ -230,7 +228,7 @@
 			}
 		},
 		{
-			id: 'default2',
+			id: 2,
 			latitude: 31.230416,
 			longitude: 121.473701,
 			title: '默认点位2',
@ -242,7 +240,7 @@
 				textAlign: 'center',
 				fontSize: 18,
 			}
-		}
+		} */
 	])
 	const handleGetFactoryList = async (province = '江苏省') => {
 		uni.showLoading({
@ -301,9 +299,52 @@
 		showPopup.value = false;
 	}

-	const onMarkerTap = (e) => {
+	const onPopupOpen = () => {
+		showPopup.value = true
+	}
+
+	const onMarkerTap = async (e) => {
 		const markerId = e.markerId;
-		console.log(markerId)
+		console.log(e)
+		onPopupOpen()
+		if (!(userLatLng.lat && userLatLng.lng)) {
+			userLatLng = await getLatLng()
+		}
+		const params = {
+			...(userLatLng.lat && userLatLng.lng ? userLatLng : {}),
+		}
+		try {
+			const res = await factoryMapGetJobById(markerId)
+			console.log(res)
+			jobFromFactoryList.value = res.data
+		} catch (err) {
+			console.log(err)
+		}
+	}
+
+	const handleMapLoad = async () => {
+		// 确保获取到用户位置
+		if (!(userLatLng.lat && userLatLng.lng)) {
+			userLatLng = await getLatLng();
+		}
+
+		// 如果成功获取到位置，设置地图中心点为用户位置
+		if (userLatLng.lat && userLatLng.lng) {
+			// 获取地图上下文
+			// const mapContext = uni.createMapContext('myMap');
+			defaultMapCenter.value = {
+				latitude: userLatLng.lat,
+				longitude: userLatLng.lng
+			}
+			// 设置地图中心点为用户位置
+			/* mapContext.includePoints({
+			    points: [{latitude: userLatLng.lat, longitude: userLatLng.lng}],
+			    padding: [100, 100, 100, 100] // 边距，防止点位贴边
+			}); */
+			console.log('地图视角已设置为用户当前位置');
+		} else {
+			console.log('无法获取用户位置，使用默认视角');
+		}
 	}

 	onLoad(() => {
@ -311,8 +352,8 @@
 		const storedRegion = getStoredRegionInfo();
 		if (storedRegion) {
 			// 使用存储的地区信息
-			selectedRegion.value = storedRegion.label;
-			handleGetFactoryList(storedRegion.province);
+			selectedRegion.value = storedRegion;
+			handleGetFactoryList(storedRegion);
 		} else {
 			// 使用默认地区信息
 			handleGetFactoryList();
@ -326,6 +367,12 @@
 		overflow: hidden;
 		position: relative;

+		.driver {
+			width: 100%;
+			height: 1px;
+			background-color: #eee;
+		}
+
 		.selectors-group {
 			position: absolute;
 			top: 25rpx;
@ -450,7 +497,7 @@
 		}

 		.popup-content {
-			padding: 20rpx;
+			// padding: 20rpx;
 		}

 		.popup-title {
@ -463,10 +510,8 @@
 		.popup-body {
 			font-size: 28rpx;
 			line-height: 1.6;
-		}
-		
-		.popup-body p {
-			margin-bottom: 20rpx;
+			box-sizing: border-box;
+			// padding: 15rpx;
 		}
 	}
 </style>
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@ -21,12 +21,12 @@
 		
 		<!-- 功能区域 -->
 		<view class="features-section">
-			<view class="feature-item" @click="myComments">
+			<!-- <view class="feature-item" @click="myComments">
 				<view class="feature-icon">
 					<text class="icon-content">📝</text>
 				</view>
 				<text class="feature-name">我的评价</text>
-			</view>
+			</view> -->
 			
 			<view class="feature-item" @click="myFavorites">
 				<view class="feature-icon">
@ -35,12 +35,12 @@
 				<text class="feature-name">收藏岗位</text>
 			</view>
 			
-			<view class="feature-item" @click="contactService">
+			<button class="feature-item contact-button" open-type="contact" bindcontact="handleContact">
 				<view class="feature-icon">
 					<text class="icon-content">📞</text>
 				</view>
 				<text class="feature-name">咨询客服</text>
-			</view>
+			</button>
 		</view>
 		<!-- 底部占位，避免内容被底部导航栏遮挡 -->
 		<view class="bottom-space"></view>
@ -51,6 +51,7 @@
 import { computed } from 'vue';
 import { useUserStore } from '../../stores/user.js';
 import { appUserEditAvatar } from '../../api/index.js';
+import { isLoggedIn } from '../../utils/index.js';
 const userStore = useUserStore();
 const loginRes = computed(() => userStore.loginRes);
 const userInfo = computed(() => userStore.userInfo);
@ -63,6 +64,19 @@ const loginRegister = () => {
 	})
 }

+const myFavorites = () => {
+	if (!isLoggedIn()) {
+		uni.showToast({
+			title: '未登录',
+			icon: 'none'
+		})
+	}
+	uni.navigateTo({
+		url: '/pages/my/myFavorites'
+	})
+	
+}
+
 const goToProfile = () => {
 	if (loginRes.value && loginRes.value.accessToken) {
 		// 已登录，跳转到编辑资料页面
@ -76,6 +90,63 @@ const goToProfile = () => {
 		})
 	}
 }
+
+const contactService = () => {
+	// 在微信小程序中打开客服会话
+	// 注意：这需要在微信开发者平台配置客服消息功能
+	// 方式一：使用uni.openCustomerServiceChat（需要配置客服消息功能）
+	// 如果遇到"url empty"错误，需要在微信公众平台配置客服消息功能
+	// 或者使用其他联系方式替代
+	
+	// 检查是否在微信环境中
+	// #ifdef MP-WEIXIN
+	uni.openCustomerServiceChat({
+		extInfo: { url: '' }, // 如果有自定义客服链接，填入此处
+		corpId: '', // 如果是企业微信，填入企业ID
+		success: (res) => {
+			console.log('打开客服聊天界面成功', res)
+		},
+		fail: (err) => {
+			console.error('打开客服聊天界面失败', err)
+			// 如果打开客服失败，可以提供其他联系方式
+			uni.showModal({
+				title: '提示',
+				content: '暂无法打开客服页面，您可以尝试拨打客服电话：400-xxx-xxxx',
+				showCancel: true,
+				cancelText: '取消',
+				confirmText: '拨打',
+				success: function (res) {
+					if (res.confirm) {
+						// 拨打客服电话
+						uni.makePhoneCall({
+							phoneNumber: '400-xxx-xxxx' // 替换为实际的客服电话
+						})
+					}
+				}
+			})
+		}
+	})
+	// #endif
+	
+	// #ifndef MP-WEIXIN
+	// 非微信环境下的替代方案
+	uni.showModal({
+		title: '联系我们',
+		content: '客服电话：400-xxx-xxxx\n服务时间：周一至周日 9:00-18:00',
+		showCancel: true,
+		cancelText: '取消',
+		confirmText: '拨打',
+		success: function (res) {
+			if (res.confirm) {
+				// 拨打客服电话
+				uni.makePhoneCall({
+					phoneNumber: '400-xxx-xxxx' // 替换为实际的客服电话
+				})
+			}
+		}
+	})
+	// #endif
+}
 </script>

 <style lang="scss">
@ -174,6 +245,25 @@ const goToProfile = () => {
 				background-color: #f0f9ff;
 			}
 		}
+		
+		.contact-button {
+			background: transparent;
+			border: 0px!important;
+			outline: none;
+			padding: 0;
+			margin: 0;
+			width: auto;
+			height: auto;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			tap-highlight-color: transparent;
+		}
+		.contact-button::after {
+			border: 0px!important;
+
+		}
 	}
 	
 	// 底部占位，避免内容被底部导航栏遮挡
--- a/pages/my/myFavorites.vue
+++ b/pages/my/myFavorites.vue
@ -0,0 +1,154 @@
+<template>
+	<view class="favorites-page">
+		<scroll-view class="search-list" scroll-y :refresher-enabled="true" :refresher-triggered="refreshing"
+			@refresherrefresh="onRefresh" @scrolltolower="onLoadMore">
+			<template v-for="item in list" :key="item.jobId">
+				<recruitment :dataSource="item"></recruitment>
+				<view class="driver"></view>
+			</template>
+			<view class="loading-more">
+				<text v-if="loadingMore">加载中...</text>
+				<text v-else-if="noMoreData">没有更多数据了</text>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+	import {
+		collectCancel,
+		collectGetCollectList,
+		getAppJobVO, tagGetListPage
+	} from '../../api';
+	import {
+		ref
+	} from 'vue';
+	import {
+		delay
+	} from '../../utils';
+	let currentPage = 1
+	const list = ref([])
+	const refreshing = ref(false)
+	const loadingMore = ref(false)
+	const noMoreData = ref(false)
+	const pageSize = ref(10)
+
+	const hanleGetList = async (params = {}) => {
+		const res = await collectGetCollectList({
+			pageNum: currentPage,
+			pageSize: pageSize.value,
+			...params
+		})
+		console.log(res)
+		res.data.records = res.data.records.map((item) => ({
+			...item,
+			isCollect: true
+		}))
+
+		if (currentPage === 1) {
+			// 刷新或首次加载
+			list.value = res.data.records
+		} else {
+			// 加载更多
+
+			if (res.data.records.length > 0) {
+				list.value.records = [...list.value.records, ...res.data.records]
+				currentPage++
+			} else {
+				noMoreData.value = true
+			}
+
+		}
+	}
+	
+	onLoad(() => {
+		currentPage = 1
+		hanleGetList()
+	})
+
+
+
+	const onRefresh = async () => {
+		console.log("刷新")
+		refreshing.value = true
+		loadingMore.value = false
+		noMoreData.value = false
+		try {
+			await delay(1000)
+			currentPage = 1
+			await hanleGetList()
+		} catch (err) {
+			console.log(err)
+			uni.showToast({
+				title: '刷新失败',
+				icon: 'none'
+			})
+		} finally {
+			refreshing.value = false
+		}
+	}
+
+	const onLoadMore = async () => {
+		// 如果已经在加载或没有更多数据，则不执行
+		console.log("dao dibule")
+		if (loadingMore.value || noMoreData.value) return
+
+		loadingMore.value = true
+		currentPage++
+
+		try {
+			await delay(1000)
+			await hanleGetList()
+		} catch (error) {
+			uni.showToast({
+				title: '加载失败',
+				icon: 'none'
+			})
+			currentPage--
+		} finally {
+			loadingMore.value = false
+		}
+	}
+</script>
+
+<style lang="scss">
+	.favorites-page {
+		// 页面容器设置
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background-color: #f8f8f8;
+		// 列表样式 - 可滚动区域
+		.search-list {
+			height: 100vh;
+			box-sizing: border-box;
+			padding: 4px;
+			// flex: 1;
+			// overflow-y: auto;
+
+			// 隐藏滚动条但保留滚动功能
+			::-webkit-scrollbar {
+				display: none;
+			}
+
+			-ms-overflow-style: none;
+			scrollbar-width: none;
+		}
+
+		.driver {
+			width: 100%;
+			height: 1px;
+			background-color: #eee;
+		}
+
+		.loading-more {
+			text-align: center;
+			padding: 16px 0;
+			font-size: 14px;
+			color: #999;
+		}
+	}
+</style>
--- a/pages/positionDetail/positionDetail.vue
+++ b/pages/positionDetail/positionDetail.vue
@ -5,60 +5,66 @@
 			<!-- 顶部信息区域 -->
 			<view class="header-section">
 				<view class="factory-info">
-					<text class="factory-name">安费诺</text>
-					<text class="factory-type">电子厂</text>
-					<text class="distance">距你2.5km</text>
+					<text class="factory-name">{{positionData.factoryName || '默认工厂'}}</text>
+					<!-- <text class="factory-type">{{positionData.factoryType || '电子厂'}}</text> -->
+					<text v-if="positionData.distanceMeters"
+						class="distance">{{`距你${Math.round(positionData.distanceMeters)}米`}}</text>
 				</view>
-				<button class="call-btn" @click="makeCall">拨打电话</button>
 			</view>

 			<!-- 工作时间区域 -->
-			<view class="work-time-section">
-				<text class="time">8:00-20:00 两班倒</text>
-				<text class="business">主营汽车线束</text>
-			</view>
+			<!-- <view class="work-time-section">
+				<text class="time">{{positionData.workTime}}</text>
+				<text class="business">{{positionData.jobName}}</text>
+			</view> -->

 			<!-- 薪资信息区域 -->
 			<view class="salary-section">
-				<view class="salary-item">
+				<!-- <view class="salary-item">
 					<text class="item-title">小时工</text>
 					<text class="salary-content">工资: 20+1元/小时（含1元满勤）+绩效奖金高达500，月薪6500-7500</text>
-				</view>
-				
-				<view class="salary-item">
-					<text class="item-title">正式工</text>
-					<text class="salary-content">工资2490元/月+夜班补贴10元/晚+"表现佳有绩效+超产奖金" 平时加班1.5倍，双休日2倍，国假日3倍等，月收入5700-6800/月</text>
-				</view>
+				</view> -->
+				<text class="salary-content">工作岗位：{{positionData.jobName}}</text>
+				<text class="salary-content">工作时间：{{positionData.workTime}}</text>
+				<text class="salary-content">时薪：{{positionData.hourlyWage}}/时</text>
+				<text class="salary-content">年龄要求：{{positionData.ageRange}}</text>
+				<text class="salary-content">包饭：{{positionData.mealPlan}}餐</text>
+				<text class="salary-content">住宿环境：{{positionData.dorm}}人间</text>
+				<text class="salary-content" v-for="item in positionData.tags">{{item.tagName}}</text>
 			</view>

 			<!-- 福利信息区域 -->
-			<view class="benefits-section">
+			<!-- <view class="benefits-section">
 				<text class="benefits-content">转正满2个月体检费196元企业报销(凭发票)</text>
 				<text class="benefits-content">有部分为显微镜工作，显微镜工作额外有0-300的岗位补贴（具体以厂区发放为准抱拳）</text>
-			</view>
+			</view> -->

 			<!-- 分隔线 -->
 			<view class="divider"></view>

 			<!-- 用户评价区域 -->
 			<view class="comments-section">
-				<view class="section-title">用户评价</view>
+				<view class="section-title">
+					<text>用户评价</text>
+					<view class="add-comment-container" @click="showCommentBox">
+						<text>写一个评论</text>
+						<image class="comment-icon" src="/static/comment.png" mode=""></image>
+					</view>
+				</view>

 				<!-- 动态渲染评价列表 -->
-				<view class="comment-item" v-for="(comment, index) in comments" :key="comment.id">
+				<view class="comment-item" v-for="(comment, index) in comments" :key="comment.id" @longpress="longpress(comment)">
 					<view class="user-info">
-						<view class="avatar"></view>
-						<text class="username">{{ comment.username }}</text>
+						<view class="avatar">
+							<image style="width: 100%;" :src="comment.avatarUrl" mode="widthFix"></image>
+						</view>
+						<text class="username">{{ comment.nickname }}</text>
 					</view>
 					<text class="comment-content">{{ comment.content }}</text>
-					<view class="image-container">
-						<view class="comment-image"></view>
-						<view class="comment-image"></view>
-						<view class="comment-image"></view>
-					</view>
 					<view class="like-section">
-						<text class="like-count">{{ comment.likes }}</text>
-						<text class="like-icon" :class="{ active: comment.isLiked }" @click="toggleLike(index)">👍</text>
+						<!-- <text class="like-count">{{ comment.likes }}</text> -->
+						<!-- <text class="like-icon" :class="{ active: comment.isLiked }"
+							@click="toggleLike(index)">👍</text> -->
 					</view>
 				</view>

@ -72,18 +78,34 @@

 		<!-- 底部固定操作按钮 -->
 		<view class="bottom-action">
-			<button class="apply-btn" @click="applyJob">立即申请</button>
+			<button class="apply-btn" @click="makeCall">拨打电话</button>
+		</view>
+		
+		<!-- 评论输入框 -->
+		<view class="comment-input-wrapper" v-if="showCommentInput">
+			<input 
+						v-model="commentContent" 
+						class="comment-input" 
+						placeholder="请输入评论内容" 
+						auto-focus
+						@blur="handleInputBlur"
+					/>
+			<button class="send-btn" @click="submitComment">发送</button>
 		</view>
 	</view>
 </template>

 <script>
+import { commentAdd, commentDelete, commentGetFirstLevelComment } from '../../api';
+import { isLoggedIn } from '../../utils';
+import { useUserStore } from '../../stores/user.js';
+
 	export default {
 		data() {
 			return {
 				// 职位数据
-				comments: [
-					{
+				positionData: {},
+				comments: [/* {
 						id: 1,
 						username: '网友120489',
 						content: '工作很轻松，基本都是手上的活',
@ -96,21 +118,95 @@
 						content: '工作很轻松，基本都是手上的活',
 						likes: 6,
 						isLiked: true
-					}
-				]
+					} */
+				],
+				// 评论相关数据
+				showCommentInput: false,
+				// commentList: [
+				commentContent: ''
+			}
+		},
+		// 页面加载时获取参数
+		onLoad(options) {
+			// 检查是否有dataSource参数
+			if (options && options.dataSource) {
+				try {
+					// 解码并解析JSON字符串
+					this.positionData = JSON.parse(decodeURIComponent(options.dataSource));
+					console.log('接收到的职位数据:', this.positionData);
+					this.handleGetFirstComment(this.positionData.jobId)
+				} catch (e) {
+					console.error('解析dataSource参数失败:', e);
+				}
 			}
 		},
 		methods: {
+			longpress(item) {
+				console.log("长按")
+				console.log(item)
+				const menu = ['举报']
+				// 获取用户store实例
+				const userStore = useUserStore();
+				console.log(item.appUserId, userStore, userStore.loginRes.appUserId)
+				// 检查用户是否已登录且评论是当前用户发表的
+				if (userStore.loginRes.appUserId && item.appUserId === userStore.loginRes.appUserId) {
+					menu.unshift('删除评论')
+				}
+				uni.vibrateShort()
+				uni.showActionSheet({
+					itemList: menu,
+					success: (res) => {
+						console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+						if (res.tapIndex === 0 && menu[0] === '删除评论') {
+							// 删除评论逻辑
+							this.deleteComment(item.id);
+						}
+					},
+					fail: function (res) {
+						console.log(res.errMsg);
+					},
+					})
+			},
+			async handleGetFirstComment(jobId) {
+				const params = {
+					jobId
+				}
+				const res = await commentGetFirstLevelComment(params)
+				console.log(res)
+				this.comments = res.data.records
+			},
+			
+			// 删除评论
+			deleteComment(commentId) {
+				// 显示确认对话框
+				uni.showModal({
+					title: '确认删除',
+					content: '确定要删除这条评论吗？',
+					success: async (res) => {
+						if (res.confirm) {
+							// 找到要删除的评论的索引
+							const index = this.comments.findIndex(comment => comment.id === commentId);
+							if (index !== -1) {
+								// 从评论数组中移除该评论
+								this.comments.splice(index, 1);
+								// 这里可以添加调用删除评论API的逻辑
+								// await commentDelete(commentId);
+								await commentDelete({ commentId })
+								// 显示删除成功提示
+								uni.showToast({
+									title: '删除成功',
+									icon: 'success',
+									duration: 2000
+								});
+							}
+						}
+					}
+				});
+			},
 			// 返回上一页
 			goBack() {
 				uni.navigateBack();
 			},
-			// 拨打电话功能
-			makeCall() {
-				uni.makePhoneCall({
-					phoneNumber: '400-123-4567'
-				});
-			},
 			// 点赞/取消点赞
 			toggleLike(index) {
 				if (this.comments[index].isLiked) {
@ -124,296 +220,471 @@
 				this.comments[index].isLiked = !this.comments[index].isLiked;
 			},
 			// 申请职位
-			applyJob() {
-				uni.showToast({
-					title: '申请成功，请保持电话畅通',
-					icon: 'success'
+			makeCall(e) {
+				e.stopPropagation();
+				uni.makePhoneCall({
+					phoneNumber: this.positionData.phoneNumber
 				});
+			},
+			// 显示评论输入框
+			showCommentBox() {
+				// 延迟一下，确保输入框已经渲染
+				if(!isLoggedIn()) {
+					uni.showToast({
+						title: '用户未登录',
+						icon: 'none'
+					})
+					return
+				}
+				this.showCommentInput = true;
+				setTimeout(() => {
+					// 页面滚动到底部，确保评论区可见
+					uni.pageScrollTo({
+						scrollTop: 9999,
+						duration: 300
+					});
+					// 尝试主动聚焦输入框，确保输入法弹出
+					const inputElement = document.querySelector('.comment-input');
+					if (inputElement) {
+						inputElement.focus();
+					}
+				}, 100);
+			},
+			// 处理输入框失焦事件
+			handleInputBlur() {
+				// 延迟一下再隐藏，避免点击发送按钮时输入框过早消失
+				setTimeout(() => {
+					// 隐藏输入框
+					this.showCommentInput = false;
+					// 清空输入内容
+					this.commentContent = '';
+				}, 200);
+			},
+			// 提交评论
+			async submitComment() {
+				if (this.commentContent.trim()) {
+					// 创建新评论对象
+					/* const newComment = {
+						id: Date.now(), // 使用时间戳作为临时ID
+						username: '我',
+						content: this.commentContent.trim(),
+						likes: 0,
+						isLiked: false
+					}; */
+					const params = {
+						jobId: this.positionData.jobId,
+						content: this.commentContent.trim(),
+						parentId: 0,
+					}
+					const res = await commentAdd(params)
+					const newComment = res.data;
+					// 将新评论添加到评论列表开头
+					this.comments.unshift(newComment);
+					
+					// 这里可以添加评论提交的API调用逻辑
+					// console.log('提交评论:', this.commentContent);
+					
+					// 显示成功提示
+					uni.showToast({
+						title: '评论成功',
+						icon: 'success',
+						duration: 2000
+					});
+					
+					// 重置输入框并隐藏
+					this.commentContent = '';
+					this.showCommentInput = false;
+					
+					// 失焦输入框，收起输入法
+					const inputElement = document.querySelector('.comment-input');
+					if (inputElement) {
+						inputElement.blur();
+					}
+				} else {
+					// 提示用户输入内容
+					uni.showToast({
+						title: '请输入评论内容',
+						icon: 'none',
+						duration: 2000
+					});
+				}
 			}
 		}
 	}
 </script>

 <style lang="scss">
-.position-detail-page {
-	// 页面背景色
-	background-color: #f5f5f5;
-	height: 100vh;
-	overflow: hidden;
-	
-	// 导航栏
-	.nav-bar {
-		height: 44px;
-		background-color: #fff;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 16px;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		z-index: 100;
-		box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-		
-		.back-btn {
-			width: 40px;
-			height: 40px;
+	.position-detail-page {
+		// 页面背景色
+		background-color: #f5f5f5;
+		height: 100vh;
+		overflow: hidden;
+
+		// 导航栏
+		.nav-bar {
+			height: 44px;
+			background-color: #fff;
 			display: flex;
 			align-items: center;
-			justify-content: center;
-			font-size: 20px;
-			color: #333;
+			justify-content: space-between;
+			padding: 0 16px;
+			position: fixed;
+			top: 0;
+			left: 0;
+			right: 0;
+			z-index: 100;
+			box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+
+			.back-btn {
+				width: 40px;
+				height: 40px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 20px;
+				color: #333;
+			}
+
+			.nav-title {
+				font-size: 16px;
+				font-weight: 500;
+				color: #333;
+			}
+
+			.nav-right {
+				width: 40px;
+			}
 		}

-		.nav-title {
-			font-size: 16px;
-			font-weight: 500;
-			color: #333;
+		// 内容包装器
+		.content-wrapper {
+			overflow-y: auto;
+			max-height: calc(100vh);
+			padding-bottom: 70px; // 为底部操作按钮留出空间
 		}

-		.nav-right {
-			width: 40px;
+		// 底部空间，确保内容不被底部按钮遮挡
+		.bottom-space {
+			height: 20px;
 		}
-	}

-	// 内容包装器
-	.content-wrapper {
-		overflow-y: auto;
-		max-height: calc(100vh);
-		padding-bottom: 70px; // 为底部操作按钮留出空间
-	}
+		// 头部信息区域
+		.header-section {
+			background-color: #fff;
+			padding: 16px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;

-	// 底部空间，确保内容不被底部按钮遮挡
-	.bottom-space {
-		height: 20px;
-	}
+			.factory-info {
+				.factory-name {
+					font-size: 18px;
+					font-weight: 600;
+					color: #333;
+				}

-	// 头部信息区域
-	.header-section {
-		background-color: #fff;
-		padding: 16px;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		
-		.factory-info {
-			.factory-name {
-				font-size: 18px;
-				font-weight: 600;
-				color: #333;
+				.factory-type {
+					font-size: 14px;
+					color: #0099ff;
+					background-color: #e6f7ff;
+					padding: 2px 6px;
+					border-radius: 4px;
+					margin-left: 8px;
+				}
+
+				.distance {
+					font-size: 14px;
+					color: #999;
+					margin-left: 12px;
+				}
 			}

-			.factory-type {
+			.call-btn {
+				height: 36px;
+				padding: 0 16px;
+				background-color: #ff4757;
+				color: white;
 				font-size: 14px;
-				color: #0099ff;
-				background-color: #e6f7ff;
-				padding: 2px 6px;
-				border-radius: 4px;
-				margin-left: 8px;
+				border: none;
+				border-radius: 18px;
 			}
+		}

-			.distance {
+		// 工作时间区域
+		.work-time-section {
+			background-color: #fff;
+			padding: 12px 16px;
+			margin-top: 8px;
+
+			.time,
+			.business {
 				font-size: 14px;
-				color: #999;
-				margin-left: 12px;
+				color: #666;
+				margin-right: 16px;
 			}
 		}

-		.call-btn {
-			height: 36px;
-			padding: 0 16px;
-			background-color: #ff4757;
-			color: white;
-			font-size: 14px;
-			border: none;
-			border-radius: 18px;
-		}
-	}
+		// 薪资信息区域
+		.salary-section {
+			background-color: #fff;
+			padding: 16px;
+			display: flex;
+			flex-direction: column;
+			gap: 6rpx;
+			// margin-top: 8px;

-	// 工作时间区域
-	.work-time-section {
-		background-color: #fff;
-		padding: 12px 16px;
-		margin-top: 8px;
-		
-		.time,
-		.business {
-			font-size: 14px;
-			color: #666;
-			margin-right: 16px;
-		}
-	}
+			.salary-item {
+				margin-bottom: 16px;

-	// 薪资信息区域
-	.salary-section {
-		background-color: #fff;
-		padding: 16px;
-		margin-top: 8px;
+				&:last-child {
+					margin-bottom: 0;
+				}

-		.salary-item {
-			margin-bottom: 16px;
+				.item-title {
+					font-size: 16px;
+					font-weight: 500;
+					color: #333;
+					margin-bottom: 8px;
+					display: block;
+				}

-			&:last-child {
-				margin-bottom: 0;
+				.salary-content {
+					font-size: 14px;
+					color: #666;
+					line-height: 1.6;
+					white-space: pre-wrap;
+				}
 			}
+		}

-			.item-title {
-				font-size: 16px;
-				font-weight: 500;
-				color: #333;
-				margin-bottom: 8px;
-				display: block;
-			}
+		// 福利信息区域
+		.benefits-section {
+			background-color: #fff;
+			padding: 16px;
+			margin-top: 8px;

-			.salary-content {
+			.benefits-content {
 				font-size: 14px;
 				color: #666;
 				line-height: 1.6;
-				white-space: pre-wrap;
+				margin-bottom: 8px;
+				display: block;
+
+				&:last-child {
+					margin-bottom: 0;
+				}
 			}
 		}
-	}

-	// 福利信息区域
-	.benefits-section {
-		background-color: #fff;
-		padding: 16px;
-		margin-top: 8px;
-		
-		.benefits-content {
-			font-size: 14px;
-			color: #666;
-			line-height: 1.6;
-			margin-bottom: 8px;
-			display: block;
-			
-			&:last-child {
-				margin-bottom: 0;
+		// 分隔线
+		.divider {
+			height: 12px;
+			background-color: #f5f5f5;
+			margin-top: 8px;
+		}
+		.add-comment-container {
+			display: flex;
+			gap: 6rpx;
+			padding: 6rpx;
+			background-color: #eee;
+			border-radius: 4rpx;
+			align-items: baseline;
+			font-size: 24rpx;
+			color: #999;
+			.comment-icon {
+				width: 24rpx;
+				height: 24rpx;
 			}
 		}
-	}

-	// 分隔线
-	.divider {
-		height: 12px;
-		background-color: #f5f5f5;
-		margin-top: 8px;
-	}
+		// 用户评价区域
+		.comments-section {
+			background-color: #fff;
+			padding-top: 12px;
+
+			.section-title {
+				font-size: 16px;
+				font-weight: 500;
+				color: #333;
+				padding: 0 16px 12px;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+			}

-	// 用户评价区域
-	.comments-section {
-		background-color: #fff;
-		padding-top: 12px;
+			.comment-item {
+					padding: 16px;
+					transition: background-color 0.2s ease;

-		.section-title {
-			font-size: 16px;
-			font-weight: 500;
-			color: #333;
-			padding: 0 16px 12px;
-		}
+					/* 移动端触摸效果，仅在触摸时激活 */
+					&:active {
+						background-color: #f5f5f5;
+					}
 					
-		.comment-item {
-			padding: 16px;
+					/* 仅在支持hover的设备上(如桌面端)应用悬停效果 */
+					@media (hover: hover) {
+						&:hover {
+							background-color: #f5f5f5;
+						}
+					}

-			.user-info {
-				display: flex;
-				align-items: center;
-				margin-bottom: 12px;
-				
-				.avatar {
-					width: 36px;
-					height: 36px;
-					border-radius: 50%;
-					background-color: #ddd;
-					margin-right: 12px;
-				}
+					.user-info {
+						display: flex;
+						align-items: center;
+						margin-bottom: 12px;
+
+						.avatar {
+							width: 36px;
+							height: 36px;
+							border-radius: 8rpx;
+							background-color: #ddd;
+							margin-right: 12px;
+							overflow: hidden;
+						}
+
+						.username {
+							font-size: 14px;
+							color: #333;
+						}
+					}

-				.username {
-					font-size: 14px;
+				.comment-content {
+					font-size: 15px;
 					color: #333;
+					line-height: 1.6;
+					margin-bottom: 12px;
+					display: block;
 				}
-			}

-			.comment-content {
-				font-size: 15px;
-				color: #333;
-				line-height: 1.6;
-				margin-bottom: 12px;
-				display: block;
-			}
+				.image-container {
+					display: flex;
+					margin-bottom: 12px;

-			.image-container {
-				display: flex;
-				margin-bottom: 12px;
+					.comment-image {
+						width: 80px;
+						height: 80px;
+						background-color: #eee;
+						border-radius: 4px;
+						margin-right: 12px;

-				.comment-image {
-					width: 80px;
-					height: 80px;
-					background-color: #eee;
-					border-radius: 4px;
-					margin-right: 12px;
-					
-					&:last-child {
-						margin-right: 0;
+						&:last-child {
+							margin-right: 0;
+						}
 					}
 				}
-			}

-			.like-section {
-				display: flex;
-				align-items: center;
-				justify-content: flex-end;
+				.like-section {
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;

-				.like-count {
-					font-size: 14px;
-					color: #999;
-					margin-right: 4px;
-				}
+					.like-count {
+						font-size: 14px;
+						color: #999;
+						margin-right: 4px;
+					}

-				.like-icon {
-					font-size: 16px;
-					cursor: pointer;
+					.like-icon {
+						font-size: 16px;
+						cursor: pointer;

-					&.active {
-						color: #ff4757;
+						&.active {
+							color: #ff4757;
+						}
 					}
 				}
 			}
+
+			.comment-divider {
+				height: 1px;
+				background-color: #eee;
+				margin: 0 16px;
+			}
 		}

-		.comment-divider {
-			height: 1px;
-			background-color: #eee;
-			margin: 0 16px;
+		// 底部固定操作按钮
+		.bottom-action {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			height: 50px;
+			background-color: #fff;
+			padding: 8px 16px;
+			box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			z-index: 99;
+
+			.apply-btn {
+				height: 40px;
+				width: 100%;
+				background-color: #ff4757;
+				color: white;
+				font-size: 16px;
+				font-weight: 500;
+				border: none;
+				border-radius: 20px;
+			}
+		}
+		
+		// 评论输入框样式
+		.comment-input-wrapper {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			background-color: #fff;
+			padding: 10px 16px;
+			padding-bottom: 28rpx;
+			display: flex;
+			align-items: center;
+			z-index: 101;
+			transform: translateZ(0);
+			will-change: transform;
+			/* 关键样式：确保在输入法弹出时能正确显示 */
+			transition: transform 0.3s ease;
+			/* 适配iOS和Android */
+			padding-bottom: calc(10px + env(safe-area-inset-bottom, 0));
+			
+			.comment-input {
+				flex: 1;
+				height: 36px;
+				padding: 0 12px;
+				background-color: #f5f5f5;
+				border: 1px solid #ddd;
+				border-radius: 18px;
+				font-size: 14px;
+				/* 强制输入法弹出 */
+				:-webkit-autofill {
+					-webkit-text-fill-color: #333;
+				}
+				/* 确保输入框可以获取焦点并弹出输入法 */
+				:-webkit-input-placeholder {
+					color: #999;
+				}
+				user-select: text;
+			}
+			
+			.send-btn {
+				height: 36px;
+				padding: 0 16px;
+				margin-left: 12px;
+				background-color: #ff4757;
+				color: white;
+				font-size: 14px;
+				border: none;
+				border-radius: 6px;
+				/* 按钮交互效果 */
+			}
 		}
-	}
 		
-	// 底部固定操作按钮
-	.bottom-action {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		height: 50px;
-		background-color: #fff;
-		padding: 8px 16px;
-		box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1);
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		z-index: 99;
-		
-		.apply-btn {
-			height: 40px;
-			width: 100%;
-			background-color: #ff4757;
-			color: white;
-			font-size: 16px;
-			font-weight: 500;
-			border: none;
-			border-radius: 20px;
+		/* 适配安全区域，特别是iPhone底部横条 */
+		@supports (padding-bottom: env(safe-area-inset-bottom)) {
+			.comment-input-wrapper {
+				padding-bottom: calc(10px + env(safe-area-inset-bottom));
+			}
 		}
 	}
-}
 </style>
--- a/pages/searchPositions/searchPositions.vue
+++ b/pages/searchPositions/searchPositions.vue
@ -8,17 +8,13 @@
 			</view>
 			<!-- 搜索标签 -->
 			<view class="search-tags">
-				<view class="tag" :class="{ active: activeTag === '长白班' }" @click="onTagClick('长白班')">长白班</view>
-				<view class="tag" :class="{ active: activeTag === '高工资' }" @click="onTagClick('高工资')">高工资</view>
-				<view class="tag" :class="{ active: activeTag === '包吃住' }" @click="onTagClick('包吃住')">包吃住</view>
-				<view class="tag" :class="{ active: activeTag === '日结' }" @click="onTagClick('日结')">日结</view>
-				<view class="tag" :class="{ active: activeTag === '大龄工' }" @click="onTagClick('大龄工')">大龄工</view>
+				<view v-for="item in tagList" :key="item.tagId" class="tag" :class="{ active: activeTag.includes(item.tagId) }" @click="onTagClick(item.tagId)">{{ item.tagName || '标签' }}</view>
 			</view>
 		</view>

 		<scroll-view class="search-list" scroll-y :refresher-enabled="true" :refresher-triggered="refreshing"
 			@refresherrefresh="onRefresh" @scrolltolower="onLoadMore">
-			<template v-for="item in list.records" :key="item.jobId">
+			<template v-for="item in list" :key="item.jobId">
 				<recruitment :dataSource="item"></recruitment>
 				<view class="driver"></view>
 			</template>
@ -35,7 +31,7 @@
 		onLoad
 	} from '@dcloudio/uni-app'
 	import {
-		getAppJobVO
+		getAppJobVO, tagGetListPage
 	} from '../../api';
 	import {
 		ref
@ -50,6 +46,8 @@
 	const loadingMore = ref(false)
 	const noMoreData = ref(false)
 	const pageSize = ref(10)
+	const tagList = ref([])
+	const activeTag = ref([])
 	let userLatLng = {
 		lat: null,
 		lng: null
@ -69,7 +67,7 @@

 		if (currentPage === 1) {
 			// 刷新或首次加载
-			list.value = res.data
+			list.value = res.data.records
 		} else {
 			// 加载更多

@ -83,9 +81,25 @@
 		}
 	}
 	
+	const handleGetTag = async () => {
+		const { data  } = await tagGetListPage()
+		tagList.value = data
+	}
+	
+	const onTagClick = (tagId) => {
+		// 实现多选逻辑：如果已选中则移除，未选中则添加
+		const index = activeTag.value.indexOf(tagId);
+		if (index > -1) {
+			activeTag.value.splice(index, 1);
+		} else {
+			activeTag.value.push(tagId);
+		}
+		onSearch()
+	}
 	onLoad(() => {
 		currentPage = 1
 		hanleGetJobList()
+		handleGetTag()
 	})


@ -108,23 +122,6 @@
 		} finally {
 			refreshing.value = false
 		}
-		/* refreshing.value = true
-		currentPage.value = 1
-		noMoreData.value = false
-		try {
-			await hanleGetJobList()
-			uni.showToast({
-				title: '刷新成功',
-				icon: 'success'
-			})
-		} catch (error) {
-			uni.showToast({
-				title: '刷新失败',
-				icon: 'none'
-			})
-		} finally {
-			refreshing.value = false
-		} */
 	}

 	const onLoadMore = async () => {
@ -152,39 +149,14 @@
 	const onSearch = () => {
 		console.log(searchKeyword.value)
 		const params = {
-			keyword: searchKeyword.value
+			keyword: searchKeyword.value,
+			tagIds: activeTag.value // 直接传递数组，get方法会自动处理
 		}
 		// 搜索时重置到第一页
 		currentPage = 1
 		noMoreData.value = false
 		hanleGetJobList(params)
 	}
-	/* // 导入recruitment组件
-	import recruitment from '@/components/recruitment/recruitment.vue';
-	export default {
-		// 注册组件
-		components: {
-			recruitment
-		},
-		data() {
-			return {
-				searchKeyword: '',
-				activeTag: ''
-			}
-		},
-		methods: {
-			// 搜索方法
-			onSearch() {
-				// 实现搜索逻辑
-				console.log('搜索关键词:', this.searchKeyword);
-			},
-			// 标签点击方法
-			onTagClick(tag) {
-				this.activeTag = this.activeTag === tag ? '' : tag;
-				console.log('点击标签:', tag);
-			}
-		}
-	} */
 </script>

 <style lang="scss">
--- a/static/collect-active.png
+++ b/static/collect-active.png
--- a/static/collect-gray.png
+++ b/static/collect-gray.png
--- a/static/comment.png
+++ b/static/comment.png
--- a/utils/index.js
+++ b/utils/index.js
@ -36,3 +36,19 @@ export function getLatLng() {
 //   await delay(2000); // 延时 2 秒
 //   console.log('2秒后执行');
 // }
+
+/**
+ * 判断用户是否已登录
+ * @returns {boolean} - 返回用户是否已登录
+ */
+export function isLoggedIn() {
+  try {
+    // 从loginRes中读取token，与user.js中的登录存储逻辑保持一致
+    const loginRes = uni.getStorageSync('loginRes');
+	console.log(loginRes)
+    return !!(loginRes && loginRes.accessToken); // 确保loginRes存在且包含token
+  } catch (error) {
+    console.error('检查登录状态时出错:', error);
+    return false;
+  }
+}