From d470e67ac1997882502b75cbfdaf359626cfaaa8 Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期五, 20 十二月 2024 17:27:07 +0800
Subject: [PATCH] 测试修复小程序问题,添加水控机设备

---
 pages/facilityList/index.vue |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pages/facilityList/index.vue b/pages/facilityList/index.vue
index d6ee2a7..0b0c6f8 100644
--- a/pages/facilityList/index.vue
+++ b/pages/facilityList/index.vue
@@ -6,14 +6,15 @@
 				<block v-for="(item,index) in deviceList" :key="index">
 					<view class="item">
 						<view class="item-img">
-							<image src="../../static/logo.png" alt=''></image>
+							<image v-if="item.url" :src="baseUrl + '/upload' + item.url" alt='' mode="aspectFit"></image>
+							<image v-else src="../../static/images/station/facilityImg.svg" alt='' mode="aspectFit"></image>
 						</view>
 						<view class="item-info">
 							<view class="info-name">{{item.facilityName}}</view>
 							<view class="info-addr" @click="openMap(item.lat,item.lon)">
 								<text class="addr-text">地址:{{item.address}}</text>
 								<view>
-									<image src="../../static/images/index/icon22.png" alt=''></image>
+									<image src="../../static/images/index/icon22.svg" alt=''></image>
 									<text>{{item.distance}}km</text>
 								</view>
 							</view>
@@ -28,6 +29,9 @@
 <script setup>
 	import { onMounted, ref } from 'vue'
 	import { searchFacilityApi } from '../../api/index.js'
+	import { BASE_URL } from '../../config/baseUrl.js'
+	
+	const baseUrl = ref(BASE_URL)
 	const deviceList = ref([])
 	const userLocation = ref()
 	//获取设备信息
@@ -44,6 +48,7 @@
 						distance:preDistance.km,
 						lat:item.latitude,
 						lon:item.longitude,
+						url:item.facilityUrl
 					})
 				})
 				console.log('deviceList.value',deviceList.value)
@@ -64,6 +69,7 @@
 	}
 	//打开地图导航
 	function openMap(lat,lon){
+		console.log('lat:',parseFloat(lat),'lon:',parseFloat(lon))
 		uni.openLocation({
 			latitude: parseFloat(lat),
 			longitude: parseFloat(lon),

--
Gitblit v1.9.3