From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商

---
 bicycle/pages/maps/maps.vue |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bicycle/pages/maps/maps.vue b/bicycle/pages/maps/maps.vue
index d6ad3bc..6546ba1 100644
--- a/bicycle/pages/maps/maps.vue
+++ b/bicycle/pages/maps/maps.vue
@@ -10,21 +10,21 @@
 			@markertap="markertap"
 			@callouttap="toNavigation">
 			<cover-view slot="callout">
-				<block v-for="(item,index) in markers" :key="index">
+				<cover-view v-for="(item,index) in markers" :key="index">
 					<cover-view class="customCallout" :marker-id="item.id">
-						<image src="@/static/icon/ic_dingwei@2x.png" mode="widthFix"></image>
-						<text class="mm">{{rice}}绫�</text>
-						<view class="h"></view>
-						<text class="dh">瀵艰埅</text>
+						<cover-image class="image" src="@/static/icon/ic_dingwei@2x.png" mode="widthFix"></cover-image>
+						<cover-view class="mm">{{rice > 1000 ? (rice / 1000).toFixed(1) + '鍗冪背' : rice + '绫�'}}</cover-view>
+						<cover-view class="h"></cover-view>
+						<cover-view class="dh">瀵艰埅</cover-view>
 					</cover-view>
-				</block>
+				</cover-view>
 			</cover-view>
 		</map>
 		<u-popup :show="show" :overlay="false" :round="10" mode="bottom" @close="show = false">
 			<view class="ditu_box">
 				<view class="ditu_box_a">
 					<text>{{info.title}}</text>
-					<text>璺濈{{rice}}m</text>
+					<text>璺濈{{rice > 1000 ? (rice / 1000).toFixed(1) + '鍗冪背' : rice + '绫�'}}</text>
 				</view>
 				<view class="ditu_box_b">
 					{{info.addr}}
@@ -168,18 +168,17 @@
 						if (res.code === 200) {
 							this.markers = []
 							res.data.forEach((item, index) => {
+								let num = distance(this.latitude, this.longitude, item.latitude, item.longitude)
 								this.markers.push({
 									id: index,
-									width: 30,
+									width: 40,
 									height: 40,
-									distance: this.latitude && this.longitude ? distance(this.latitude, this.longitude, item.latitude, item.longitude) : '鏈煡璺濈',
+									distance: this.latitude && this.longitude ? num : '鏈煡璺濈',
 									latitude: item.latitude,
 									longitude: item.longitude,
 									title: item.name,
 									iconPath: '/static/icon/ic_bike@2x.png',
 									addr: item.addr,
-									clusterId: 1,
-									joinCluster: true,
 									customCallout: {
 										anchorY: 0,
 										anchorX: 0,
@@ -196,11 +195,15 @@
 					if (item.id === e.markerId) {
 						this.rice = item.distance
 						item.customCallout.display = 'ALWAYS'
+						item.width = 50
+						item.height = 50
 						setTimeout(() => {
 							this.info = item
 							this.show = true
 						}, 300)
 					} else {
+						item.width = 40
+						item.height = 40
 						item.customCallout.display = 'BYCLICK'
 					}
 				})
@@ -240,9 +243,11 @@
 				background: #FFFFFF;
 				border-radius: 50rpx;
 				box-shadow: 0rpx 0rpx 12rpx 0rpx rgba(0,0,0,0.1);
-				image {
+				.image {
 					width: 28rpx;
 					height: 28rpx;
+					background-repeat: no-repeat;
+					background-size: 100% 100%;
 				}
 				.mm {
 					font-size: 28rpx;

--
Gitblit v1.9.3