Fly hace 7 meses
padre
commit
09e688758f

+ 6 - 8
components/tiandituMap/tiandituMap.vue

@@ -195,6 +195,7 @@
 					if (Tmap) await this.getMapCenter();
 
 					const { Lng, Lat } = this.centreDot || {};
+				
 					let maxIcon = false;
 					(newArr || []).forEach((el, index) => {
 						el.maxIcon = false;
@@ -203,7 +204,7 @@
 							this.SelectedDot(el, true, 12)
 						}
 						const { longitude, latitude, mapTypeIcon } = el;
-						if (Lng == el.longitude && Lat == el.latitude) {
+						if (Lng == longitude && Lat == latitude) {
 							el.maxIcon = true;
 							maxIcon = true;
 						};
@@ -271,10 +272,10 @@
 					geocode.getLocation(v, (result) => {
 						if (result.getStatus() == 0) {
 							let t = '';
-							const Address = result.getAddress()
+							const { poi } = result.getAddressComponent()
 							try {
-								if (Address && Address.indexOf('湖北省武汉市') === 0) {
-									const lo = Address.split('湖北省武汉市')
+								if (poi && poi.indexOf('湖北省武汉市') === 0) {
+									const lo = poi.split('湖北省武汉市')
 									lo.forEach((el, index) => {
 										if (index >= 1) {
 											t = `${t}${el}`
@@ -284,7 +285,7 @@
 							} catch (error) {
 								//TODO handle the exception
 							}
-							this.centreText = t || Address
+							this.centreText = t || poi
 						} else {
 							this.centreText = null
 						}
@@ -386,7 +387,6 @@
 
 			// 点击地图标注的点位
 			clickMapSite({ type, target, lnglat, containerPoint }) {
-				console.log("type, target, lnglat, containerPoint = ", type, target, lnglat, containerPoint)
 				const Lng = lnglat.getLng();
 				const Lat = lnglat.getLat();
 				this.$emit('handleMapSite', { Lng, Lat })
@@ -442,7 +442,6 @@
 			},
 
 			initTMap(newValue, oldValue, ownerInstance, instance) {
-				console.log('-----1----', newValue)
 				this.options = newValue
 				if (newValue.type === 'open' && newValue.apikey) {
 					if (!window.T) {
@@ -463,7 +462,6 @@
 							lat
 						})
 						Tmap.addEventListener('click', (e) => {
-							console.log("nextPoint", e.lnglat)
 							this.$ownerInstance.callMethod('nextPoint', e.lnglat)
 						});
 					}

+ 1 - 0
pages/map/index.vue

@@ -556,6 +556,7 @@
 			flex-shrink: 0;
 			font-size: 26rpx;
 			color: #666666;
+			font-weight: 700;
 		}
 
 		.text-val {

+ 15 - 13
pages/map/model/siteList.vue

@@ -9,7 +9,8 @@
 		</view>
 		<view class="distance-box">
 			<view class="distance-num one-row">
-				距离{{getDistance(info.distance)}}
+				距离{{getDistance(info.centerDistance)}}
+				<!-- 距离{{getDistance(info.distance)}} -->
 			</view>
 			<view class="distance-btns">
 				<view class="distance-btn" @click.stop="getPhoneCall(info.mapContactList)">
@@ -156,10 +157,10 @@
 		border-bottom: 10rpx solid #F5F5F5;
 
 		.site-name {
-			font-size: 28rpx;
-			font-weight: 500;
+			font-size: 30rpx;
+			font-weight: 700;
 			color: #1a1a1a;
-			line-height: 40rpx;
+			line-height: 42rpx;
 		}
 
 		.location-text {
@@ -170,19 +171,19 @@
 
 			.icon-box {
 				width: 22rpx;
-				height: 33rpx;
+				height: 37rpx;
 				flex-shrink: 0;
 
 				.location-icon {
 					width: 22rpx;
-					height: 33rpx;
+					height: 37rpx;
 				}
 			}
 
 			.location-val {
-				font-size: 24rpx;
-				line-height: 33rpx;
-				font-weight: 300;
+				font-size: 26rpx;
+				font-weight: 400;
+				line-height: 37rpx;
 				color: #666666;
 				padding-left: 8rpx;
 			}
@@ -196,8 +197,8 @@
 			align-items: center;
 
 			.distance-num {
-				font-size: 24rpx;
-				font-weight: 300;
+				font-size: 26rpx;
+				font-weight: 400;
 				color: #808080;
 			}
 
@@ -240,8 +241,8 @@
 		.time-box {
 			min-height: 73rpx;
 			padding: 20rpx 0;
-			font-size: 24rpx;
-			font-weight: 300;
+			font-size: 26rpx;
+			font-weight: 400;
 			color: #808080;
 			display: flex;
 			align-items: start;
@@ -258,6 +259,7 @@
 				.time-text {
 					padding-left: 8rpx;
 					line-height: 33rpx;
+					color: #1a1a1a;
 				}
 			}
 

+ 0 - 1
pages/map/model/siteServeH6.vue

@@ -322,7 +322,6 @@
 				}
 
 				.active-lable {
-					font-weight: 600;
 					background: #ffffff;
 					font-family: PingFang SC, PingFang SC-Bold;
 					font-weight: 700;