修复地图定位bug

components/MapComponent.vue

@@ -19,15 +19,12 @@
 				<cover-view class="map-side-controls" v-if="!props.hideControls && !props.hideMapOverlays">
 					<cover-view class="side-btn locate" @tap="handleRelocate">
 						<cover-image class="side-icon" src="/static/location.png"></cover-image>
-						<!-- <cover-view class="side-text">定位</cover-view> -->
 					</cover-view>
 					<cover-view class="side-btn service" @tap="handleService">
 						<cover-image class="side-icon" src="/static/customer-service.png"></cover-image>
-						<!-- <cover-view class="side-text">客服</cover-view> -->
 					</cover-view>
 					<cover-view class="side-btn search" @tap="handleSearch">
 						<cover-image class="side-icon" src="/static/other_device.png"></cover-image>
-						<!-- <cover-view class="side-text">搜索</cover-view> -->
 					</cover-view>
 					
 				</cover-view>
@@ -180,7 +177,6 @@
 	// 移动地图到指定位置（直接更新地图中心坐标）
 	const moveToLocation = (location) => {
 		if (!location || !location.longitude || !location.latitude) {
-			console.warn('moveToLocation: 无效的位置参数', location)
 			return
 		}
 
@@ -189,8 +185,6 @@
 			latitude: Number(location.latitude)
 		}
 				
-		console.log('移动地图到:', newCenter)
-		
 		// 直接更新地图中心，触发地图组件的视图更新
 		mapCenter.value = newCenter
 		
@@ -207,7 +201,6 @@
 				oldLocation.latitude !== newLocation.latitude
 			
 			if (isChanged) {
-				console.log('用户位置变化:', newLocation)
 				mapCenter.value = {
 					longitude: newLocation.longitude,
 					latitude: newLocation.latitude
@@ -234,25 +227,15 @@
 
 	// 地图区域变化事件（带防抖优化）
 	const onMapRegionChange = (e) => {
-		console.log('regionchange事件:', e)
 		
 		// 只处理结束事件
 		if (!e || e.type !== 'end') {
 			return
 		}
 		
-		// 获取事件原因
-		// 微信小程序：e.causedBy 可能的值：
-		// - 'gesture': 手势拖动
-		// - 'scale': 缩放
-		// - 'update': 调用更新接口（如 setCenterOffset 等）
 		const causedBy = e.causedBy || e.detail?.causedBy
 		
-		console.log('地图变化原因:', causedBy, '完整事件:', e)
+		if (causedBy === 'gesture' || causedBy === 'scale' || causedBy === 'drag'||causedBy==='update') {
-		
-		// 只在用户手动操作（拖动或缩放）结束时触发查询
-		// 排除程序调用（update）导致的变化，避免定位按钮触发多余查询
-		if (causedBy === 'gesture' || causedBy === 'scale' || causedBy === 'drag') {
 			// 清除之前的定时器
 			if (regionChangeTimer) {
 				clearTimeout(regionChangeTimer)
@@ -269,14 +252,13 @@
 						latitude: Number(centerLocation.latitude)
 					}
 					
-					mapCenter.value = newCenter
+					mapCenter.value = newCenter;
-					console.log('地图中心变化，触发查询:', newCenter, '原因:', causedBy)
+
 					
 					// 触发父组件查询新位置的场地
 					emit('mapCenterChange', newCenter)
 				}, 500)
 			} else {
-				console.warn('未能从事件中获取中心点位置，尝试使用API获取')
 				// 兜底方案：如果事件中没有centerLocation，才使用API获取
 				regionChangeTimer = setTimeout(() => {
 					if (mapContext.value) {
@@ -288,7 +270,6 @@
 										latitude: res.latitude
 									}
 									mapCenter.value = newCenter
-									console.log('地图中心变化（API获取）:', newCenter, '原因:', causedBy)
 									emit('mapCenterChange', newCenter)
 								}
 							},
@@ -299,8 +280,6 @@
 					}
 				}, 500)
 			}
-		} else {
-			console.log('跳过查询，原因:', causedBy)
 		} 
 	}
 
