From 812b3d6ba2ee0ff1c5210bd97ab608e159e494d7 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 24 Sep 2024 17:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                  |  6 ++++
 pages/map/map.vue           | 56 +++----------------------------------
 subPackages/h5Web/h5Web.vue | 54 +++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 52 deletions(-)
 create mode 100644 subPackages/h5Web/h5Web.vue

diff --git a/pages.json b/pages.json
index 5ff863b..29887a8 100644
--- a/pages.json
+++ b/pages.json
@@ -293,6 +293,12 @@
 				"style": {
 					"navigationBarTitleText": "选择日期"
 				}
+			},
+			{
+				"path": "h5Web/h5Web",
+				"style": {
+					"navigationBarTitleText": ""
+				}
 			}
 		]
 	}],
diff --git a/pages/map/map.vue b/pages/map/map.vue
index b3eb304..2ff6841 100644
--- a/pages/map/map.vue
+++ b/pages/map/map.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<map id="map" class="map" :show-location="true" :latitude="latitude" :longitude="longitude"></map>
+		<web-view src="https://yandumap.sz-trip.com/"></web-view>
 	</view>
 </template>
 
@@ -8,57 +8,14 @@
 	export default {
 		data() {
 			return {
-				latitude: 33.338538,
-				longitude: 120.153567,
+				
 			}
 		},
 		onReady() {
-			this._mapContext = uni.createMapContext("map", this);
-
-			// 仅调用初始化，才会触发 on.("markerClusterCreate", (e) => {})
-			this._mapContext.initMarkerCluster({
-				enableDefaultStyle: false,
-				zoomOnClick: true,
-				gridSize: 60,
-				complete(res) {
-					console.log('initMarkerCluster', res)
-				}
-			});
-
-			this._mapContext.on("markerClusterCreate", (e) => {
-				console.log("markerClusterCreate", e);
-			});
-
-			this.addMarkers();
+			
 		},
 		methods: {
-			addMarkers() {
-				console.log(111,this._mapContext)
-				this._mapContext.addGroundOverlay({
-					id: 1,
-					src: 'https://static.ticket.sz-trip.com/yandu/images/maps/6/53/25.png',
-					bounds: {
-						southwest: {//左下角GPS
-							longitude: 119.700158,
-							latitude: 33.112837
-						},
-						northeast: {//右上角GPS
-							longitude: 120.25057,
-							latitude: 33.458095
-						}
-					},
-					zIndex: 1, // 图层绘制顺序
-					success: () => {
-						console.log("显示成功", southwest, northeast)
-					},
-					fail: (e) => {
-						console.log("显示失败", e)
-					},
-					complete: res => {
-						console.log(res)
-					}
-				})
-			}
+			
 		}
 	}
 </script>
@@ -68,9 +25,4 @@
 		width: 100vw;
 		height: 100vh;
 	}
-
-	.map {
-		width: 100vw;
-		height: 100vh;
-	}
 </style>
\ No newline at end of file
diff --git a/subPackages/h5Web/h5Web.vue b/subPackages/h5Web/h5Web.vue
new file mode 100644
index 0000000..ea73887
--- /dev/null
+++ b/subPackages/h5Web/h5Web.vue
@@ -0,0 +1,54 @@
+<template>
+	<view></view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onShow() {
+			// 从第三方小程序返回后
+			const oTherMiniprogramIsBack = uni.getStorageSync('oTherMiniprogramIsBack')
+			if(oTherMiniprogramIsBack) {
+				uni.showModal({
+					title: '是否返回...',
+					success: () => {
+						uni.removeStorageSync('oTherMiniprogramIsBack')
+						uni.navigateBack();
+					}
+				})
+			}
+		},
+		onLoad(option) {
+			let data = JSON.parse(option.data)
+			if(data && data.type == 'xcx') {
+				uni.navigateToMiniProgram({
+					shortLink: data.url,
+					success(res) {
+						uni.setStorageSync('oTherMiniprogramIsBack', 1)
+					}
+				})
+			}else {
+				uni.openLocation({
+					longitude: Number(data.lon), // 经度
+					latitude: Number(data.lat), //纬度
+					name: data.address || data.title || data.name, // 位置名称
+					address: data.address, //详细地址
+					complete: res => {
+						if(res.errMsg.indexOf("openLocation:ok") != -1) {
+							uni.switchTab({
+								url: '/pages/map/map'
+							})
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file