diff --git a/api/httpSetting.js b/api/httpSetting.js
index c1110f4..805e0d5 100644
--- a/api/httpSetting.js
+++ b/api/httpSetting.js
@@ -22,7 +22,7 @@ const BASE_URL = baseApi[env] || 'http://110.40.156.216:30005/api';
 
 
 function request(url, method, data = {}) {
-	const userInfo = uni.getStorageSync('loginInfo') || {};
+	const loginRes = uni.getStorageSync('loginRes') || {};
 	const UTCOffset = new Date().getTimezoneOffset();
 	return new Promise((resolve, reject) => {
 		uni.request({
@@ -30,12 +30,9 @@ function request(url, method, data = {}) {
 			method: method,
 			data: data,
 			header: {
-				'AccessToken': userInfo.accessToken || '-1', // 请求头，可根据需要调整
-				'UserId': userInfo.userId || '1', // 请求头，可根据需要调整
-				'LanguageType': 0,
-				'LoginName': userInfo.loginName || '',
-				'CompanyId': userInfo.companyId || '',
-				'UTCOffset': UTCOffset,
+				'AccessToken': loginRes.accessToken || '-1', // 请求头，可根据需要调整
+				'UserId': loginRes.appUserId || '-1', // 请求头，可根据需要调整
+				'LanguageType': 0,
 			},
 			success: (res) => {
 				if (res.statusCode === 200) {
@@ -45,24 +42,6 @@ function request(url, method, data = {}) {
 					} else {
 						reject(res.data)
 					}
-					/* if (res.data.code === 500) {
-						uni.showToast({
-							title: '系统错误', // 提示的文本内容
-							icon: 'none', // 提示的图标，可选值：'success' | 'loading' | 'none'
-							duration: 2000 // 提示框的显示时间，单位为毫秒，默认1500ms
-						});
-					}
-					if (res.data.code === 401) {
-						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);
 				}
@@ -88,4 +67,48 @@ export function get(url, params = {}) {
 // POST 请求
 export function post(url, data = {}) {
 	return request(url, 'POST', data);
-}
\ No newline at end of file
+}
+
+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); // 请求失败
+			}
+		});
+	})
+
+}
diff --git a/api/index.js b/api/index.js
index 37fc018..2c0ec7a 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,4 +1,4 @@
-import { get, post } from "./httpSetting";
+import { get, post, uploadFile } from "./httpSetting";
 
 /**
  * 登录
@@ -6,3 +6,12 @@ import { get, post } from "./httpSetting";
 export const userLogin = (params ={}) => post('/app/auth/login', params);
 
 export const getAppJobVO = (params ={}) => get('/app/job/getAppJobVO', params);
+
+export const appUserQuery = (params ={}) => get('/app/user/query', params);
+
+export const appUserEditAvatar = (filePath, params ={}) => uploadFile('/app/user/editAvatar', filePath, params);
+
+export const appserEditUser = (params ={}) => post('/app/user/editUser', params);
+
+export const factoryMapGetListPage = (params ={}) => get('/app/factoryMap/getListPage', params);
+
diff --git a/components/popup-drawer/popup-drawer.vue b/components/popup-drawer/popup-drawer.vue
new file mode 100644
index 0000000..975acd5
--- /dev/null
+++ b/components/popup-drawer/popup-drawer.vue
@@ -0,0 +1,278 @@
+<template>
+	<view class="drawer-container">
+		<!-- 蒙层 -->
+		<!-- <view 
+			class="mask" 
+			:class="{ show: visibleInner && isFullScreen }" 
+			:style="{ top: isFullScreen ? '0' : halfY + 'px' }"
+			@click="close" 
+		/> -->
+
+		<!-- 抽屉 -->
+		<view
+			class="drawer"
+			:class="{
+				dragging: isDragging
+			}"
+			:style="{ transform: `translateY(${translateY}px)` }"
+			@touchstart="onStart"
+			@touchmove.stop.prevent="onMove"
+			@touchend="onEnd"
+		>
+			<!-- 顶部拖拽条 -->
+			<view class="header" @touchstart.stop="onStart">
+				<view class="bar"></view>
+			</view>
+
+			<!-- 内容 -->
+			<view class="content">
+				<slot></slot>
+			</view>
+		</view>
+	</view>
+</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();
+				}
+			}
+		}
+	},
+	created() {
+		const res = uni.getSystemInfoSync();
+		this.windowHeight = res.windowHeight;
+
+		this.halfY = this.windowHeight * 0.5;
+		this.fullY = 0;
+
+		this.translateY = this.halfY;
+	},
+	methods: {
+		/** 打开 */
+		open() {
+			this.visibleInner = true;
+			this.isFullScreen = false; // 默认打开为半屏
+			this.$nextTick(() => {
+				this.animateTo(this.halfY);
+			});
+		},
+
+		/** 关闭 */
+		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.translateY === this.fullY) {  // translateY = 0
+		// 往下拉超过 80 → 吸附到半屏，而不是关闭
+		if (moveY > 80) {
+			this.isFullScreen = false;
+			return this.animateTo(this.halfY);
+		}
+
+		// 往上拉（基本不会）→ 保持全屏
+		if (moveY < -50) {
+			this.isFullScreen = true;
+			return this.animateTo(this.fullY);
+		}
+	}
+
+	// ---------------------------
+	// 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);
+		}
+	}
+
+	// ---------------------------
+	// 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;
+		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;
+		}
+
+		.header {
+			width: 100%;
+			height: 80rpx;
+			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;
+		}
+	}
+}
+</style>
diff --git a/components/recruitment/recruitment.vue b/components/recruitment/recruitment.vue
index e0c922f..09a479c 100644
--- a/components/recruitment/recruitment.vue
+++ b/components/recruitment/recruitment.vue
@@ -4,7 +4,7 @@
 		<view class="card-head">
 			<div class="factory-info">
 				<h3 class="factory-name">{{dataSource.factoryName || '默认工厂'}}</h3>
-				<span class="factory-type">{{dataSource.factoryType || '电子厂'}}</span>
+				<!-- <span class="factory-type">{{dataSource.factoryType || '电子厂'}}</span> -->
 			</div>
 			<div class="card-actions">
 				<!-- <view class="favorite-btn" @click="toggleFavorite">
@@ -21,9 +21,10 @@
 		<!-- 工作时间和内容 -->
 		<view class="work-info">
 			<text class="work-time">{{dataSource.workTime || '8:00-20:00'}}</text>
-			<text class="work-type">{{dataSource.workType || '两班倒'}}</text>
-			<text class="work-content">{{dataSource.workContent || '主营汽车线束'}}</text>
-			<span class="distance">{{dataSource.distance || '距你2.5km'}}</span>
+			<text class="work-type">{{dataSource.gender}}</text>
+			<text class="work-content">{{dataSource.jobName || '主营汽车线束'}}</text>
+			<span v-if="!!dataSource.distanceMeters" class="distance">{{`距你${Math.round(dataSource.distanceMeters)}米`}}</span>
+			<text v-for="item in dataSource.tags" class="work-type">{{item.tagName}}</text>
 		</view>
 
 		<view class="card-bm">
@@ -55,36 +56,38 @@
 		},
 		data() {
 			return {
-				isFavorite: false,
-				companyData: [{
+				isFavorite: false
+			};
+		},
+		computed: {
+			companyData() {
+				return [
+					{
 						label: '薪资',
-						value: '20',
+						value: this.dataSource.hourlyWage || '无', // 使用默认值25
 						unit: '',
 						exLabel: '元/小时'
 					},
 					{
 						label: '年龄',
-						value: '20-42',
+						value: this.dataSource.ageRange || '无',
 						unit: '',
 						exLabel: '元/小时'
 					},
 					{
 						label: '吃饭',
-						value: '2',
+						value: this.dataSource.mealPlan || '无',
 						unit: '餐',
 						exLabel: '白-夜'
 					},
 					{
 						label: '住宿',
-						value: '20',
+						value: this.dataSource.dorm || '无',
 						unit: '',
 						exLabel: '人间'
 					},
-				],
-
-			};
-		},
-		computed: {
+				];
+			},
 			processedCompanyData() {
 				return this.dataSource.companyData || this.companyData;
 			}
@@ -94,7 +97,7 @@
 			makeCall(e) {
 				e.stopPropagation();
 				uni.makePhoneCall({
-					phoneNumber: '400-123-4567'
+					phoneNumber: this.dataSource.phoneNumber
 				});
 			},
 			// 切换收藏状态
@@ -196,7 +199,8 @@
 			gap: 12px;
 			font-size: 12px;
 			color: #666;
-			margin-bottom: 12px;
+			margin-bottom: 12px;
+			flex-wrap: wrap;
 		}
 		
 		.card-bm {
diff --git a/pages.json b/pages.json
index 6548280..c42e78b 100644
--- a/pages.json
+++ b/pages.json
@@ -18,6 +18,13 @@
 				"navigationBarTitleText": "个人中心"
 			}
 		},