@@ -505,7 +484,7 @@ const handleSearch = () => {
 
 		.center-marker-icon {
 			width: 60rpx;
-			height: 80rpx;
+			height: 60rpx;
 			display: block;
 		}
 

config/url.js

@@ -1,4 +1,5 @@
-// export const URL = "https://my.gxfs123.com/api" //正式服务器
+// export const URL = "https://my.gxfs123.com/api" //正式服务器-弃用
+// export const URL = "https://manager.fdzpower.com/api"  //正式服务器
 export const URL = "https://fansdev.gxfs123.com/api"  //测试服务器
 // export const URL = "http://192.168.5.149:8080" 		//本地调试
 // export const URL = "http://127.0.0.1:8080" 		//本地调试

locale/en-US.js

@@ -298,6 +298,15 @@ export default {
     authCodeFailed: 'Auth failed'
   },
 
+  permission: {
+    locationTitle: 'Location Permission',
+    locationNeed: 'We need your location to show nearby devices. Please enable location access in “Settings > Permissions”.',
+    locationDenied: 'Location access is disabled. You can enable it later in “Settings > Permissions” to continue.',
+    goToSettings: 'Open Settings',
+    later: 'Not now',
+    gotIt: 'Got it'
+  },
+
   payment: {
     paymentAmount: 'Amount',
     paymentMethod: 'Method',

locale/zh-CN.js

@@ -298,6 +298,15 @@ export default {
     authCodeFailed: '获取授权码失败'
   },
 
+  permission: {
+    locationTitle: '位置信息授权',
+    locationNeed: '需要获取您的位置信息以展示附近设备，请在“设置-权限管理”中开启定位权限。',
+    locationDenied: '未授权定位，将无法展示附近设备。您可以稍后在“设置-权限管理”中重新开启定位权限。',
+    goToSettings: '去设置',
+    later: '暂不',
+    gotIt: '知道了'
+  },
+
   payment: {
     paymentAmount: '支付金额',
     paymentMethod: '支付方式',

pages/device/detail.vue

@@ -384,9 +384,12 @@
 
 	// 获取价格单位文本
 	const getPriceUnit = () => {
+		console.log(deviceInfo.value);
 		// 按分钟计费
 		if (deviceInfo.value && deviceInfo.value.feeType === 'minute') {
 			return '分钟'
+		}else if(deviceInfo.value && deviceFeeConfig.value.hourPrice == '0.5'){
+			return '30分钟'
 		}
 		// 按小时计费（默认）
 		return $t('time.hour')
@@ -417,7 +420,7 @@
 		
 		// 按小时计费
 		const hourPrice = parseFloat(deviceFeeConfig.value.hourPrice || 1)
-		const unitPrice = maxHourPrice * hourPrice
+		const unitPrice = maxHourPrice
 		return unitPrice.toFixed(2)
 	}
 
@@ -439,11 +442,7 @@
 
 		// 按小时计费
 		const unitMinutes = getBillingUnitMinutes()
-		if (unitMinutes === 30) {
+		return deviceInfo.value.remark;
-			return `${unitPrice}元/${unitMinutes}分钟，${maxHourPrice}元/小时`
-		} else {
-			return `${maxHourPrice}元/小时`
-		}
 	}
 
 	// 生成详细说明文本
@@ -454,11 +453,11 @@
 
 		// 按分钟计费
 		if (deviceInfo.value && deviceInfo.value.feeType === 'minute') {
-			return `前${freeMinutes}分钟内归还免费，不足${unitMinutes}分钟按${unitMinutes}分钟计费，封顶${depositAmount}元，持续计费至${depositAmount}元视为买断`
+			return `不足${unitMinutes}分钟按${unitMinutes}分钟计费，封顶${depositAmount}元，持续计费至${depositAmount}元视为买断`
 		}
 
 		// 按小时计费
-		return `前${freeMinutes}分钟内归还免费，不足${unitMinutes}分钟按${unitMinutes}分钟计费，封顶${depositAmount}元，持续计费至${depositAmount}元视为买断`
+		return `不足${unitMinutes}分钟按${unitMinutes}分钟计费，封顶${depositAmount}元，持续计费至${depositAmount}元视为买断`
 	}
 
 	// 提交租借订单

pages/feedback/index.vue

@@ -38,8 +38,8 @@
 		<!-- 联系方式 -->
 		<view class="contact-section">
 			<view class="section-title">{{ $t('feedback.contactInfo') }}</view>
-			<input class="contact-input" v-model="contact" :placeholder="$t('feedback.contactPlaceholder')" type="number"
+			<input class="contact-input" v-model="contact" :placeholder="$t('feedback.contactPlaceholder')"
-				maxlength="11" name="contact" />
+				type="number" maxlength="11" name="contact" />
 		</view>
 
 		<!-- 提交按钮 -->
@@ -55,6 +55,9 @@
 		ref,
 		onMounted
 	} from 'vue'
+	import {
+		onLoad
+	} from "@dcloudio/uni-app"
 	import {
 		URL,
 		appid
@@ -65,9 +68,12 @@
 	import {
 		addUserFeedback
 	} from '../../config/api/feedback'
-	import { useI18n } from '@/utils/i18n.js'
+	import {
-
+		useI18n
-	const { t: $t } = useI18n()
+	} from '@/utils/i18n.js'
+	const {
+		t: $t
+	} = useI18n()
 
 	onMounted(() => {
 		uni.setNavigationBarTitle({
@@ -75,6 +81,12 @@
 		})
 	})
 
+	onLoad(() => {
+		if (uni.getStorageSync("userInfo").phone) {
+			contact.value = uni.getStorageSync('userInfo').phone;
+		}
+	})
+
 	// 响应式数据
 	const types = ref(['feedback.deviceFault', 'feedback.chargingIssue', 'feedback.usageSuggestion', 'feedback.other'])
 	const selectedType = ref(-1)
@@ -89,6 +101,7 @@
 		selectedType.value = index
 	}
 
+
 	const chooseImage = () => {
 		uni.chooseImage({
 			count: 3 - images.value.length,
@@ -109,7 +122,10 @@
 						if (idx !== -1) {
 							images.value.splice(idx, 1)
 						}
-						uni.showToast({ title: '图片上传失败', icon: 'none' })
+						uni.showToast({
+							title: '图片上传失败',
+							icon: 'none'
+						})
 					}
 				}
 			}
