From ca1ed4834f28f49f33bf7fc5ca93e14e6894f5b0 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Mon, 3 Jun 2024 18:02:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_fenbao/statulist/nearby/index.vue | 46 +++++++++++++++++++++----
 page_user/mapditu/index.vue            |  1 +
 pages/shouye/index.vue                 | 47 ++++++++++++++++++--------
 3 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/page_fenbao/statulist/nearby/index.vue b/page_fenbao/statulist/nearby/index.vue
index 478bb4e..336b48d 100644
--- a/page_fenbao/statulist/nearby/index.vue
+++ b/page_fenbao/statulist/nearby/index.vue
@@ -9,9 +9,9 @@
 		</view>
 		<view class="listbox">
 			<view class="moshi">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/uCux5cJrpLFhwYjVTz4J" mode=""
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uWpZzKBmhjKwSEkO3vcH" mode=""
 					@click="btndt(1)" class="img"></image>
-				<image @click="onControltap" style="width: 66rpx;height: 66rpx;position: absolute;right: 40rpx;"
+				<image @click="onControltap" style="width: 76rpx;height: 76rpx;position: absolute;right: 50rpx;"
 					src="https://api.ccttiot.com/smartmeter/img/static/uOS9p7Sy1K9WpVQgD3b9" mode=""></image>
 			</view>
 			<view class="list" v-for="(item,index) in gxlist" :key="index">
@@ -143,11 +143,43 @@
 				const totalLength = chineseLength + englishLength * 2; // 总长度（以中文字符为单位）  
 				return -totalLength * 6.5; // 假设每个中文字符对应的 anchorX 偏移是 -7 
 			},
+			// onControltap(control) {
+			// 	uni.createMapContext("map", this).moveToLocation({
+			// 		longitude: this.longitude,
+			// 		latitude: this.latitude
+			// 	})
+			// 	this.mapScale = 15
+			// },
 			onControltap(control) {
-				uni.createMapContext("map", this).moveToLocation({
-					longitude: this.longitude,
-					latitude: this.latitude
-				});
+				this.setMapScale()
+			
+				// uni.createMapContext("map", this).moveToLocation({
+				// 	longitude: this.longitude,
+				// 	latitude: this.latitude,
+				// })
+			},
+			// 地图回正
+			async setMapScale(e, val) {
+				let mapContext = uni.createMapContext('map', this);
+				let setScale = () => {
+					return new Promise((resolve, reject) => {
+						mapContext.getScale({
+							success: r => {
+								this.mapScale = 15
+								resolve()
+							}
+						})
+					})
+				};
+				await setScale();
+				mapContext.moveToLocation({
+					success: (res) => {
+						const timer = setTimeout(() => {
+							this.mapScale = 15
+							clearTimeout(timer);
+						}, 500);
+					},
+				})
 			},
 
 			// 跳转导航
@@ -338,7 +370,7 @@
                 width: 100%;
 				image {
 					width: 210rpx;
-					height: 62rpx;
+					height: 74rpx !important;
 				}
 
 				.img {
diff --git a/page_user/mapditu/index.vue b/page_user/mapditu/index.vue
index 60efb05..3ed3ff5 100644
--- a/page_user/mapditu/index.vue
+++ b/page_user/mapditu/index.vue
@@ -369,6 +369,7 @@
 				background: #D9D8FF;
 				border-radius: 8rpx 8rpx 8rpx 8rpx;
 				// opacity: 0.5;
+				margin-top: 10rpx;
 				view{
 					font-size: 28rpx;
 					color: #8883F0;
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index ea3d1a8..beaa686 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -10,11 +10,11 @@
 						:show-location="true" :markers="covers" :scale="mapScale" />
 				</view>
 				<view class="fujin">
-					<image src="https://api.ccttiot.com/smartmeter/img/static/udwYRUCox5uxQ8nHfvST" mode=""
+					<image src="https://api.ccttiot.com/smartmeter/img/static/uqv3e5ThWL8DqrRNBfoA" mode=""
 						@click="btnindex(5)"></image>
 					<image src="https://api.ccttiot.com/smartmeter/img/static/u7yxUJZqgPzESeI4tmiz" mode=""
 						@click="btnindex(6)" v-if="isMch"></image>
-					<image @click="onControltap" style="width: 66rpx;height: 66rpx;position: absolute;right: 40rpx;"
+					<image @click="onControltap" style="width: 76rpx;height: 76rpx;position: absolute;right: 40rpx;"
 						src="https://api.ccttiot.com/smartmeter/img/static/uOS9p7Sy1K9WpVQgD3b9" mode=""></image>
 				</view>
 				<view class="tubiao">
@@ -143,7 +143,7 @@
 			updateMarkers() {
 				this.mapContext.getScale({
 					success: (res) => {
-						this.covers = []; // 清空之前的覆盖物  
+						this.covers = [];
 						if (res.scale <= 14) {
 							this.addMarkersWithoutLabels();
 						} else {
@@ -152,7 +152,6 @@
 					},
 					fail: (error) => {
 						console.error('获取地图缩放级别失败：', error);
-						// 额外的错误处理逻辑...  
 					},
 				});
 			},
@@ -282,9 +281,31 @@
 			},
 
 			onControltap(control) {
-				uni.createMapContext("map", this).moveToLocation({
-					longitude: this.longitude,
-					latitude: this.latitude
+				this.setMapScale()
+				// uni.createMapContext("map", this).moveToLocation({
+				// 	longitude: this.longitude,
+				// 	latitude: this.latitude,
+				// })
+			},
+			// 地图回正
+			async setMapScale(e, val) {
+				let mapContext = uni.createMapContext('map', this);
+				let setScale = () => {
+					return new Promise((resolve, reject) => {
+						mapContext.getScale({
+							success: r => {
+								resolve()
+							}
+						})
+					})
+				};
+				await setScale();
+				mapContext.moveToLocation({
+					success: (res) => {
+						const timer = setTimeout(() => {
+							clearTimeout(timer);
+						}, 500);
+					},
 				})
 			},
 
@@ -302,8 +323,6 @@
 						this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(
 							res => {
 								if (res.code == 200) {
-									// console.log(res);
-									// 假设返回的店铺数据在res.rows中，并且每个店铺有latitude和longitude字段  
 									this.listmap = res.data
 									res.data.forEach(item => {
 										const shopCover = {
@@ -312,7 +331,7 @@
 											longitude: item.lng,
 											width: 25,
 											height: 30,
-											iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4', // 你可以为每个店铺指定不同的图标  
+											iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
 											label: {
 												content: item.name,
 												anchorX: (() => {
@@ -343,7 +362,7 @@
 												},
 											}
 										};
-										this.covers.push(shopCover); // 将店铺覆盖物添加到数组中  
+										this.covers.push(shopCover)
 									});
 								}
 							});
@@ -355,8 +374,7 @@
 			},
 
 			handleMarkerClick(event) {
-				// console.log(event);
-				const markerId = event.markerId;
+				let markerId = event.markerId;
 				uni.navigateTo({
 					url: '/page_user/mapditu/index?markerId=' + markerId
 				})
@@ -775,7 +793,8 @@
 				width: 642rpx;
 				height: 812rpx;
 				margin: auto;
-
+                border-radius: 30rpx;
+                overflow: hidden;
 			}
 
 			.tubiao {