From 51b72c01f6f4e343bc825087121887f1cbc59447 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Mon, 21 Feb 2022 17:10:58 +0800
Subject: [PATCH] 冲突
---
leafletMapOur/loginMap/loginMap.html | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/leafletMapOur/loginMap/loginMap.html b/leafletMapOur/loginMap/loginMap.html
index d2b682c..58435c5 100644
--- a/leafletMapOur/loginMap/loginMap.html
+++ b/leafletMapOur/loginMap/loginMap.html
@@ -23,8 +23,14 @@
<!-- <script src="../map/lib/layui/layui.js" charset="utf-8"></script> -->
<!-- 百度地图api -->
- <script type="text/javascript" src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js">
- </script>
+ <!-- <script type="text/javascript" src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js">
+ </script> -->
+
+ <script charset="utf-8" src="./js/geolocation.min.js"></script>
+
+ <script charset="utf-8" src="./js/getPosition.js"></script>
+
+
<!-- axios支持 -->
<script src="../map/lib/axios.js"></script>
@@ -57,10 +63,6 @@
<body>
<div id="mapVue">
-
- <div class="dingwei" @click="locationMap">
- <img style="width: 80%;height: 80%;" src="./img/dingwei.png" alt="">
- </div>
<div id="map">
--
Gitblit v1.9.3