From 294bd5e69fc418e472ac3f4b0c21fcafd3c04d85 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Thu, 26 Sep 2024 11:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                  |  6 ------
 subPackages/h5Web/h5Map.vue | 37 -------------------------------------
 subPackages/h5Web/h5Web.vue | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 43 deletions(-)
 delete mode 100644 subPackages/h5Web/h5Map.vue

diff --git a/pages.json b/pages.json
index 8b21185..29887a8 100644
--- a/pages.json
+++ b/pages.json
@@ -299,12 +299,6 @@
 				"style": {
 					"navigationBarTitleText": ""
 				}
-			},
-			{
-				"path": "h5Web/h5Map",
-				"style": {
-					"navigationBarTitleText": ""
-				}
 			}
 		]
 	}],
diff --git a/subPackages/h5Web/h5Map.vue b/subPackages/h5Web/h5Map.vue
deleted file mode 100644
index d9f51c0..0000000
--- a/subPackages/h5Web/h5Map.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-	<view></view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		onShow() {
-			
-		},
-		onLoad(option) {
-			let data = JSON.parse(option.data)
-			if(data && data.type == 'map') {
-				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
diff --git a/subPackages/h5Web/h5Web.vue b/subPackages/h5Web/h5Web.vue
index c2e76b2..7ff33f6 100644
--- a/subPackages/h5Web/h5Web.vue
+++ b/subPackages/h5Web/h5Web.vue
@@ -31,6 +31,23 @@
 						uni.setStorageSync('oTherMiniprogramIsBack', 1)
 					}
 				})
+			}else if(data && data.type == 'map') {
+				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'
+					// 		})
+					// 	}
+					// }
+					success: res => {
+						uni.setStorageSync('oTherMiniprogramIsBack', 1)
+					}
+				})
 			}
 		}
 	}