fix:修复bug；新增订单列表页面订单监控
This commit is contained in:
+99
-89
@@ -7,24 +7,24 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 顶部信息区域（通知、招商等） -->
|
||||
<view class="top-info-section" :style="{ top: (statusBarHeight + navBarHeight) + 'px' }">
|
||||
<!-- 通知栏 -->
|
||||
<view class="notice-wrapper" v-if="noticeText" @click="openNoticePopup">
|
||||
<uv-notice-bar :text="noticeText" :speed="50" :show-icon="true" color="#07c160" bg-color="#E8F8EF"
|
||||
icon="volume"></uv-notice-bar>
|
||||
<!-- 顶部信息区域（通知、招商等） -->
|
||||
<view class="top-info-section" :style="{ top: (statusBarHeight + navBarHeight) + 'px' }">
|
||||
<!-- 通知栏 -->
|
||||
<view class="notice-wrapper" v-if="noticeText" @click="openNoticePopup">
|
||||
<uv-notice-bar :text="noticeText" :speed="50" :show-icon="true" color="#07c160" bg-color="#E8F8EF"
|
||||
icon="volume"></uv-notice-bar>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 内容区域 -->
|
||||
<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" :bannerImages="bannerImages"
|
||||
:hideMapOverlays="showGuidePopup || showNoticePopup || showActivityPopup"
|
||||
@relocate="handleRelocate" @scan="handleScan" @showList="showLocationList" @markerTap="selectPosition"
|
||||
@mapCenterChange="onMapCenterChange" @bannerClick="handleBannerClick" />
|
||||
<!-- 全屏地图组件 -->
|
||||
<MapComponent v-if="!isLoading && userLocation" ref="mapRef" :userLocation="userLocation"
|
||||
:positionList="positionList" :filteredPositions="filteredPositions" :searchKeyword="searchKeyword"
|
||||
:enableMarkers="true" :bannerImages="bannerImages"
|
||||
:hideMapOverlays="showGuidePopup || showNoticePopup || showActivityPopup" @relocate="handleRelocate"
|
||||
@scan="handleScan" @showList="showLocationList" @markerTap="selectPosition"
|
||||
@mapCenterChange="onMapCenterChange" @bannerClick="handleBannerClick" />
|
||||
|
||||
<!-- 地图加载状态 -->
|
||||
<view v-if="isLoading || !userLocation" class="map-loading-placeholder">
|
||||
@@ -101,7 +101,7 @@
|
||||
</view>
|
||||
|
||||
<!-- 使用指南：居中弹出（ref 控制 open/close） -->
|
||||
<uv-popup ref="guidePopup" mode="center" :overlay="true" :closeOnClickOverlay="false"
|
||||
<uv-popup ref="guidePopup" mode="center" :overlay="true" :closeOnClickOverlay="false"
|
||||
:safeAreaInsetBottom="false">
|
||||
<view class="guide-popup">
|
||||
<view class="guide-header">
|
||||
@@ -318,7 +318,7 @@
|
||||
'Content-Language': languageCode
|
||||
},
|
||||
data: {
|
||||
type: 'wx_user_type' // 微信小程序用户端
|
||||
type: 'wx_user_type' // 微信小程序用户端
|
||||
}
|
||||
})
|
||||
|
||||
@@ -366,8 +366,9 @@
|
||||
'Content-Language': languageCode
|
||||
},
|
||||
data: {
|
||||
appPlatform: 'wechat', // 微信平台
|
||||
appType: 'user' // 用户端
|
||||
appPlatform: 'wechat', // 微信平台
|
||||
appType: 'user' ,// 用户端
|
||||
pictureLocation:'home_banner'
|
||||
}
|
||||
})
|
||||
|
||||
@@ -567,94 +568,94 @@
|
||||
console.warn('清理旧缓存失败:', e);
|
||||
}
|
||||
|
||||
// 开发环境测试距离计算
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
testDistanceCalculation()
|
||||
}
|
||||
|
||||
// 并行加载公告和广告（不依赖定位）
|
||||
await Promise.all([
|
||||
getNoticeText(),
|
||||
getBannerImages()
|
||||
])
|
||||
// 开发环境测试距离计算
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
testDistanceCalculation()
|
||||
}
|
||||
|
||||
// 1. 先获取用户位置
|
||||
await getUserLocationAndAddress()
|
||||
// 并行加载公告和广告（不依赖定位）
|
||||
await Promise.all([
|
||||
getNoticeText(),
|
||||
getBannerImages()
|
||||
])
|
||||
|
||||
// 2. 加载场地列表（依赖定位）
|
||||
await loadPositions()
|
||||
// 1. 先获取用户位置
|
||||
await getUserLocationAndAddress()
|
||||
|
||||
// 3. 查询活动并显示弹窗
|
||||
await checkActiveActivity()
|
||||
// 2. 加载场地列表（依赖定位）
|
||||
await loadPositions()
|
||||
|
||||
// 3. 查询活动并显示弹窗
|
||||
await checkActiveActivity()
|
||||
|
||||
} catch (error) {
|
||||
console.error('初始化失败:', error)
|
||||
uni.showToast({
|
||||
title: $t('home.getLocationFailed'),
|
||||
icon: 'none'
|
||||
})
|
||||
uni.showToast({
|
||||
title: $t('home.getLocationFailed'),
|
||||
icon: 'none'
|
||||
})
|
||||
} finally {
|
||||
isLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const getUserLocationAndAddress = async () => {
|
||||
// 使用腾讯地图SDK获取位置（若失败抛出，由调用方统一处理）
|
||||
const location = await getUserLocation()
|
||||
// 使用腾讯地图SDK获取位置（若失败抛出，由调用方统一处理）
|
||||
const location = await getUserLocation()
|
||||
|
||||
if (!location?.longitude || !location?.latitude) {
|
||||
throw new Error('invalid location result')
|
||||
}
|
||||
if (!location?.longitude || !location?.latitude) {
|
||||
throw new Error('invalid location result')
|
||||
}
|
||||
|
||||
// 保存用户位置
|
||||
userLocation.value = {
|
||||
longitude: location.longitude,
|
||||
latitude: location.latitude
|
||||
}
|
||||
|
||||
console.log(userLocation.value);
|
||||
// 将经纬度写入本地缓存（基础信息）
|
||||
try {
|
||||
uni.setStorageSync('userLocation', {
|
||||
// 保存用户位置
|
||||
userLocation.value = {
|
||||
longitude: location.longitude,
|
||||
latitude: location.latitude
|
||||
})
|
||||
} catch (e) {
|
||||
console.warn('缓存基础定位信息失败:', e)
|
||||
}
|
||||
|
||||
// 只在首次初始化时设置标记
|
||||
if (!isLocationInitialized.value) {
|
||||
isLocationInitialized.value = true
|
||||
}
|
||||
|
||||
// 获取详细地址信息
|
||||
try {
|
||||
const addressResult = await getRegeo(location.longitude, location.latitude)
|
||||
if (addressResult.success) {
|
||||
const addressInfo = addressResult.data
|
||||
userLocation.value.address = addressInfo.formatted_address
|
||||
userLocation.value.city = addressInfo.addressComponent.city
|
||||
userLocation.value.district = addressInfo.addressComponent.district
|
||||
|
||||
// 更新本地缓存，包含地址信息
|
||||
try {
|
||||
uni.setStorageSync('userLocation', {
|
||||
longitude: userLocation.value.longitude,
|
||||
latitude: userLocation.value.latitude,
|
||||
address: userLocation.value.address,
|
||||
city: userLocation.value.city,
|
||||
district: userLocation.value.district
|
||||
})
|
||||
} catch (e) {
|
||||
console.warn('缓存带地址的定位信息失败:', e)
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
// 忽略地址信息错误，使用基础定位信息
|
||||
}
|
||||
|
||||
return userLocation.value
|
||||
console.log(userLocation.value);
|
||||
// 将经纬度写入本地缓存（基础信息）
|
||||
try {
|
||||
uni.setStorageSync('userLocation', {
|
||||
longitude: location.longitude,
|
||||
latitude: location.latitude
|
||||
})
|
||||
} catch (e) {
|
||||
console.warn('缓存基础定位信息失败:', e)
|
||||
}
|
||||
|
||||
// 只在首次初始化时设置标记
|
||||
if (!isLocationInitialized.value) {
|
||||
isLocationInitialized.value = true
|
||||
}
|
||||
|
||||
// 获取详细地址信息
|
||||
try {
|
||||
const addressResult = await getRegeo(location.longitude, location.latitude)
|
||||
if (addressResult.success) {
|
||||
const addressInfo = addressResult.data
|
||||
userLocation.value.address = addressInfo.formatted_address
|
||||
userLocation.value.city = addressInfo.addressComponent.city
|
||||
userLocation.value.district = addressInfo.addressComponent.district
|
||||
|
||||
// 更新本地缓存，包含地址信息
|
||||
try {
|
||||
uni.setStorageSync('userLocation', {
|
||||
longitude: userLocation.value.longitude,
|
||||
latitude: userLocation.value.latitude,
|
||||
address: userLocation.value.address,
|
||||
city: userLocation.value.city,
|
||||
district: userLocation.value.district
|
||||
})
|
||||
} catch (e) {
|
||||
console.warn('缓存带地址的定位信息失败:', e)
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
// 忽略地址信息错误，使用基础定位信息
|
||||
}
|
||||
|
||||
return userLocation.value
|
||||
}
|
||||
|
||||
const loadPositions = async () => {
|
||||
@@ -934,7 +935,16 @@
|
||||
})
|
||||
})
|
||||
|
||||
let deviceNo = getQueryString(scanResult.path, 'deviceNo')
|
||||
console.log(scanResult);
|
||||
let deviceNo;
|
||||
if (scanResult.scanType=='"QR_CODE"') {
|
||||
|
||||
deviceNo = getQueryString(scanResult.result, 'deviceNo')
|
||||
} else {
|
||||
deviceNo = getQueryString(scanResult.path, 'deviceNo')
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (!deviceNo) {
|
||||
uni.showToast({
|
||||
|
||||
Reference in New Issue
Block a user