@@ -145,7 +161,8 @@
 			return
 		}
 
-	if (types.value[selectedType.value] === 'feedback.deviceFault' || types.value[selectedType.value] === 'feedback.chargingIssue') {
+		if (types.value[selectedType.value] === 'feedback.deviceFault' || types.value[selectedType.value] ===
+			'feedback.chargingIssue') {
 			paramsType.value = 'complain'
 		} else {
 			paramsType.value = 'suggestion'
@@ -172,7 +189,8 @@
 			dataType: 'json',
 			success: (res) => {
 				// 兼容后端返回 { code: 200 } 或 HTTP 200 情况
-				if ((res.statusCode === 200) && ((res.data && res.data.code === 200) || res.data === true || res.data?.success === true)) {
+				if ((res.statusCode === 200) && ((res.data && res.data.code === 200) || res.data ===
+						true || res.data?.success === true)) {
 					uni.showToast({
 						title: $t('feedback.submitSuccess'),
 						icon: 'success'
@@ -183,7 +201,8 @@
 					return
 				}
 				uni.showToast({
-					title: (res.data && (res.data.msg || res.data.message)) || $t('feedback.submitFailed'),
+					title: (res.data && (res.data.msg || res.data.message)) || $t(
+						'feedback.submitFailed'),
 					icon: 'none'
 				})
 			},

pages/index/index.vue

@@ -16,13 +16,12 @@
 			</view>
 		</view>
 
-<!-- 内容区域 -->
+		<!-- 内容区域 -->
-<view class="main-content" :style="{ paddingTop: (statusBarHeight + navBarHeight + noticeHeight) + 'px' }">
+		<view class="main-content" :style="{ paddingTop: (statusBarHeight + navBarHeight + noticeHeight) + 'px' }">
 			<!-- 全屏地图组件 -->
 			<MapComponent v-if="!isLoading && userLocation" ref="mapRef" :userLocation="userLocation"
 				:positionList="positionList" :filteredPositions="filteredPositions" :searchKeyword="searchKeyword"
-		:enableMarkers="true"
+				:enableMarkers="true" :hideMapOverlays="showGuidePopup || showNoticePopup || showActivityPopup"
-		:hideMapOverlays="showGuidePopup || showNoticePopup || showActivityPopup"
 				@relocate="handleRelocate" @scan="handleScan" @showList="showLocationList" @markerTap="selectPosition"
 				@mapCenterChange="onMapCenterChange" />
 
@@ -67,16 +66,9 @@
 		</view>
 
 		<!-- 场地列表弹窗组件 -->
-		<LocationListSheet
+		<LocationListSheet :show="showLocationPopup" :expanded="isExpanded" :positions="filteredPositions"
-			:show="showLocationPopup"
+			:isLoading="isLoading" :title="$t('home.nearbyDeviceLocation')" @close="hideLocationList"
-			:expanded="isExpanded"
+			@select="selectPositionFromPopup" @navigate="navigateToPosition" />
-			:positions="filteredPositions"
-			:isLoading="isLoading"
-			:title="$t('home.nearbyDeviceLocation')"
-			@close="hideLocationList"
-			@select="selectPositionFromPopup"
-			@navigate="navigateToPosition"
-		/>
 
 		<!-- 加载状态 -->
 		<view class="loading-overlay" v-if="isLoading">
@@ -108,7 +100,8 @@
 		</view>
 
 		<!-- 使用指南：居中弹出（ref 控制 open/close） -->
-	<uv-popup ref="guidePopup" mode="center" round="24" :overlay="true" :closeOnClickOverlay="false" :safeAreaInsetBottom="false">
+		<uv-popup ref="guidePopup" mode="center"  :overlay="true" :closeOnClickOverlay="false"
+			:safeAreaInsetBottom="false">
 			<view class="guide-popup">
 				<view class="guide-header">
 					<text class="guide-title">{{ $t('guide.title') }}</text>
@@ -125,17 +118,19 @@
 						</view>
 					</view>
 				</view>
+
+			</view>
 			<view class="guide-actions">
 				<!-- <view class="primary-btn" @click="closeGuidePopup"></view> -->
 				<view class="primary-btn" @click="closeGuidePopup">
 					<uv-icon name="close" size="20"></uv-icon>
 				</view>
 			</view>
-		</view>
 		</uv-popup>
 
 		<!-- 通知详情弹窗：居中弹出 -->
-	<uv-popup ref="noticePopup" mode="center" round="24" :overlay="true" :closeOnClickOverlay="true" :safeAreaInsetBottom="false">
+		<uv-popup ref="noticePopup" mode="center" :overlay="true" :closeOnClickOverlay="true"
+			:safeAreaInsetBottom="false">
 			<view class="notice-popup">
 				<view class="notice-header">
 					<text class="notice-title">{{ $t('home.noticeTitle') }}</text>
@@ -143,45 +138,34 @@
 				<view class="notice-content">
 					<text class="notice-text">{{ noticeText }}</text>
 				</view>
+
+			</view>
 			<view class="notice-actions">
 				<view class="primary-btn" @click="closeNoticePopup">
 					<uv-icon name="close" size="20"></uv-icon>
 				</view>
 			</view>
-		</view>
 		</uv-popup>
 
 		<!-- 活动弹窗：居中弹出，支持多个活动轮播 -->
-	<uv-popup ref="activityPopup" mode="center" round="16" :overlay="true" :closeOnClickOverlay="false" :safeAreaInsetBottom="false" :customStyle="{ background: 'transparent' }">
+		<uv-popup ref="activityPopup" mode="center" round="16" :overlay="true" :closeOnClickOverlay="false"
+			:safeAreaInsetBottom="false" :customStyle="{ background: 'transparent' }">
 			<view class="activity-popup" v-if="activityList && activityList.length > 0">
 				<!-- 轮播图 -->
-			<swiper 
+				<swiper class="activity-swiper" :indicator-dots="activityList.length > 1" :autoplay="false"
-				class="activity-swiper" 
+					:circular="false" @change="onActivitySwiperChange" :current="currentActivityIndex">
-				:indicator-dots="activityList.length > 1"
-				:autoplay="false"
-				:circular="false"
-				@change="onActivitySwiperChange"
-				:current="currentActivityIndex"
-			>
 					<swiper-item v-for="(activity, index) in activityList" :key="index">
 						<view class="activity-poster-wrapper">
-				<image 
+							<image :src="activity.coverImageUrl || activity.imageUrl || activity.posterUrl"
-					:src="activity.coverImageUrl || activity.imageUrl || activity.posterUrl" 
+								mode="aspectFit" class="activity-poster"></image>
-					mode="aspectFit" 
-					class="activity-poster"
-				></image>
 						</view>
 					</swiper-item>
 				</swiper>
 
 				<!-- 自定义指示器 -->
 				<view class="activity-indicators" v-if="activityList.length > 1">
-				<view 
+					<view v-for="(item, index) in activityList" :key="index" class="indicator-dot"
-					v-for="(item, index) in activityList" 
+						:class="{ active: index === currentActivityIndex }"></view>
-					:key="index"
-					class="indicator-dot"
-					:class="{ active: index === currentActivityIndex }"
-				></view>
 				</view>
 
 				<!-- 关闭按钮 -->
@@ -190,7 +174,7 @@
 				</view>
 			</view>
 		</uv-popup>
-</view>
+	</view>
 </template>
 
 <script setup>
@@ -230,7 +214,9 @@
 	// 注意：从 pages/index/ 目录访问 components/ 需要使用 ../../components/ 路径
 	import MapComponent from '../../components/MapComponent.vue'
 	import LocationListSheet from '../../components/LocationListSheet.vue'
-	import { useI18n } from '../../utils/i18n.js'
+	import {
+		useI18n
+	} from '../../utils/i18n.js'
 
 	// 开启右上角分享菜单（仅 mp-weixin 有效）
 	// #ifdef MP-WEIXIN
@@ -240,7 +226,9 @@
 	})
 	// #endif
 
-	const { t: $t } = useI18n()
+	const {
+		t: $t
+	} = useI18n()
 
 	// 响应式数据
 	const searchKeyword = ref('')
@@ -251,26 +239,37 @@
 	const isLoading = ref(false)
 	const showPhoneAuthPopup = ref(false)
 	const isLocationInitialized = ref(false)
-const showLocationPopup = ref(false)
+	const showLocationPopup = ref(false)
-const isRelocating = ref(false) // 防抖标志：是否正在重新定位
+	const isRelocating = ref(false) // 防抖标志：是否正在重新定位
-const showGuidePopup = ref(false) // 使用指南弹窗显示状态
+	const showGuidePopup = ref(false) // 使用指南弹窗显示状态
-const showNoticePopup = ref(false) // 通知详情弹窗显示状态
+	const showNoticePopup = ref(false) // 通知详情弹窗显示状态
-const showActivityPopup = ref(false) // 活动弹窗显示状态
+	const showActivityPopup = ref(false) // 活动弹窗显示状态
-const activityList = ref([]) // 活动列表
+	const activityList = ref([]) // 活动列表
-const currentActivityIndex = ref(0) // 当前活动索引
+	const currentActivityIndex = ref(0) // 当前活动索引
-const hasShownActivityThisSession = ref(false) // 本次会话是否已显示过活动（内存变量）
+	const hasShownActivityThisSession = ref(false) // 本次会话是否已显示过活动（内存变量）
 
-// 导航栏高度相关
+	// 导航栏高度相关
-const statusBarHeight = ref(0)
+	const statusBarHeight = ref(0)
 	const navBarHeight = ref(44) // 默认导航栏内容高度
 	const noticeHeight = ref(0) // 通知栏高度
 
 	// 使用指南步骤
-	const guideSteps = ref([
+	const guideSteps = ref([{
-		{ title: '扫码使用', desc: '找到附近设备，扫描设备上的二维码' },
+			title: '扫码使用',
-		{ title: '免押金支付', desc: '无需支付押金，使用支付分免押即可完成租借' },
+			desc: '找到附近设备，扫描设备上的二维码'
-		{ title: '开始使用', desc: '设备自动解锁，风扇弹出后取出即可开始使用' },
+		},
-		{ title: '归还设备', desc: '使用完毕后，按照设备规格要求将风扇还入即可结束订单' }
+		{
+			title: '免押金支付',
+			desc: '无需支付押金，使用支付分免押即可完成租借'
+		},
+		{
+			title: '开始使用',
+			desc: '设备自动解锁，风扇弹出后取出即可开始使用'
+		},
+		{
+			title: '归还设备',
+			desc: '使用完毕后，按照设备规格要求将风扇还入即可结束订单'
+		}
 	])
 
 	const redirectToLogin = () => {
@@ -376,11 +375,11 @@ const statusBarHeight = ref(0)
 	}
 
 
-// 组件引用
+	// 组件引用
-const mapRef = ref(null)
+	const mapRef = ref(null)
-const guidePopup = ref(null)
+	const guidePopup = ref(null)
-const noticePopup = ref(null)
+	const noticePopup = ref(null)
-const activityPopup = ref(null)
+	const activityPopup = ref(null)
 
 	// 计算属性
 	const searchPlaceholder = computed(() => {
@@ -448,7 +447,7 @@ const activityPopup = ref(null)
 			// 1. 先获取用户位置
 		await getUserLocationAndAddress()
 
-			// 2. 加载场地列表
+		// 2. 加载场地列表（依赖定位）
 		await loadPositions()
 
 			// 3. 查询活动并显示弹窗
@@ -456,18 +455,23 @@ const activityPopup = ref(null)
 
 		} catch (error) {
 			console.error('初始化失败:', error)
-			// 即使失败也要加载场地列表
+		uni.showToast({
-			await loadPositions()
+			title: $t('home.getLocationFailed'),
+			icon: 'none'
+		})
 		} finally {
 			isLoading.value = false
 		}
 	}
 
 	const getUserLocationAndAddress = async () => {
-		try {
+	// 使用腾讯地图SDK获取位置（若失败抛出，由调用方统一处理）
-			// 使用腾讯地图SDK获取位置
 	const location = await getUserLocation()
 
+	if (!location?.longitude || !location?.latitude) {
+		throw new Error('invalid location result')
+	}
+
 	// 保存用户位置
 	userLocation.value = {
 		longitude: location.longitude,
@@ -516,20 +520,7 @@ const activityPopup = ref(null)
 		// 忽略地址信息错误，使用基础定位信息
 	}
 
-			// 等待地图组件响应位置变化后，重新加载场地列表
+	return userLocation.value
-			setTimeout(async () => {
-				await loadPositions()
-
-				uni.hideLoading()
-			}, 800)
-
-		} catch (error) {
-			console.error('获取位置失败:', error)
-			uni.showToast({
-				title: $t('home.getLocationFailed'),
-				icon: 'none'
-			})
-		}
 	}
 
 	const loadPositions = async () => {
@@ -723,7 +714,6 @@ const activityPopup = ref(null)
 	}
 
 	const onMapCenterChange = (center) => {
-		console.log('onMapCenterChange 被调用，中心点:', center)
 
 		if (center && typeof center.longitude !== 'undefined' && typeof center.latitude !== 'undefined') {
 			userLocation.value = {
@@ -921,57 +911,57 @@ const activityPopup = ref(null)
 		}
 	}
 
-// 使用指南弹窗控制
+	// 使用指南弹窗控制
-const openPopup = () => {
+	const openPopup = () => {
 		try {
 			showGuidePopup.value = true
 			guidePopup.value && typeof guidePopup.value.open === 'function' && guidePopup.value.open()
 		} catch (e) {}
-}
+	}
 
-const closeGuidePopup = () => {
+	const closeGuidePopup = () => {
 		try {
 			showGuidePopup.value = false
 			guidePopup.value && typeof guidePopup.value.close === 'function' && guidePopup.value.close()
 		} catch (e) {}
-}
+	}
 
-// 通知弹窗控制
+	// 通知弹窗控制
-const openNoticePopup = () => {
+	const openNoticePopup = () => {
 		try {
 			showNoticePopup.value = true
 			noticePopup.value && typeof noticePopup.value.open === 'function' && noticePopup.value.open()
 		} catch (e) {}
-}
+	}
 
-const closeNoticePopup = () => {
+	const closeNoticePopup = () => {
 		try {
 			showNoticePopup.value = false
 			noticePopup.value && typeof noticePopup.value.close === 'function' && noticePopup.value.close()
 		} catch (e) {}
-}
+	}
 
-// 活动弹窗控制
+	// 活动弹窗控制
-const openActivityPopup = () => {
+	const openActivityPopup = () => {
 		try {
 			showActivityPopup.value = true
 			activityPopup.value && typeof activityPopup.value.open === 'function' && activityPopup.value.open()
 		} catch (e) {}
-}
+	}
 
-const closeActivityPopup = () => {
+	const closeActivityPopup = () => {
 		try {
 			showActivityPopup.value = false
 			activityPopup.value && typeof activityPopup.value.close === 'function' && activityPopup.value.close()
 			// 重置索引
 			currentActivityIndex.value = 0
 		} catch (e) {}
-}
+	}
 
-// 活动轮播图切换
+	// 活动轮播图切换
-const onActivitySwiperChange = (e) => {
+	const onActivitySwiperChange = (e) => {
 		currentActivityIndex.value = e.detail.current
-}
+	}
 </script>
 
 <script>
@@ -1040,7 +1030,8 @@ const onActivitySwiperChange = (e) => {
 		position: relative;
 		width: 100%;
 		height: 100%;
-		padding-bottom: 180rpx; /* 为底部按钮留出空间 */
+		padding-bottom: 180rpx;
+		/* 为底部按钮留出空间 */
 		box-sizing: border-box;
 	}
 
@@ -1509,7 +1500,8 @@ const onActivitySwiperChange = (e) => {
 		top: 0;
 		left: 0;
 		right: 0;
-		bottom: 180rpx; /* 为底部按钮留出空间 */
+		bottom: 180rpx;
+		/* 为底部按钮留出空间 */
 		background: #f6f7fb;
 		display: flex;
 		align-items: center;
@@ -1659,6 +1651,7 @@ const onActivitySwiperChange = (e) => {
 		border-radius: 24rpx;
 		padding: 24rpx 24rpx 16rpx;
 		box-sizing: border-box;
+		// padding-bottom:100rpx;
 	}
 
 	.guide-header {
@@ -1732,7 +1725,7 @@ const onActivitySwiperChange = (e) => {
 	}
 
 	.guide-actions {
-		margin-top:20rpx;
+		margin-top: 20rpx;
 	}
 
 	.primary-btn {
@@ -1752,8 +1745,8 @@ const onActivitySwiperChange = (e) => {
 	}
 
 
-	.primary-label{
+	.primary-label {
-		color:#ffffff;
+		color: #ffffff;
 		font-size: 32rpx;
 		font-weight: 600;
 	}

pages/search/index.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="search-page">
 		<view class="map-wrap">
-			<MapComponent :userLocation="userLocation" :filteredPositions="filteredPositions"
+			<MapComponent :userLocation="userLocation" :filteredPositions="filteredPositions" :enableMarkers="true"
-				:enableMarkers="true" :customHeight="'100%'" :hideControls="true" :fullWidth="true"
+				:customHeight="'100%'" :hideControls="true" :fullWidth="true" @mapCenterChange="onMapCenterChange"
-				@mapCenterChange="onMapCenterChange" @relocate="init" @markerTap="goToPositionDetail" />
+				@relocate="init" @markerTap="goToPositionDetail" />
 			<!-- 定位按钮 -->
 			<view class="relocate-btn" @click="init">
 				<image src="/static/location.png" class="relocate-icon" mode="aspectFit"></image>
@@ -12,15 +12,19 @@
 		<view class="list-wrap">
 			<view class="panel">
 				<view class="filter-tabs">
-					<view class="tab" :class="{ active: activeTab === 'rent' }" @click="setTab('rent')">{{ $t('location.rent') }}</view>
+					<view class="tab" :class="{ active: activeTab === 'rent' }" @click="setTab('rent')">
-					<view class="tab" :class="{ active: activeTab === 'return' }" @click="setTab('return')">{{ $t('location.return') }}</view>
+						{{ $t('location.rent') }}</view>
+					<view class="tab" :class="{ active: activeTab === 'return' }" @click="setTab('return')">
+						{{ $t('location.return') }}</view>
 				</view>
 				<scroll-view class="list-scroll" scroll-y="true">
-					<view class="card" :class="{ available: isRentable(item), invalid: !isValidCoordinate(item.latitude, item.longitude) }"
+					<view class="card"
+						:class="{ available: isRentable(item), invalid: !isValidCoordinate(item.latitude, item.longitude) }"
 						v-for="(item, index) in filteredPositions" :key="item.positionId || index"
 						@click="goToPositionDetail(item)">
 						<view class="thumb">
-							<image v-if="item.deviceImg" :src="item.deviceImg" class="thumb-img" mode="aspectFill"></image>
+							<image v-if="item.deviceImg" :src="item.deviceImg" class="thumb-img" mode="aspectFill">
+							</image>
 							<image v-else src="/static/device-info.png" class="thumb-img" mode="aspectFit"></image>
 						</view>
 						<view class="info">
@@ -37,10 +41,12 @@
 							<view class="row meta" v-if="!isValidCoordinate(item.latitude, item.longitude)">
 								<text class="time" style="color: #ff6b6b;">{{ $t('location.coordinateError') }}</text>
 							</view>
-						<view class="row meta" v-if="item.availablePowerBankCount !== undefined && item.availablePowerBankCount !== null">
+							<view class="row meta"
+								v-if="item.availablePowerBankCount !== undefined && item.availablePowerBankCount !== null">
 								<text class="time">可租借：{{ item.availablePowerBankCount }} 台</text>
 							</view>
-						<view class="row meta" v-if="item.availableEmptyGridCount !== undefined && item.availableEmptyGridCount !== null">
+							<view class="row meta"
+								v-if="item.availableEmptyGridCount !== undefined && item.availableEmptyGridCount !== null">
 								<text class="time">可归还：{{ item.availableEmptyGridCount }} 个空位</text>
 							</view>
 							<view class="row meta remark-info" v-if="item.remark">
@@ -53,12 +59,13 @@
 						</view>
 						<view class="actions">
 
-							<view class="nav" 
+							<view class="nav" :class="{ disabled: !isValidCoordinate(item.latitude, item.longitude) }"
-								:class="{ disabled: !isValidCoordinate(item.latitude, item.longitude) }"
 								@click.stop="navigateToPosition(item)">
 								<image src="/static/luxian.png" class="action-icon" mode="aspectFit"></image>
 							</view>
-							<view class="distance" v-if="item.distance && isValidCoordinate(item.latitude, item.longitude)">{{ item.distance }}</view>
+							<view class="distance"
+								v-if="item.distance && isValidCoordinate(item.latitude, item.longitude)">
+								{{ item.distance }}</view>
 						</view>
 					</view>
 
@@ -88,15 +95,25 @@
 		getRegeo,
 		calculateDistanceSync
 	} from '../../utils/mapUtils.js'
-	import { useI18n } from '@/utils/i18n.js'
+	import {
+		useI18n
+	} from '@/utils/i18n.js'
 
-	const { t: $t } = useI18n()
+	const {
+		t: $t
+	} = useI18n()
 
 	onMounted(() => {
+
 		uni.setNavigationBarTitle({
 			title: $t('search.title')
 		})
+		// uni.showLoading({
+		// 	title:'11111',
+		// 	mask:true
+		// })
 		init()
+		// uni.hideLoading();
 	})
 
 	const userLocation = ref(null)
@@ -199,7 +216,8 @@
 					return {
 						...transformed,
 						canRent: activeTab.value === 'rent' ? true : (device.availablePowerBankCount > 0),
-						canReturn: activeTab.value === 'return' ? true : (device.availableEmptyGridCount > 0)
+						canReturn: activeTab.value === 'return' ? true : (device.availableEmptyGridCount >
+							0)
 					}
 				})
 
@@ -217,24 +235,35 @@
 		}
 	}
 
-	const init = async () => {
+const init = async () => {
 	isLoading.value = true
+	uni.showLoading({
+		mask: true
+	})
 	try {
 		const loc = await getUserLocation()
+		if (!loc?.longitude || !loc?.latitude) {
+			throw new Error('invalid location result')
+		}
 		userLocation.value = {
 			longitude: loc.longitude,
 			latitude: loc.latitude
 		}
 		await loadPositions(userLocation.value)
 	} catch (e) {
-			await loadPositions(userLocation.value || {
+		console.error('初始化定位失败:', e)
-				longitude: 0,
+		userLocation.value = null
-				latitude: 0
+		positionList.value = []
+		filteredPositions.value = []
+		uni.showToast({
+			title: $t('home.getLocationFailed'),
+			icon: 'none'
 		})
 	} finally {
 		isLoading.value = false
+		uni.hideLoading();
 	}
-	}
+}
 
 	const onMapCenterChange = (center) => {
 		if (center && typeof center.longitude !== 'undefined' && typeof center.latitude !== 'undefined') {
@@ -276,7 +305,6 @@
 			url: `/pages/position/detail?positionId=${position.positionId}`
 		})
 	}
-
 </script>
 
 <style lang="scss" scoped>
@@ -427,6 +455,7 @@
 
 			.addr {
 				display: -webkit-box;
+				line-clamp: 1;
 				-webkit-line-clamp: 1;
 				-webkit-box-orient: vertical;
 				overflow: hidden;

pages/userProfile/index.vue

@@ -44,12 +44,12 @@
 			</view>
 		</view>
 
-		<view class="form-item" v-if="userInfo.balanceAmount !== undefined">
+<!-- 		<view class="form-item" v-if="userInfo.balanceAmount !== undefined">
 			<view class="label">{{ $t('userProfile.balance') }}</view>
 			<view class="value">
 				<text class="value-text amount">¥{{ userInfo.balanceAmount || '0.00' }}</text>
 			</view>
-		</view>
+		</view> -->
 	</view>
 	</view>
 </template>

utils/mapUtils.js

@@ -1,5 +1,41 @@
 // 地图工具函数 - 内联腾讯地图SDK核心代码
 
+const DEFAULT_LOCALE = 'zh-CN'
+const permissionTexts = {
+  'zh-CN': {
+    locationTitle: '位置信息授权',
+    locationNeed: '需要获取您的位置信息以展示附近设备，请在“设置-权限管理”中开启定位权限。',
+    locationDenied: '未授权定位，将无法展示附近设备。您可以稍后在“设置-权限管理”中重新开启定位权限。',
+    goToSettings: '去设置',
+    later: '暂不',
+    gotIt: '知道了'
+  },
+  'en-US': {
+    locationTitle: 'Location Permission',
+    locationNeed: 'We need your location to show nearby devices. Please enable location in “Settings > Permissions”.',
+    locationDenied: 'Location access is disabled. You can re-enable it later in “Settings > Permissions”.',
+    goToSettings: 'Set',
+    later: 'Skip',
+    gotIt: 'OK'
+  }
+}
+
+const getCurrentLocale = () => {
+  try {
+    const saved = uni.getStorageSync('language')
+    if (saved && permissionTexts[saved]) {
+      return saved
+    }
+  } catch (_) {}
+  return DEFAULT_LOCALE
+}
+
+const getPermissionText = (key) => {
+  const locale = getCurrentLocale()
+  const texts = permissionTexts[locale] || permissionTexts[DEFAULT_LOCALE]
+  return texts[key] || permissionTexts[DEFAULT_LOCALE][key] || ''
+}
+
 // 腾讯地图Key
 const QQMAP_KEY = 'RO5BZ-ECZ63-7US3C-RT5QW-TIDZE-2FF35';
 
@@ -408,16 +444,52 @@ function getQQMapInstance() {
   return qqmapInstance || initQQMap();
 }
 
-// 获取用户位置（使用微信的接口获取位置）
+// 获取用户位置（统一处理小程序定位授权 && 实际定位）
 function getUserLocation() {
   return new Promise((resolve, reject) => {
+    // 小程序端优先通过 getSetting 判断权限状态
+    // 这里只考虑 mp-weixin 场景，其它平台回退到直接调用 getLocation
+    // #ifdef MP-WEIXIN
+    uni.getSetting({
+      success: (settingRes) => {
+        const authSetting = settingRes.authSetting || {};
+        // 兼容多种定位 scope（微信近几次版本变更比较多）
+        const hasUserLocation = Object.prototype.hasOwnProperty.call(authSetting, 'scope.userLocation');
+        const userLocationAuth = authSetting['scope.userLocation'];
+        const fuzzyLocationAuth = authSetting['scope.userFuzzyLocation'];
+        const bgLocationAuth = authSetting['scope.userLocationBackground'];
+
+        // 已明确拒绝定位
+        if (
+          userLocationAuth === false ||
+          fuzzyLocationAuth === false ||
+          bgLocationAuth === false
+        ) {
+          uni.showModal({
+            title: getPermissionText('locationTitle'),
+            content: getPermissionText('locationNeed'),
+            confirmText: getPermissionText('goToSettings'),
+            cancelText: getPermissionText('later'),
+            success: (modalRes) => {
+              if (modalRes.confirm) {
+                uni.openSetting({});
+              }
+            }
+          });
+          reject({
+            code: 'LOCATION_DENIED',
+            errMsg: 'user denied location permission'
+          });
+          return;
+        }
+
+        const doGetLocation = () => {
           wx.getLocation({
             type: 'gcj02',
             success: (res) => {
-        // 对经度和纬度进行四舍五入，保留小数点后五位
               const longitude = parseFloat(res.longitude.toFixed(5));
               const latitude = parseFloat(res.latitude.toFixed(5));
-        
+              console.log('地址获取成功');
               resolve({
                 longitude,
                 latitude
@@ -428,26 +500,77 @@ function getUserLocation() {
               reject(error);
             }
           });
+        };
+
+        // 未显式授权时，主动申请一次权限（老版本 scope 为 scope.userLocation）
+        if (!hasUserLocation || userLocationAuth === undefined) {
+          uni.authorize({
+            scope: 'scope.userLocation',
+            success: () => {
+              doGetLocation();
+            },
+            fail: (authErr) => {
+              console.error('定位授权失败:', authErr);
+              uni.showModal({
+                title: getPermissionText('locationTitle'),
+                content: getPermissionText('locationDenied'),
+                confirmText: getPermissionText('gotIt'),
+                showCancel: false
+              });
+              reject({
+                code: 'LOCATION_AUTH_FAIL',
+                errMsg: authErr.errMsg || 'authorize location fail'
+              });
+            }
+          });
+        } else {
+          // 已授权，直接获取定位
+          doGetLocation();
+        }
+      },
+      fail: (err) => {
+        console.warn('获取授权设置失败，直接尝试定位:', err);
+        wx.getLocation({
+          type: 'gcj02',
+          success: (res) => {
+            const longitude = parseFloat(res.longitude.toFixed(5));
+            const latitude = parseFloat(res.latitude.toFixed(5));
+            console.log('地址获取成功');
+            resolve({
+              longitude,
+              latitude
+            });
+          },
+          fail: (error) => {
+            console.error('获取位置失败:', error);
+            reject(error);
+          }
+        });
+      }
+    });
+    // #endif
+
+    // 非微信小程序平台：使用 uni.getLocation 做一个尽量兼容的兜底
+    // #ifndef MP-WEIXIN
+    uni.getLocation({
+      type: 'gcj02',
+      success: (res) => {
+        const longitude = parseFloat(res.longitude.toFixed(5));
+        const latitude = parseFloat(res.latitude.toFixed(5));
+        console.log('地址获取成功');
+        resolve({
+          longitude,
+          latitude
+        });
+      },
+      fail: (error) => {
+        console.error('获取位置失败:', error);
+        reject(error);
+      }
+    });
+    // #endif
   });
 }
-//TODO : 修改getUserLocation函数，使其返回Promise（暂时弃用）
-// function getUserLocation() {
-//   return new Promise((resolve, reject) => {
-//     wx.getLocation({
-//       type: 'gcj02',
-//       success: (res) => {
-//         resolve({
-//           longitude: res.longitude,
-//           latitude: res.latitude
-//         });
-//       },
-//       fail: (error) => {
-//         console.error('获取位置失败:', error);
-//         reject(error);
-//       }
-//     });
-//   });
-// }
 
 // 逆地理编码 - 根据经纬度获取地址信息
 function getRegeo(longitude, latitude) {