+		{
+			"path" : "pages/my/editProfile",
+			"style" : 
+			{
+				"navigationBarTitleText" : "编辑资料"
+			}
+		},
 		{
 			"path" : "pages/map/map",
 			"style" : 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 57c291e..a54f3a1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,92 +1,323 @@
 <template>
 	<view class="index-page">
 		<map style="height: 100vh; width: 100vw;" id="myMap" :markers="markers" show-location show-compass
-			@updated="handleMapLoad"></map>
-		<view class="rec-swiper">
-			<recruitment></recruitment>
+			@updated="handleMapLoad" @markertap="onMarkerTap"></map>
+		<view class="selectors-group">
+			<view class="distance-selector" @click="openDistancePicker">
+				<text class="distance-text">{{ selectedDistance }}km ▼</text>
+			</view>
+			<view class="region-selector" @click="openRegionPicker">
+				<text class="region-text">{{ selectedRegion }} ▼</text>
+			</view>
+		</view>
+
+		<!-- 省份选择器 -->
+		<view class="region-picker-modal" v-if="showRegionPicker">
+			<view class="picker-header">
+				<text class="cancel-btn" @click="showRegionPicker = false">取消</text>
+				<text class="confirm-btn" @click="confirmRegion">确定</text>
+			</view>
+			<picker-view class="region-picker" :value="regionValue" immediate-change @change="onRegionChange">
+				<picker-view-column>
+					<view class="picker-item" v-for="(province, index) in regionData" :key="index">
+						{{ province.label }}
+					</view>
+				</picker-view-column>
+			</picker-view>
+		</view>
+
+		<!-- 距离范围选择器 -->
+		<view class="distance-picker-modal" v-if="showDistancePicker">
+			<view class="picker-header">
+				<text class="cancel-btn" @click="showDistancePicker = false">取消</text>
+				<text class="confirm-btn" @click="confirmDistance">确定</text>
+			</view>
+			<picker-view class="distance-picker" :value="distanceValue" immediate-change @change="onDistanceChange">
+				<picker-view-column>
+					<view class="picker-item" v-for="(distance, index) in distanceData" :key="index">
+						{{ distance.label }}km
+					</view>
+				</picker-view-column>
+			</picker-view>
+		</view>
+
+		<view class="rec-swiper">
+			<recruitment></recruitment>
+		</view>
+		
+		<!-- 弹出层示例 -->
+		<popup-drawer :visible="showPopup" @update:visible="showPopup = $event" @close="onPopupClose">
+			<view class="popup-content">
+				<view class="popup-title">弹出层标题</view>
+				<view class="popup-body">
+					<p>这是弹出层的内容区域</p>
+					<p>你可以在这里放置任何内容</p>
+					<p>按住顶部拖拽区域可以上拉至全屏</p>
+					<p>向下拉动可以关闭弹出层</p>
+				</view>
+			</view>
+		</popup-drawer>
+		
+		<!-- 触发按钮 -->
+		<view class="trigger-button" @click="showPopup = true">
+			打开弹出层
 		</view>
 	</view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				companyData: [{
-						label: '薪资',
-						value: '20',
-						unit: '',
-						exLabel: '元/小时'
-					},
-					{
-						label: '年龄',
-						value: '20-42',
-						unit: '',
-						exLabel: '元/小时'
-					},
-					{
-						label: '吃饭',
-						value: '2',
-						unit: '餐',
-						exLabel: '白-夜'
-					},
-					{
-						label: '住宿',
-						value: '20',
-						unit: '',
-						exLabel: '人间'
-					},
-				],
-				markers: [{
-						id: 1,
-						latitude: 39.90923,
-						longitude: 116.397428,
-						title: '模拟点位1',
-						iconPath: '/static/position-icon.png',
-						width: 30,
-						height: 30,
-						label: {
-							content: '模拟点位1',
-							textAlign: 'center',
-							fontSize: 18,
-						}
-					},
-					{
-						id: 2,
-						latitude: 39.8,
-						longitude: 116.3,
-						title: '模拟点位1',
-						iconPath: '/static/position-icon.png',
-						width: 30,
-						height: 30,
-						label: {
-							content: '模拟点位1',
-							textAlign: 'center',
-							fontSize: 18,
-						}
-					},
-				]
-			}
+<script setup>
+	import {
+		ref,
+		computed
+	} from 'vue';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+	import {
+		factoryMapGetListPage
+	} from '../../api';
+	import {
+		delay,
+		getLatLng
+	} from '../../utils';
+	import PopupDrawer from '../../components/popup-drawer/popup-drawer.vue';
+
+	// 省份选择相关数据
+	const showRegionPicker = ref(false);
+	const selectedRegion = ref('江苏省');
+	const regionValue = ref(0);
+
+	// 距离范围选择相关数据
+	const showDistancePicker = ref(false);
+	const selectedDistance = ref(1); // 默认1km
+	const distanceValue = ref(0);
+	
+	// 弹出层相关数据
+	const showPopup = ref(false);
+
+	// 距离范围数据
+	const distanceData = ref([{
+			label: '1',
+			value: 1
+		},
+		{
+			label: '5',
+			value: 5
+		},
+		{
+			label: '10',
+			value: 10
+		},
+		{
+			label: '50',
+			value: 50
+		},
+		{
+			label: '100',
+			value: 100
 		},
-		onLoad() {
-			// 页面加载时的初始化逻辑
+		{
+			label: '500',
+			value: 500
+		}
+	]);
+
+	// 省份数据
+	const regionData = ref([{
+			label: '江苏省',
+			value: '江苏省'
+		},
+		{
+			label: '浙江省',
+			value: '浙江省'
+		}
+	]);
+
+
+	// 从本地存储读取省份信息
+	const getStoredRegionInfo = () => {
+		try {
+			const storedRegion = uni.getStorageSync('selectedRegionInfo');
+			if (storedRegion) {
+				return JSON.parse(storedRegion);
+			}
+		} catch (e) {
+			console.error('读取本地存储的地区信息失败', e);
+		}
+		return null;
+	};
+
+	// 保存省份信息到本地存储
+	const setStoredRegionInfo = (province, label) => {
+		try {
+			const regionInfo = {
+				province,
+				label
+			};
+			uni.setStorageSync('selectedRegionInfo', JSON.stringify(regionInfo));
+		} catch (e) {
+			console.error('保存地区信息到本地存储失败', e);
+		}
+	};
+
+	const openRegionPicker = () => {
+		showRegionPicker.value = true;
+	};
+
+	const openDistancePicker = () => {
+		showDistancePicker.value = true;
+	};
+
+	// 省份选择器变化事件
+	const onRegionChange = (e) => {
+		const values = e.detail.value;
+		console.log(values)
+		regionValue.value = values;
+	};
+
+	// 距离范围选择器变化事件
+	const onDistanceChange = (e) => {
+		const values = e.detail.value;
+		distanceValue.value = values;
+	};
+
+	// 确认选择省份
+	const confirmRegion = () => {
+		const provinceIndex = regionValue.value[0];
+
+		const province = regionData.value[provinceIndex];
+
+		selectedRegion.value = province.label;
+		console.log(selectedRegion.value)
+		console.log(selectedRegion.value)
+		showRegionPicker.value = false;
+
+		// 保存地区信息到本地存储
+		setStoredRegionInfo(province.label);
+
+		// 更新地图数据
+		handleGetFactoryList(province.label);
+	};
+
+	// 确认选择距离范围
+	const confirmDistance = () => {
+		const distanceIndex = distanceValue.value[0];
+		const distance = distanceData.value[distanceIndex];
+
+		selectedDistance.value = distance.value;
+		showDistancePicker.value = false;
+
+		// 重新加载数据
+		handleGetFactoryList(selectedRegion.value);
+	};
+	let userLatLng = {
+		lat: null,
+		lng: null
+	}
+	const markers = ref([
+		{
+			id: 'default1',
+			latitude: 31.230416,
+			longitude: 121.473701,
+			title: '默认点位1',
+			iconPath: '/static/position-icon.png',
+			width: 30,
+			height: 30,
+			label: {
+				content: '默认点位1',
+				textAlign: 'center',
+				fontSize: 18,
+			}
 		},
-		methods: {
-			handleMapLoad() {
-				console.log('地图加载完成');
-				// 获取地图上下文
-				const mapContext = uni.createMapContext('myMap');
-				// 设置地图中心点到第一个标记点
-				mapContext.includePoints({
-					points: this.markers.map(marker => ({
-						latitude: marker.latitude,
-						longitude: marker.longitude
-					})),
-					padding: [50, 50, 200, 50] // 边距设置
-				});
+		{
+			id: 'default2',
+			latitude: 31.230416,
+			longitude: 121.473701,
+			title: '默认点位2',
+			iconPath: '/static/position-icon.png',
+			width: 30,
+			height: 30,
+			label: {
+				content: '默认点位2',
+				textAlign: 'center',
+				fontSize: 18,
+			}
+		}
+	])
+	const handleGetFactoryList = async (province = '江苏省') => {
+		uni.showLoading({
+			title: '加载中'
+		});
+		if (!(userLatLng.lat && userLatLng.lng)) {
+			userLatLng = await getLatLng()
+		}
+		try {
+			const params = {
+				...(userLatLng.lat && userLatLng.lng ? userLatLng : {}),
+				province: province,
+				maxDistance: selectedDistance.value * 1000 // 转换为米
+			}
+			await delay(500)
+			const {
+				data
+			} = await factoryMapGetListPage(params)
+			// 清空之前的markers，但保留前两个默认的模拟点位
+			markers.value = markers.value.slice(0, 2);
+			data.records.map(item => markers.value.push({
+				id: item.id,
+				latitude: item.lat,
+				longitude: item.lng,
+				title: item.factoryName,
+				iconPath: '/static/position-icon.png',
+				width: 30,
+				height: 30,
+				label: {
+					content: item.factoryName,
+					textAlign: 'center',
+					fontSize: 18,
+				}
+			}))
+			console.log(await markers.value)
+		} catch (err) {
+			if (!(userLatLng.lat && userLatLng.lng)) {
+				uni.showToast({
+					title: '经纬度获取失败',
+					icon: 'none'
+				})
+			} else {
+				uni.showToast({
+					title: '位置获取失败',
+					icon: 'none'
+				})
 			}
+
+		} finally {
+			uni.hideLoading()
 		}
 	}
+
+	// 弹出层关闭处理
+	const onPopupClose = () => {
+		showPopup.value = false;
+	}
+	
+	const onMarkerTap = (e) => {
+		const markerId = e.markerId;
+		console.log(markerId)
+	}
+	
+	onLoad(() => {
+		// 从本地存储读取地区信息
+		const storedRegion = getStoredRegionInfo();
+		if (storedRegion) {
+			// 使用存储的地区信息
+			selectedRegion.value = storedRegion.label;
+			handleGetFactoryList(storedRegion.province);
+		} else {
+			// 使用默认地区信息
+			handleGetFactoryList();
+		}
+	})
 </script>
 
 <style lang="scss">
@@ -95,6 +326,102 @@
 		overflow: hidden;
 		position: relative;
 
+		.selectors-group {
+			position: absolute;
+			top: 25rpx;
+			right: 20rpx;
+			display: flex;
+			flex-direction: row-reverse;
+			gap: 6rpx;
+			z-index: 999;
+		}
+
+		.region-selector {
+			background-color: rgba(255, 255, 255, 0.9);
+			padding: 15rpx 25rpx;
+			border-radius: 15rpx;
+			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+
+			.region-text {
+				font-size: 28rpx;
+				color: #333;
+				font-weight: 500;
+			}
+		}
+
+		.distance-selector {
+			background-color: rgba(255, 255, 255, 0.9);
+			padding: 15rpx 25rpx;
+			border-radius: 15rpx;
+			box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+
+			.distance-text {
+				font-size: 28rpx;
+				color: #333;
+				font-weight: 500;
+			}
+		}
+
+		/* 省市区选择器样式 */
+		.region-picker-modal {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 500rpx;
+			background-color: #fff;
+			z-index: 1000;
+		}
+
+		/* 距离范围选择器样式 */
+		.distance-picker-modal {
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 500rpx;
+			background-color: #fff;
+			z-index: 1000;
+		}
+
+		.picker-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx 30rpx;
+			border-bottom: 1rpx solid #eee;
+		}
+
+		.cancel-btn,
+		.confirm-btn {
+			font-size: 32rpx;
+			padding: 10rpx 20rpx;
+		}
+
+		.cancel-btn {
+			color: #999;
+		}
+
+		.confirm-btn {
+			color: #007AFF;
+		}
+
+		.region-picker,
+		.distance-picker {
+			height: 400rpx;
+			width: 100%;
+		}
+
+		.picker-item {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+			font-size: 30rpx;
+		}
+
 		.rec-swiper {
 			width: calc(100% - 16px);
 			// height: 200px;
@@ -107,5 +434,39 @@
 			border-radius: 16px;
 			box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
 		}
+		
+		.trigger-button {
+			position: fixed;
+			bottom: 120rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			background-color: #007AFF;
+			color: white;
+			padding: 20rpx 40rpx;
+			border-radius: 50rpx;
+			font-size: 28rpx;
+			box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
+			z-index: 998;
+		}
+		
+		.popup-content {
+			padding: 20rpx;
+		}
+		
+		.popup-title {
+			font-size: 36rpx;
+			font-weight: bold;
+			text-align: center;
+			margin-bottom: 30rpx;
+		}
+		
+		.popup-body {
+			font-size: 28rpx;
+			line-height: 1.6;
+		}
+		
+		.popup-body p {
+			margin-bottom: 20rpx;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 55ad5f1..ba3923e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -38,7 +38,7 @@
 
 <script setup>
 import { computed, ref } from 'vue';
-import { userLogin } from '../../api';
+import { appUserQuery, userLogin } from '../../api';
 import { useUserStore } from '../../stores/user.js';
 // 用户协议勾选状态
 const agreeChecked = ref(false);
@@ -68,23 +68,21 @@ const onWechatLogin = (e) => {
     provider: 'weixin',
     success: async (wxLoginRes) => {
       try {
-        console.log('微信登录成功', wxLoginRes);
         const code = wxLoginRes.code;
         const loginRes = await userLogin({ code });
-        console.log('登录接口返回:', loginRes);
         
         // 隐藏加载提示
         uni.hideLoading();
         
         // 使用 Pinia 存储 loginRes 数据
         userStore.setLoginRes(loginRes.data);
-        console.log('loginRes 已存储到 Pinia:', loginRes.data);
           // 登录成功提示
           uni.showToast({
             title: '登录成功',
             icon: 'success'
           });
-          
+		const userProfileRes = await appUserQuery()
+		userStore.setUserInfo(userProfileRes.data);
           // 跳转到首页
           setTimeout(() => {
             uni.switchTab({
diff --git a/pages/my/editProfile.vue b/pages/my/editProfile.vue
new file mode 100644
index 0000000..2fee033
--- /dev/null
+++ b/pages/my/editProfile.vue
@@ -0,0 +1,215 @@
+<template>
+	<view class="edit-profile-page">
+		<!-- 头像编辑区域 -->
+		<view class="profile-section">
+			<view class="profile-item" @click="changeAvatar">
+				<text class="item-label">头像</text>
+				<view class="item-value avatar-container">
+					<button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+						<image class="avatar" :src="userInfo.avatarUrl || '/static/default-avatar.png'" mode="aspectFill"></image>
+					</button>
+					<!-- <text class="arrow">></text> -->
+				</view>
+			</view>
+			
+			<view class="profile-item" @click="editNickname">
+				<text class="item-label">昵称</text>
+				<view class="item-value">
+					<text class="nickname">{{ userInfo.nickname || '未设置' }}</text>
+					<!-- <text class="arrow">></text> -->
+				</view>
+			</view>
+			
+			<!-- <view class="profile-item">
+				<text class="item-label">性别</text>
+				<view class="item-value">
+					<text>{{ userInfo.gender === 1 ? '男' : userInfo.gender === 2 ? '女' : '未设置' }}</text>
+				</view>
+			</view> -->
+		</view>
+		
+		<!-- 保存按钮 -->
+		<!-- <view class="save-section">
+			<button class="save-btn" @click="saveProfile">保存</button>
+		</view> -->
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+import { useUserStore } from '../../stores/user.js';
+import { appUserEditAvatar, appserEditUser } from '../../api/index.js';
+
+const userStore = useUserStore();
+const userInfo = computed(() => userStore.userInfo || {});
+
+// 更换头像
+const onChooseAvatar = async (e) => {
+    const { avatarUrl } = e.detail 
+    console.log(avatarUrl)
+	try {
+		await appUserEditAvatar(avatarUrl)
+		// 更新用户 store 中的头像信息
+		if (avatarUrl) {
+		  userStore.updateUserInfoField('avatarUrl', avatarUrl);
+		}
+	} catch(err) {
+		console.log(err)
+	}
+
+  }
+
+// 更换头像（通过按钮点击触发）
+const changeAvatar = () => {
+	// 这里可以添加其他更换头像的逻辑
+	console.log('点击更换头像');
+};
+
+// 编辑昵称
+const editNickname = () => {
+	uni.showModal({
+		title: '编辑昵称',
+		editable: true,
+		placeholderText: '请输入昵称',
+		success: async (res) => {
+			if (res.confirm) {
+				const nickname = res.content;
+				if (nickname) {
+					/* userStore.updateUserInfoField('nickName', nickname);
+					uni.showToast({
+						title: '昵称已更新',
+						icon: 'success'
+					}); */
+					try {
+						await appserEditUser({ nickname })
+						userStore.updateUserInfoField('nickname', nickname);
+					} catch(err) {
+						console.log(err)
+					}
+				}
+			}
+		}
+	});
+};
+
+// 保存资料
+const saveProfile = () => {
+	uni.showToast({
+		title: '资料保存成功',
+		icon: 'success'
+	});
+	
+	// 返回上一页
+	setTimeout(() => {
+		uni.navigateBack();
+	}, 1000);
+};
+</script>
+
+<style lang="scss">
+.edit-profile-page {
+	background-color: #f5f5f5;
+	min-height: 100vh;
+	padding: 0;
+	margin: 0;
+	
+	.page-header {
+		background-color: #fff;
+		padding: 16px;
+		text-align: center;
+		position: relative;
+		border-bottom: 1px solid #eee;
+		
+		.page-title {
+			font-size: 18px;
+			font-weight: bold;
+			color: #333;
+		}
+	}
+	
+	.profile-section {
+		background-color: #fff;
+		margin-top: 12px;
+		padding: 0 16px;
+		
+		.profile-item {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 16px 0;
+			border-bottom: 1px solid #eee;
+			
+			&:last-child {
+				border-bottom: none;
+			}
+			
+			.item-label {
+				font-size: 16px;
+				color: #333;
+			}
+			
+			.item-value {
+				display: flex;
+				align-items: center;
+				color: #999;
+				
+				.nickname {
+					max-width: 200px;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+				
+				.arrow {
+					margin-left: 8px;
+					font-size: 18px;
+				}
+				
+				.avatar-container {
+					display: flex;
+					align-items: center;
+				}
+				
+				.avatar-btn {
+					background: none;
+					border: none;
+					padding: 0;
+					margin: 0;
+					width: 50px;
+					height: 50px;
+					border-radius: 25px;
+					overflow: hidden;
+					
+					&::after {
+						border: none;
+					}
+					
+					.avatar {
+						width: 50px;
+						height: 50px;
+						border-radius: 25px;
+					}
+				}
+			}
+		}
+	}
+	
+	.save-section {
+		padding: 24px 16px;
+		
+		.save-btn {
+			width: 100%;
+			height: 48px;
+			background-color: #07c160;
+			color: #fff;
+			font-size: 16px;
+			border-radius: 24px;
+			border: none;
+			
+			&::after {
+				border: none;
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 306b264..9dfc78c 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,11 +1,19 @@
 <template>
 	<view class="my-page">
 		<!-- 登录区域 -->
-		<view class="login-section" @click="loginRegister">
+		<view class="login-section" @click="goToProfile">
+			<!-- <button class="avatar" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+			  <image :src="userInfo && userInfo.avatarUrl || '/static/default-avatar.png'" mode="aspectFit"></image>
+			</button> -->
 			<view class="avatar">
-				<text class="avatar-icon">😊</text>
+			  <!-- <image class="avatar" src="{{avatarUrl}}"></image> -->
+			  <image :src="userInfo && userInfo.avatarUrl || '/static/default-avatar.png'" mode="aspectFit"></image>
+			</view> 
+			<view v-if="loginRes && loginRes.accessToken" class="login-text">
+				<text class="login-title">{{userInfo.nickname || '默认昵称'}}</text>
+				<!-- <text class="login-subtitle">登录查看更多消息</text> -->
 			</view>
-			<view class="login-text">
+			<view v-else class="login-text">
 				<text class="login-title">点击登录/注册</text>
 				<text class="login-subtitle">登录查看更多消息</text>
 			</view>
@@ -33,8 +41,7 @@
 				</view>
 				<text class="feature-name">咨询客服</text>
 			</view>
-		</view>123
-		{{loginRes}}
+		</view>
 		<!-- 底部占位，避免内容被底部导航栏遮挡 -->
 		<view class="bottom-space"></view>
 	</view>
@@ -43,9 +50,32 @@
 <script setup>
 import { computed } from 'vue';
 import { useUserStore } from '../../stores/user.js';
+import { appUserEditAvatar } from '../../api/index.js';
 const userStore = useUserStore();
 const loginRes = computed(() => userStore.loginRes);
+const userInfo = computed(() => userStore.userInfo);
+const loginRegister = () => {
+	if (loginRes.value && loginRes.value.accessToken) {
+		return;
+	}
+	uni.navigateTo({
+		url: '/pages/login/login'
+	})
+}
 
+const goToProfile = () => {
+	if (loginRes.value && loginRes.value.accessToken) {
+		// 已登录，跳转到编辑资料页面
+		uni.navigateTo({
+			url: '/pages/my/editProfile'
+		})
+	} else {
+		// 未登录，跳转到登录页面
+		uni.navigateTo({
+			url: '/pages/login/login'
+		})
+	}
+}
 </script>
 
 <style lang="scss">
@@ -65,14 +95,17 @@ const loginRes = computed(() => userStore.loginRes);
 		.avatar {
 			width: 60px;
 			height: 60px;
-			border-radius: 30px;
+			margin: 0;
+			padding: 0;
+			border-radius: 4px;
 			background-color: #e6f7ff;
 			display: flex;
 			align-items: center;
 			justify-content: center;
+			overflow: hidden;
 			margin-right: 16px;
 			
-			.avatar-icon {
+			.avatar-image {
 				font-size: 30px;
 			}
 		}
diff --git a/pages/searchPositions/searchPositions.vue b/pages/searchPositions/searchPositions.vue
index b2a6bfd..99f77c3 100644
--- a/pages/searchPositions/searchPositions.vue
+++ b/pages/searchPositions/searchPositions.vue
@@ -16,7 +16,8 @@
 			</view>
 		</view>
 
-		<view class="search-list" :refresher-enabled="true" :refresher-triggered="refreshing" @refresherrefresh="onRefresh" @scrolltolower="onLoadMore">
+		<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">
 				<recruitment :dataSource="item"></recruitment>
 				<view class="driver"></view>
@@ -25,7 +26,7 @@
 				<text v-if="loadingMore">加载中...</text>
 				<text v-else-if="noMoreData">没有更多数据了</text>
 			</view>
-		</view>
+		</scroll-view>
 	</view>
 </template>
 
@@ -39,45 +40,75 @@
 	import {
 		ref
 	} from 'vue';
+	import {
+		delay, getLatLng
+	} from '../../utils';
+	let currentPage = 1
 	const list = ref([])
 	const searchKeyword = ref('')
 	const refreshing = ref(false)
 	const loadingMore = ref(false)
 	const noMoreData = ref(false)
-	const currentPage = ref(1)
 	const pageSize = ref(10)
-	
+	let userLatLng = {
+		lat: null,
+		lng: null
+	}
+
 	const hanleGetJobList = async (params = {}) => {
+		if (!(userLatLng.lat && userLatLng.lng)) {
+			userLatLng = await getLatLng()
+		}
 		const res = await getAppJobVO({
-			pageNum: currentPage.value,
+			pageNum: currentPage,
 			pageSize: pageSize.value,
+			...(userLatLng.lat && userLatLng.lng ? userLatLng : {}),
 			...params
 		})
 		console.log(res)
-		
-		if (currentPage.value === 1) {
+
+		if (currentPage === 1) {
 			// 刷新或首次加载
 			list.value = res.data
 		} else {
 			// 加载更多
-			list.value.records = [...list.value.records, ...res.data.records]
-		}
-		
-		// 检查是否还有更多数据
-		if (res.data.records.length < pageSize.value) {
-			noMoreData.value = true
-		} else {
-			noMoreData.value = false
+
+			if (res.data.records.length > 0) {
+				list.value.records = [...list.value.records, ...res.data.records]
+				currentPage++
+			} else {
+				noMoreData.value = true
+			}
+
 		}
 	}
-	
+
 	onLoad(() => {
-		currentPage.value = 1
+		currentPage = 1
 		hanleGetJobList()
 	})
-	
+
+
+
 	const onRefresh = async () => {
+		console.log("刷新")
 		refreshing.value = true
+		loadingMore.value = false
+		noMoreData.value = false
+		try {
+			await delay(1000)
+			currentPage = 1
+			await hanleGetJobList()
+		} catch (err) {
+			console.log(err)
+			uni.showToast({
+				title: '刷新失败',
+				icon: 'none'
+			})
+		} finally {
+			refreshing.value = false
+		}
+		/* refreshing.value = true
 		currentPage.value = 1
 		noMoreData.value = false
 		try {
@@ -93,36 +124,38 @@
 			})
 		} finally {
 			refreshing.value = false
-		}
+		} */
 	}
-	
+
 	const onLoadMore = async () => {
 		// 如果已经在加载或没有更多数据，则不执行
+		console.log("dao dibule")
 		if (loadingMore.value || noMoreData.value) return
-		
+
 		loadingMore.value = true
-		currentPage.value++
-		
+		currentPage++
+
 		try {
+			await delay(1000)
 			await hanleGetJobList()
 		} catch (error) {
 			uni.showToast({
 				title: '加载失败',
 				icon: 'none'
 			})
-			currentPage.value--
+			currentPage--
 		} finally {
 			loadingMore.value = false
 		}
 	}
-	
+
 	const onSearch = () => {
 		console.log(searchKeyword.value)
 		const params = {
-			jobName: searchKeyword.value
+			keyword: searchKeyword.value
 		}
 		// 搜索时重置到第一页
-		currentPage.value = 1
+		currentPage = 1
 		noMoreData.value = false
 		hanleGetJobList(params)
 	}
@@ -167,6 +200,8 @@
 			padding: 12px 16px;
 			background-color: #fff;
 			z-index: 10;
+			box-sizing: border-box;
+			height: 15vh;
 
 			// 搜索框包装器
 			.search-input-wrapper {
@@ -233,9 +268,11 @@
 
 		// 列表样式 - 可滚动区域
 		.search-list {
+			height: 85vh;
+			box-sizing: border-box;
 			padding: 4px;
-			flex: 1;
-			overflow-y: auto;
+			// flex: 1;
+			// overflow-y: auto;
 
 			// 隐藏滚动条但保留滚动功能
 			::-webkit-scrollbar {
@@ -251,7 +288,7 @@
 			height: 1px;
 			background-color: #eee;
 		}
-		
+
 		.loading-more {
 			text-align: center;
 			padding: 16px 0;
diff --git a/static/default-avatar.png b/static/default-avatar.png
new file mode 100644
index 0000000..d6a322b
Binary files /dev/null and b/static/default-avatar.png differ
diff --git a/stores/user.js b/stores/user.js
index b2d33d8..83edd16 100644
--- a/stores/user.js
+++ b/stores/user.js
@@ -59,6 +59,20 @@ export const useUserStore = defineStore('user', {
     updateUserInfo(updates) {
       this.userInfo = { ...this.userInfo, ...updates };
       uni.setStorageSync('userInfo', this.userInfo);
+    },
+    
+    /**
+     * 更新单个用户信息字段
+     * @param {String} field - 要更新的字段名
+     * @param {*} value - 要更新的字段值
+     */
+    updateUserInfoField(field, value) {
+      if (this.userInfo) {
+        this.userInfo = { ...this.userInfo, [field]: value };
+      } else {
+        this.userInfo = { [field]: value };
+      }
+      uni.setStorageSync('userInfo', this.userInfo);
     }
   }
 });
\ No newline at end of file
diff --git a/utils/index.js b/utils/index.js
new file mode 100644
index 0000000..0344e9a
--- /dev/null
+++ b/utils/index.js
@@ -0,0 +1,38 @@
+/**
+ * 延时函数
+ * @param {number} ms - 延迟时间（毫秒）
+ * @returns {Promise} - 返回一个 Promise，在指定时间后 resolve
+ */
+export function delay(ms) {
+	return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+export function getLatLng() {
+	return new Promise((reslove) => {
+		uni.getLocation({
+			type: 'gcj02',
+			success: function(res) {
+				console.log('当前位置的经度：' + res.longitude);
+				console.log('当前位置的纬度：' + res.latitude);
+				reslove({
+					lat: res.latitude,
+					lng: res.longitude
+				})
+			},
+			fail: function(res) {
+				reslove({
+					lat: null,
+					lng: null
+				})
+			}
+		});
+	});
+
+}
+
+// 使用示例:
+// async function example() {
+//   console.log('开始');
+//   await delay(2000); // 延时 2 秒
+//   console.log('2秒后执行');
+// }
\ No newline at end of file