From a0de35930e6eb6ba7d91ed7c0ae72a95be1f1f0a Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 14 Aug 2025 09:06:10 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.2' into feature/v5.0/5.0.3
---
src/components/CreateQRcode/CreateQRcode.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/CreateQRcode/CreateQRcode.vue b/src/components/CreateQRcode/CreateQRcode.vue
index 3131fcd..fc18491 100644
--- a/src/components/CreateQRcode/CreateQRcode.vue
+++ b/src/components/CreateQRcode/CreateQRcode.vue
@@ -4,6 +4,7 @@
</template>
<script setup>
+import { wgs84ToGcj02 } from '@/utils/coordinateTransformation';
import QRCode from 'qrcodejs2-fix'
const props = defineProps(['latAndLon'])
@@ -11,8 +12,7 @@
let qrCodeInstance = null
const createQRcode = content => {
-console.log('this.currentDetail.content',content);
-
+ const transformed = wgs84ToGcj02(content[0], content[1])
if (!content) return
if (qrCodeInstance) {
myQrCode.value.innerHTML = ''
@@ -21,7 +21,7 @@
qrCodeInstance = new QRCode(myQrCode.value, {
width: 92,
height: 91,
- text: `https://uri.amap.com/marker?position=${content}&name=%E4%BA%8B%E4%BB%B6%E7%82%B9`,
+ text: `https://uri.amap.com/marker?position=${transformed}&name=%E4%BA%8B%E4%BB%B6%E7%82%B9`,
})
}
watch(
--
Gitblit v1.9.3